From 3a03122fc0579e71075f5276e341ac793da63dc9 Mon Sep 17 00:00:00 2001
From: "aruslan@chromium.org"
 <aruslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 25 Apr 2013 16:37:46 +0000
Subject: [PATCH] [Android] Fixes to the rAc dialog after enum and layout
 changes.

This fixes the Java side of the constants and relevant layouts after
https://chromiumcodereview.appspot.com/14366018/

TBR=yusufo@chromium.org,dbeam@chromium.org
TEST=manual
BUG=235458
NOTRY=True

Review URL: https://chromiumcodereview.appspot.com/14284016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196416 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../java/res/layout/autofill_general_layout.xml    | 30 +++++++++++-----------
 .../browser/autofill/AutofillDialogConstants.java  | 11 ++++----
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/chrome/android/java/res/layout/autofill_general_layout.xml b/chrome/android/java/res/layout/autofill_general_layout.xml
index 6e80dcda5e3d..e51115ce4168 100644
--- a/chrome/android/java/res/layout/autofill_general_layout.xml
+++ b/chrome/android/java/res/layout/autofill_general_layout.xml
@@ -17,7 +17,7 @@
         android:layout_gravity="fill_horizontal"
         android:layout_columnSpan="4"/>
     <TextView
-        android:id="@+id/email_label"
+        android:id="@+id/cc_billing_label"
         android:layout_marginLeft="@dimen/autofill_steady_margin"
         android:layout_columnSpan="2"
         android:textStyle="bold"
@@ -27,13 +27,13 @@
         android:layout_columnSpan="2"/>
     <Spinner
         android:layout_margin="@dimen/autofill_steady_margin"
-        android:id="@+id/email_spinner"
+        android:id="@+id/cc_billing_spinner"
         android:padding="@dimen/autofill_menu_item_padding"
         android:layout_gravity="fill_horizontal"
         android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
         android:layout_columnSpan="4"/>
     <TextView
-        android:id="@+id/cc_billing_label"
+        android:id="@+id/cc_label"
         android:layout_marginLeft="@dimen/autofill_steady_margin"
         android:layout_columnSpan="2"
         android:textStyle="bold"
@@ -43,29 +43,30 @@
         android:layout_columnSpan="2"/>
     <Spinner
         android:layout_margin="@dimen/autofill_steady_margin"
-        android:id="@+id/cc_billing_spinner"
+        android:id="@+id/cc_spinner"
         android:padding="@dimen/autofill_menu_item_padding"
         android:layout_gravity="fill_horizontal"
         android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
         android:layout_columnSpan="4"/>
     <TextView
-        android:id="@+id/cc_label"
+        android:id="@+id/billing_label"
         android:layout_marginLeft="@dimen/autofill_steady_margin"
         android:layout_columnSpan="2"
         android:textStyle="bold"
         android:textSize="@dimen/autofill_steady_text_size"/>
     <Space
-        android:layout_gravity="fill"
-        android:layout_columnSpan="2"/>
+          android:layout_gravity="fill"
+          android:layout_columnSpan="2"/>
     <Spinner
         android:layout_margin="@dimen/autofill_steady_margin"
-        android:id="@+id/cc_spinner"
+        android:id="@+id/billing_spinner"
         android:padding="@dimen/autofill_menu_item_padding"
         android:layout_gravity="fill_horizontal"
         android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
+        android:visibility="gone"
         android:layout_columnSpan="4"/>
     <TextView
-        android:id="@+id/billing_label"
+        android:id="@+id/shipping_label"
         android:layout_marginLeft="@dimen/autofill_steady_margin"
         android:layout_columnSpan="2"
         android:textStyle="bold"
@@ -75,24 +76,23 @@
           android:layout_columnSpan="2"/>
     <Spinner
         android:layout_margin="@dimen/autofill_steady_margin"
-        android:id="@+id/billing_spinner"
+        android:id="@+id/address_spinner"
         android:padding="@dimen/autofill_menu_item_padding"
         android:layout_gravity="fill_horizontal"
         android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
-        android:visibility="gone"
         android:layout_columnSpan="4"/>
     <TextView
-        android:id="@+id/shipping_label"
+        android:id="@+id/email_label"
         android:layout_marginLeft="@dimen/autofill_steady_margin"
         android:layout_columnSpan="2"
         android:textStyle="bold"
         android:textSize="@dimen/autofill_steady_text_size"/>
     <Space
-          android:layout_gravity="fill"
-          android:layout_columnSpan="2"/>
+        android:layout_gravity="fill"
+        android:layout_columnSpan="2"/>
     <Spinner
         android:layout_margin="@dimen/autofill_steady_margin"
-        android:id="@+id/address_spinner"
+        android:id="@+id/email_spinner"
         android:padding="@dimen/autofill_menu_item_padding"
         android:layout_gravity="fill_horizontal"
         android:dropDownVerticalOffset="@dimen/autofill_spinner_offset"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogConstants.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogConstants.java
index 37b037d15f9c..ceb31da78886 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogConstants.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogConstants.java
@@ -17,13 +17,14 @@ public class AutofillDialogConstants {
     // Section ID constants. This list should be kept in sync with enum DialogSection in
     // autofill_dialog_types.h
 
-    public static final int SECTION_EMAIL = 0;
     // The Autofill-backed dialog uses separate CC and billing sections.
-    public static final int SECTION_CC = 1;
-    public static final int SECTION_BILLING = 2;
+    public static final int SECTION_CC = 0;
+    public static final int SECTION_BILLING = 1;
     // The wallet-backed dialog uses a combined CC and billing section.
-    public static final int SECTION_CC_BILLING = 3;
-    public static final int SECTION_SHIPPING = 4;
+    public static final int SECTION_CC_BILLING = 2;
+    public static final int SECTION_SHIPPING = 3;
+    // The email section is not shown in the Wallet dialog.
+    public static final int SECTION_EMAIL = 4;
     public static final int NUM_SECTIONS = 5;
 
 
-- 
2.11.4.GIT