Bug 1084521 - Use +id not +android:id. r=lucasr, a=lsblakk
authorRichard Newman <rnewman@mozilla.com>
Mon, 20 Oct 2014 08:33:11 -0700
changeset 225848 81b50459db25
parent 225847 d9496ec99e83
child 225849 f7483e854a43
push id4039
push userryanvm@gmail.com
push date2014-10-29 14:09 +0000
treeherdermozilla-beta@c94fc6b83daa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslucasr, lsblakk
bugs1084521
milestone34.0
Bug 1084521 - Use +id not +android:id. r=lucasr, a=lsblakk
mobile/android/base/resources/layout/fxaccount_custom_server_view.xml
--- a/mobile/android/base/resources/layout/fxaccount_custom_server_view.xml
+++ b/mobile/android/base/resources/layout/fxaccount_custom_server_view.xml
@@ -30,28 +30,28 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
             android:paddingBottom="6dip"
             android:paddingRight="10dip"
             android:paddingTop="6dip" >
 
             <TextView
-                android:id="@+android:id/account_server_title"
+                android:id="@+id/account_server_title"
                 style="@style/FxAccountTextItem"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="0dp"
                 android:gravity="center_vertical"
                 android:text="@string/fxaccount_custom_server_account_title" >
             </TextView>
 
             <TextView
-                android:id="@+android:id/account_server_summary"
+                android:id="@+id/account_server_summary"
                 style="@style/FxAccountTextItem"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="0dp"
                 android:ellipsize="middle"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:singleLine="true"
@@ -83,34 +83,34 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
             android:paddingBottom="6dip"
             android:paddingRight="10dip"
             android:paddingTop="6dip" >
 
             <TextView
-                android:id="@+android:id/sync_server_title"
+                android:id="@+id/sync_server_title"
                 style="@style/FxAccountTextItem"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="0dp"
                 android:gravity="center_vertical"
                 android:text="@string/fxaccount_custom_server_sync_title" >
             </TextView>
 
             <TextView
-                android:id="@+android:id/sync_server_summary"
+                android:id="@+id/sync_server_summary"
                 style="@style/FxAccountTextItem"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="0dp"
                 android:ellipsize="marquee"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
                 android:singleLine="true"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="12sp" />
         </LinearLayout>
     </LinearLayout>
 
-</merge>
\ No newline at end of file
+</merge>