Bug 773293 - part 2/2: Make checkboxes in Android Sync Send Tab To Device activity match Fennec checkboxes. r=rnewman
authorNick Alexander <nalexander@mozilla.com>
Thu, 30 Aug 2012 12:18:15 -0700
changeset 110228 ce60fb4481d56ababef289c328c8d865866ccf89
parent 110227 14ea772f17454b8b6f44bf80d1c67019828b6d12
child 110229 d04edff1ae419e88973956f0de96d883b4f604d0
push idunknown
push userunknown
push dateunknown
reviewersrnewman
bugs773293
milestone18.0a1
Bug 773293 - part 2/2: Make checkboxes in Android Sync Send Tab To Device activity match Fennec checkboxes. r=rnewman
mobile/android/base/resources/layout/sync_list_item.xml
mobile/android/base/resources/values-large-v11/sync_styles.xml
mobile/android/base/resources/values/sync_styles.xml
mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
--- a/mobile/android/base/resources/layout/sync_list_item.xml
+++ b/mobile/android/base/resources/layout/sync_list_item.xml
@@ -9,16 +9,17 @@
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:padding="5dp" >
 
     <ImageView
         android:id="@+id/img"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:padding="10dp"
         android:layout_marginRight="10dip" />
 
     <TextView
         android:id="@+id/client_name"
         android:layout_gravity="center"
         android:layout_width="0dp"
         android:layout_weight="0.5"
         android:layout_height="wrap_content" />
--- a/mobile/android/base/resources/values-large-v11/sync_styles.xml
+++ b/mobile/android/base/resources/values-large-v11/sync_styles.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- Theme Styles -->
-  <style name="SyncTheme" parent="@android:style/Theme.Dialog">
-    <item name="android:windowNoTitle">true</item>
-  </style>
+  <style name="SyncTheme" parent="@style/Gecko.Dialog" />
 
   <!-- Outer container: a container with top, middle, and bottom
        content in it. -->
   <style name="SyncContainer" parent="@style/SyncLayout.Vertical">
     <item name="android:layout_width">600dp</item>
     <item name="android:minWidth">600dp</item>
     <item name="android:minHeight">600dp</item>
   </style>
--- a/mobile/android/base/resources/values/sync_styles.xml
+++ b/mobile/android/base/resources/values/sync_styles.xml
@@ -53,17 +53,17 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:gravity">center_horizontal</item>
     <item name="android:ems">4</item>
     <item name="android:maxLength">4</item>
     <item name="android:imeOptions">actionNext|flagNoExtractUi</item>
   </style>
 
   <!-- Theme Styles -->
-  <style name="SyncTheme" parent="@android:style/Theme.NoTitleBar"/>
+  <style name="SyncTheme" parent="@style/Gecko" />
 
   <!-- Outer container: a container with top, middle, and bottom
        content in it. -->
   <style name="SyncContainer" parent="@style/SyncLayout.Vertical" />
 
   <!-- Top title bar: a text view with the Sync icon to the left. -->
   <style name="SyncTop">
     <item name="android:textAppearance">@android:style/TextAppearance.Large</item>
--- a/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
+++ b/mobile/android/sync/manifests/SyncAndroidManifest_activities.xml.in
@@ -10,18 +10,20 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <!-- Adding a launcher will make Firefox Sync appear
                      on the Apps screen, which we only want when testing. -->
                 <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
             </intent-filter>
         </activity>
 
+        <!-- On tablets, SyncTheme is in a dialog, which is not what
+             we want for install instructions. -->
         <activity
-            android:theme="@android:style/Theme.NoTitleBar"
+            android:theme="@style/Gecko"
             android:name="org.mozilla.gecko.sync.setup.activities.WebViewActivity" />
 
         <activity
             android:theme="@style/SyncTheme"
             android:clearTaskOnLaunch="true"
             android:name="org.mozilla.gecko.sync.setup.activities.AccountActivity"
             android:windowSoftInputMode="adjustResize|stateHidden"/>