From 66f185a9e217eae57452b1c3af96ce24444a911e Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Thu, 8 Mar 2012 11:15:49 -0800
Subject: Fix NPE due to removed preference.

Bug: 6138309
Change-Id: I2161cb3bf58f1a1a67a136b4c7646cd7b53f6f8a
---
 src/com/android/settings/WirelessSettings.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 6ae3275..56f6d46 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -45,7 +45,6 @@ public class WirelessSettings extends SettingsPreferenceFragment {
     private static final String KEY_WIMAX_SETTINGS = "wimax_settings";
     private static final String KEY_ANDROID_BEAM_SETTINGS = "android_beam_settings";
     private static final String KEY_VPN_SETTINGS = "vpn_settings";
-    private static final String KEY_WIFI_P2P_SETTINGS = "wifi_p2p_settings";
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
     private static final String KEY_PROXY_SETTINGS = "proxy_settings";
     private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
@@ -147,12 +146,6 @@ public class WirelessSettings extends SettingsPreferenceFragment {
             getPreferenceScreen().removePreference(findPreference(KEY_MOBILE_NETWORK_SETTINGS));
         }
 
-        WifiP2pManager p2p = (WifiP2pManager) activity.getSystemService(Context.WIFI_P2P_SERVICE);
-
-        if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
-            getPreferenceScreen().removePreference(findPreference(KEY_WIFI_P2P_SETTINGS));
-        }
-
         // Enable Proxy selector settings if allowed.
         Preference mGlobalProxy = findPreference(KEY_PROXY_SETTINGS);
         DevicePolicyManager mDPM = (DevicePolicyManager)
-- 
cgit v1.1


From 10e7e56284dcacb7a4004a15ed141dc556544a98 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 11 Apr 2012 11:03:25 -0700
Subject: Hide body immediately when no tabs.

Also check for valid SIM card when checking 4G radio status.

Bug: 6311752
Change-Id: Ic148f052429cc66bb51237bdc93c09f7c8ba3df1
---
 src/com/android/settings/DataUsageSummary.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index b0c38b9..70c0d9b 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -451,7 +451,7 @@ public class DataUsageSummary extends Fragment {
         mMenuRestrictBackground.setChecked(mPolicyManager.getRestrictBackground());
 
         final MenuItem split4g = menu.findItem(R.id.data_usage_menu_split_4g);
-        split4g.setVisible(hasMobile4gRadio(context) && !appDetailMode);
+        split4g.setVisible(hasReadyMobile4gRadio(context) && !appDetailMode);
         split4g.setChecked(isMobilePolicySplit());
 
         final MenuItem showWifi = menu.findItem(R.id.data_usage_menu_show_wifi);
@@ -596,7 +596,7 @@ public class DataUsageSummary extends Fragment {
         mTabHost.clearAllTabs();
 
         final boolean mobileSplit = isMobilePolicySplit();
-        if (mobileSplit && hasMobile4gRadio(context)) {
+        if (mobileSplit && hasReadyMobile4gRadio(context)) {
             mTabHost.addTab(buildTabSpec(TAB_3G, R.string.data_usage_tab_3g));
             mTabHost.addTab(buildTabSpec(TAB_4G, R.string.data_usage_tab_4g));
         } else if (hasReadyMobileRadio(context)) {
@@ -609,6 +609,7 @@ public class DataUsageSummary extends Fragment {
             mTabHost.addTab(buildTabSpec(TAB_ETHERNET, R.string.data_usage_tab_ethernet));
         }
 
+        final boolean noTabs = mTabWidget.getTabCount() == 0;
         final boolean multipleTabs = mTabWidget.getTabCount() > 1;
         mTabWidget.setVisibility(multipleTabs ? View.VISIBLE : View.GONE);
         if (mIntentTab != null) {
@@ -619,6 +620,9 @@ public class DataUsageSummary extends Fragment {
                 mTabHost.setCurrentTabByTag(mIntentTab);
             }
             mIntentTab = null;
+        } else if (noTabs) {
+            // no usable tabs, so hide body
+            updateBody();
         } else {
             // already hit updateBody() when added; ignore
         }
@@ -2081,7 +2085,7 @@ public class DataUsageSummary extends Fragment {
     /**
      * Test if device has a mobile 4G data radio.
      */
-    public static boolean hasMobile4gRadio(Context context) {
+    public static boolean hasReadyMobile4gRadio(Context context) {
         if (!NetworkPolicyEditor.ENABLE_SPLIT_POLICIES) {
             return false;
         }
@@ -2093,7 +2097,8 @@ public class DataUsageSummary extends Fragment {
         final TelephonyManager tele = TelephonyManager.from(context);
 
         final boolean hasWimax = conn.isNetworkSupported(TYPE_WIMAX);
-        final boolean hasLte = tele.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
+        final boolean hasLte = (tele.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE)
+                && hasReadyMobileRadio(context);
         return hasWimax || hasLte;
     }
 
-- 
cgit v1.1


From 7fee527867ae61673495244fba5a163da8878ffa Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Mon, 30 Apr 2012 16:19:46 -0700
Subject: Fix manual brightness adjustment.

getBrightness() was calculating the brightness ratio the wrong
way, resulting in brightness fractions always greater than 1.0
being produced (maximum brightness).

Bug: 6377115
Change-Id: Ia2fbae505ffdc382005722d25301bfb689b585fb
---
 src/com/android/settings/BrightnessPreference.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index e015914..9023ea3 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -55,6 +55,8 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
 	    getContext().getResources().getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
     private static final int MAXIMUM_BACKLIGHT = android.os.Power.BRIGHTNESS_ON;
 
+    private static final int SEEK_BAR_RANGE = 10000;
+
     private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange) {
@@ -98,7 +100,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
         super.onBindDialogView(view);
 
         mSeekBar = getSeekBar(view);
-        mSeekBar.setMax(10000);
+        mSeekBar.setMax(SEEK_BAR_RANGE);
         mOldBrightness = getBrightness();
         mSeekBar.setProgress(mOldBrightness);
 
@@ -141,11 +143,10 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
         } else {
             brightness = Settings.System.getInt(getContext().getContentResolver(),
                     Settings.System.SCREEN_BRIGHTNESS, 100);
-            brightness = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim)
-                    / (brightness - mScreenBrightnessDim);
-            
+            brightness = (brightness - mScreenBrightnessDim)
+                    / (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
         }
-        return (int)(brightness*10000);
+        return (int)(brightness*SEEK_BAR_RANGE);
     }
 
     private int getBrightnessMode(int defaultValue) {
@@ -197,7 +198,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
 
     private void setBrightness(int brightness, boolean write) {
         if (mAutomaticMode) {
-            float valf = (((float)brightness*2)/10000) - 1.0f;
+            float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
             try {
                 IPowerManager power = IPowerManager.Stub.asInterface(
                         ServiceManager.getService("power"));
@@ -213,7 +214,7 @@ public class BrightnessPreference extends SeekBarDialogPreference implements
             }
         } else {
             int range = (MAXIMUM_BACKLIGHT - mScreenBrightnessDim);
-            brightness = (brightness*range)/10000 + mScreenBrightnessDim;
+            brightness = (brightness*range)/SEEK_BAR_RANGE + mScreenBrightnessDim;
             try {
                 IPowerManager power = IPowerManager.Stub.asInterface(
                         ServiceManager.getService("power"));
-- 
cgit v1.1


From 33b5c3539ad4c023bd394837c5a06133eede8a56 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 15 May 2012 11:33:59 -0700
Subject: Clear references after Data Usage View removed.

Bug: 6450986
Change-Id: Ia28479983fc192cbeefb16b8ce03f67241e4002c
---
 src/com/android/settings/DataUsageSummary.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 3b0ce59..4882fbe 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -549,9 +549,7 @@ public class DataUsageSummary extends Fragment {
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-
+    public void onDestroy() {
         mDataEnabledView = null;
         mDisableAtLimitView = null;
 
@@ -559,14 +557,12 @@ public class DataUsageSummary extends Fragment {
         mUidDetailProvider = null;
 
         TrafficStats.closeQuietly(mStatsSession);
-    }
 
-    @Override
-    public void onDestroy() {
         if (this.isRemoving()) {
             getFragmentManager()
                     .popBackStack(TAG_APP_DETAILS, FragmentManager.POP_BACK_STACK_INCLUSIVE);
         }
+
         super.onDestroy();
     }
 
-- 
cgit v1.1


From 8b0abe63c34a8d4ec90cda65e3460121dcb9f629 Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Mon, 14 May 2012 08:21:42 -0700
Subject: Wifi select screen redlines

  Bug: 6458336

Use proportional layout when wifi settings is used
by setup wizard

Change-Id: I91f50df29b23b1bece9cbd65a1426f8bc8d7c7f7
---
 AndroidManifest.xml                             |   5 +-
 res/layout/setup_preference.xml                 | 141 ++++++++++++++++++++++++
 res/values-sw600dp/dimens.xml                   |   5 +
 res/values/colors.xml                           |   2 +
 res/values/dimens.xml                           |  11 ++
 res/values/styles.xml                           |  24 ++++
 src/com/android/settings/wifi/WifiSettings.java |  80 +++++++++++++-
 7 files changed, 264 insertions(+), 4 deletions(-)
 create mode 100644 res/layout/setup_preference.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9dccb4d..d73d2f6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -145,8 +145,9 @@
 
         <activity android:name=".wifi.WifiPickerActivity"
                   android:label="@string/wifi_setup_wizard_title"
-                  android:clearTaskOnLaunch="true"
-                  android:icon="@drawable/empty_icon">
+                  android:theme="@style/setup_wizard_theme"
+                  android:icon="@drawable/empty_icon"
+                  android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
new file mode 100644
index 0000000..93eb9df
--- /dev/null
+++ b/res/layout/setup_preference.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<view
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    class="com.android.settings.wifi.WifiSettings$ProportionalOuterFrame"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/title_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:gravity="bottom">
+
+        <LinearLayout
+            android:id="@+id/button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/title"
+            android:gravity="bottom"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1.0"
+                style="@style/SetupTitle"
+                android:text="@string/wifi_setup_wizard_title"
+                android:gravity="bottom" />
+
+            <ImageButton
+                android:id="@+id/add_network"
+                android:layout_width="@dimen/setup_button_size"
+                android:layout_height="@dimen/setup_button_size"
+                android:layout_marginLeft="8dip"
+                android:layout_marginBottom="8dip"
+                android:src="@drawable/ic_menu_add"
+                android:background="?android:attr/actionBarItemBackground" />
+
+            <ImageButton
+                android:id="@+id/wps_push"
+                android:layout_width="@dimen/setup_button_size"
+                android:layout_height="@dimen/setup_button_size"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="8dip"
+                android:layout_marginBottom="8dip"
+                android:src="@drawable/ic_wps"
+                android:background="?android:attr/actionBarItemBackground" />
+
+        </LinearLayout>
+
+        <!-- Divider -->
+        <View
+            android:id="@+id/top_divider"
+            style="@style/TopDivider"
+            android:layout_below="@id/button_bar" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@id/title_area"
+        android:background="@android:color/transparent"
+        android:orientation="vertical" >
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
+            android:cacheColorHint="@android:color/transparent"
+            android:clipToPadding="false"
+            android:drawSelectorOnTop="false"
+            android:paddingTop="0dip"
+            android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+        <TextView
+            android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:visibility="gone" />
+
+        <RelativeLayout
+            android:id="@+id/button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:visibility="gone" >
+
+            <Button
+                android:id="@+id/back_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_margin="5dip"
+                android:text="@string/wifi_setup_back" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal" >
+
+                <Button
+                    android:id="@+id/skip_button"
+                    android:layout_width="150dip"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dip"
+                    android:text="@string/wifi_setup_skip"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/next_button"
+                    android:layout_width="150dip"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="5dip"
+                    android:text="@string/wifi_setup_next" />
+            </LinearLayout>
+        </RelativeLayout>
+    </LinearLayout>
+</view>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 1fb7e59..aad21a0 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -25,4 +25,9 @@
     <dimen name="content_margin_left">16dip</dimen>
     <dimen name="description_margin_top">26dip</dimen>
     <dimen name="crypt_clock_size">120sp</dimen>
+    <dimen name="setup_title_size">60sp</dimen>
+    <item type="dimen" name="setup_title_height">20%</item>
+    <item type="dimen" name="setup_border_width">10%</item>
+    <dimen name="setup_margin_bottom">0dip</dimen>
+    <dimen name="setup_button_size">48dip</dimen>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2bba937..f81d614 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,4 +32,6 @@
 
     <color name="divider_color">#20ffffff</color>
     <color name="title_color">@android:color/holo_blue_light</color>
+    <color name="setup_divider_color">#333333</color>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ba69f13..f0587c3 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -36,4 +36,15 @@
     <dimen name="volume_seekbar_side_margin">8dip</dimen>
 
     <dimen name="crypt_clock_size">100sp</dimen>
+
+    <item type="dimen" name="setup_title_height">15%</item>
+    <item type="dimen" name="setup_border_width">5%</item>
+    <dimen name="setup_margin_bottom">0dip</dimen>
+    <dimen name="setup_title_size">25sp</dimen>
+    <dimen name="setup_button_size">32dip</dimen>
+
+    <dimen name="divider_height">3dip</dimen>
+    <dimen name="divider_margin_top">6dip</dimen>
+    <dimen name="divider_margin_bottom">7dip</dimen>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6ee99b3..2370683 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -82,6 +82,30 @@
     <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
     </style>
 
+    <style name="setup_wizard_theme" parent="android:Theme.Holo.NoActionBar">
+        <item name="android:windowSoftInputMode">adjustPan</item>
+    </style>
+
+    <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
+         be consistent with ProgressBar -->
+    <style name="TopDivider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/divider_height</item>
+        <item name="android:background">@color/setup_divider_color</item>
+        <item name="android:focusable">false</item>
+        <item name="android:clickable">false</item>
+        <item name="android:layout_marginTop">@dimen/divider_margin_top</item>
+        <item name="android:layout_marginBottom">@dimen/divider_margin_bottom</item>
+    </style>
+
+    <style name="SetupTitle">
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:textSize">@dimen/setup_title_size</item>
+        <item name="android:textColor">@color/title_color</item>
+        <item name="android:clickable">false</item>
+        <item name="android:longClickable">false</item>
+    </style>
+
     <style name="wifi_item">
         <item name="android:layout_width">200dip</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 00e0bc5..ac7f321 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -20,7 +20,6 @@ import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
 
 import android.app.ActionBar;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -28,13 +27,13 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
 import android.net.wifi.ScanResult;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
@@ -46,15 +45,21 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.util.AttributeSet;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.ImageButton;
+import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -188,6 +193,37 @@ public class WifiSettings extends SettingsPreferenceFragment
     }
 
     @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        if (mSetupWizardMode) {
+            View view = inflater.inflate(R.layout.setup_preference, container, false);
+            ImageButton b1 = (ImageButton) view.findViewById(R.id.wps_push);
+            if (b1 != null) {
+                b1.setOnClickListener(new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        showDialog(WPS_PBC_DIALOG_ID);
+                    }
+                });
+            }
+            ImageButton b2 = (ImageButton) view.findViewById(R.id.add_network);
+            if (b2 != null) {
+                b2.setOnClickListener(new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (mWifiManager.isWifiEnabled()) {
+                            onAddNetworkPressed();
+                        }
+                    }
+                });
+            }
+            return view;
+        } else {
+            return super.onCreateView(inflater, container, savedInstanceState);
+        }
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         // We don't call super.onActivityCreated() here, since it assumes we already set up
         // Preference (probably in onCreate()), while WifiSettings exceptionally set it up in
@@ -904,4 +940,44 @@ public class WifiSettings extends SettingsPreferenceFragment
         }
         return R.string.help_url_wifi;
     }
+
+    /**
+     * Used as the outer frame of all setup wizard pages that need to adjust their margins based
+     * on the total size of the available display. (e.g. side margins set to 10% of total width.)
+     */
+    public static class ProportionalOuterFrame extends RelativeLayout {
+        public ProportionalOuterFrame(Context context) {
+            super(context);
+        }
+        public ProportionalOuterFrame(Context context, AttributeSet attrs) {
+            super(context, attrs);
+        }
+        public ProportionalOuterFrame(Context context, AttributeSet attrs, int defStyle) {
+            super(context, attrs, defStyle);
+        }
+
+        /**
+         * Set our margins and title area height proportionally to the available display size
+         */
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
+            int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
+            final Resources resources = getContext().getResources();
+            float titleHeight = resources.getFraction(R.dimen.setup_title_height, 1, 1);
+            float sideMargin = resources.getFraction(R.dimen.setup_border_width, 1, 1);
+            int bottom = resources.getDimensionPixelSize(R.dimen.setup_margin_bottom);
+            setPadding(
+                    (int) (parentWidth * sideMargin),
+                    0,
+                    (int) (parentWidth * sideMargin),
+                    bottom);
+            View title = findViewById(R.id.title_area);
+            if (title != null) {
+                title.setMinimumHeight((int) (parentHeight * titleHeight));
+            }
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+    }
+
 }
-- 
cgit v1.1


From f2ca9200393505d7213aec3ca0c38bafe9a40edf Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 17 May 2012 18:05:17 -0700
Subject: Fix issues 6512411 and 6512951 in ManageApplications.

6512411 java.lang.IndexOutOfBoundsException: Invalid index 0, size is 0
6512951 Settings crash while returning from App info screen

Also fix padding around the UI, and display of storage use.

Change-Id: Ibfcfe1a4a80f25f81ba2cabbb2e3d60aaa9ac04e
---
 .../settings/applications/ManageApplications.java  | 135 ++++++++++++++-------
 1 file changed, 88 insertions(+), 47 deletions(-)

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 1448dfd..88eaef1 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -42,6 +42,7 @@ import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceFrameLayout;
 import android.provider.Settings;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.PagerTabStrip;
@@ -55,17 +56,13 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.Filter;
 import android.widget.Filterable;
-import android.widget.FrameLayout;
 import android.widget.ListView;
-import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.android.internal.app.IMediaContainerService;
@@ -122,6 +119,11 @@ final class CanBeOnSdCardChecker {
     }
 }
 
+interface AppClickListener {
+    void onItemClick(ManageApplications.TabInfo tab, AdapterView<?> parent,
+            View view, int position, long id);
+}
+
 /**
  * Activity to pick an application that will be used to display installation information and
  * options to uninstall/delete user data for system applications. This activity
@@ -129,7 +131,7 @@ final class CanBeOnSdCardChecker {
  * intent.
  */
 public class ManageApplications extends Fragment implements
-        OnItemClickListener, DialogInterface.OnClickListener,
+        AppClickListener, DialogInterface.OnClickListener,
         DialogInterface.OnDismissListener {
 
     static final String TAG = "ManageApplications";
@@ -174,11 +176,10 @@ public class ManageApplications extends Fragment implements
     public static class TabInfo implements OnItemClickListener {
         public final ManageApplications mOwner;
         public final ApplicationsState mApplicationsState;
-        public final IMediaContainerService mContainerService;
         public final CharSequence mLabel;
         public final int mListType;
         public final int mFilter;
-        public final OnItemClickListener mClickListener;
+        public final AppClickListener mClickListener;
         public final CharSequence mInvalidSizeStr;
         public final CharSequence mComputingSizeStr;
         private final Bundle mSavedInstanceState;
@@ -187,6 +188,8 @@ public class ManageApplications extends Fragment implements
         public LayoutInflater mInflater;
         public View mRootView;
 
+        private IMediaContainerService mContainerService;
+
         private View mLoadingContainer;
 
         private View mListContainer;
@@ -200,6 +203,7 @@ public class ManageApplications extends Fragment implements
         private TextView mStorageChartLabel;
         private TextView mUsedStorageText;
         private TextView mFreeStorageText;
+        private long mFreeStorage = 0, mAppStorage = 0, mTotalStorage = 0;
         private long mLastUsedStorage, mLastAppStorage, mLastFreeStorage;
 
         final Runnable mRunningProcessesAvail = new Runnable() {
@@ -209,12 +213,10 @@ public class ManageApplications extends Fragment implements
         };
 
         public TabInfo(ManageApplications owner, ApplicationsState apps,
-                IMediaContainerService containerService,
-                CharSequence label, int listType, OnItemClickListener clickListener,
+                CharSequence label, int listType, AppClickListener clickListener,
                 Bundle savedInstanceState) {
             mOwner = owner;
             mApplicationsState = apps;
-            mContainerService = containerService;
             mLabel = label;
             mListType = listType;
             switch (listType) {
@@ -228,6 +230,11 @@ public class ManageApplications extends Fragment implements
             mSavedInstanceState = savedInstanceState;
         }
 
+        public void setContainerService(IMediaContainerService containerService) {
+            mContainerService = containerService;
+            updateStorageUsage();
+        }
+
         public View build(LayoutInflater inflater, ViewGroup contentParent, View contentChild) {
             if (mRootView != null) {
                 return mRootView;
@@ -260,6 +267,14 @@ public class ManageApplications extends Fragment implements
                 mUsedStorageText = (TextView)mListContainer.findViewById(R.id.usedStorageText);
                 mFreeStorageText = (TextView)mListContainer.findViewById(R.id.freeStorageText);
                 Utils.prepareCustomPreferencesList(contentParent, contentChild, mListView, false);
+                if (mFilter == FILTER_APPS_SDCARD) {
+                    mStorageChartLabel.setText(mOwner.getActivity().getText(
+                            R.string.sd_card_storage));
+                } else {
+                    mStorageChartLabel.setText(mOwner.getActivity().getText(
+                            R.string.internal_storage));
+                }
+                applyCurrentStorage();
             }
             mRunningProcessesView = (RunningProcessesView)mRootView.findViewById(
                     R.id.running_processes);
@@ -270,6 +285,15 @@ public class ManageApplications extends Fragment implements
             return mRootView;
         }
 
+        public void detachView() {
+            if (mRootView != null) {
+                ViewGroup group = (ViewGroup)mRootView.getParent();
+                if (group != null) {
+                    group.removeView(mRootView);
+                }
+            }
+        }
+
         public void resume(int sortOrder) {
             if (mApplications != null) {
                 mApplications.resume(sortOrder);
@@ -295,27 +319,22 @@ public class ManageApplications extends Fragment implements
         }
 
         void updateStorageUsage() {
-            // Fragment view not yet created?
-            if (mRootView == null) return;
             // Make sure a callback didn't come at an inopportune time.
             if (mOwner.getActivity() == null) return;
             // Doesn't make sense for stuff that is not an app list.
             if (mApplications == null) return;
 
-            long freeStorage = 0;
-            long appStorage = 0;
-            long totalStorage = 0;
-            CharSequence newLabel = null;
+            mFreeStorage = 0;
+            mAppStorage = 0;
+            mTotalStorage = 0;
 
             if (mFilter == FILTER_APPS_SDCARD) {
-                newLabel = mOwner.getActivity().getText(R.string.sd_card_storage);
-
                 if (mContainerService != null) {
                     try {
                         final long[] stats = mContainerService.getFileSystemStats(
                                 Environment.getExternalStorageDirectory().getPath());
-                        totalStorage = stats[0];
-                        freeStorage = stats[1];
+                        mTotalStorage = stats[0];
+                        mFreeStorage = stats[1];
                     } catch (RemoteException e) {
                         Log.w(TAG, "Problem in container service", e);
                     }
@@ -325,18 +344,16 @@ public class ManageApplications extends Fragment implements
                     final int N = mApplications.getCount();
                     for (int i=0; i<N; i++) {
                         ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
-                        appStorage += ae.externalCodeSize + ae.externalDataSize;
+                        mAppStorage += ae.externalCodeSize + ae.externalDataSize;
                     }
                 }
             } else {
-                newLabel = mOwner.getActivity().getText(R.string.internal_storage);
-
                 if (mContainerService != null) {
                     try {
                         final long[] stats = mContainerService.getFileSystemStats(
                                 Environment.getDataDirectory().getPath());
-                        totalStorage = stats[0];
-                        freeStorage = stats[1];
+                        mTotalStorage = stats[0];
+                        mFreeStorage = stats[1];
                     } catch (RemoteException e) {
                         Log.w(TAG, "Problem in container service", e);
                     }
@@ -347,21 +364,27 @@ public class ManageApplications extends Fragment implements
                     final int N = mApplications.getCount();
                     for (int i=0; i<N; i++) {
                         ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
-                        appStorage += ae.codeSize + ae.dataSize;
+                        mAppStorage += ae.codeSize + ae.dataSize;
                         if (emulatedStorage) {
-                            appStorage += ae.externalCodeSize + ae.externalDataSize;
+                            mAppStorage += ae.externalCodeSize + ae.externalDataSize;
                         }
                     }
                 }
-                freeStorage += mApplicationsState.sumCacheSizes();
+                mFreeStorage += mApplicationsState.sumCacheSizes();
             }
-            if (newLabel != null) {
-                mStorageChartLabel.setText(newLabel);
+
+            applyCurrentStorage();
+        }
+
+        void applyCurrentStorage() {
+            // If view hierarchy is not yet created, no views to update.
+            if (mRootView == null) {
+                return;
             }
-            if (totalStorage > 0) {
-                mColorBar.setRatios((totalStorage-freeStorage-appStorage)/(float)totalStorage,
-                        appStorage/(float)totalStorage, freeStorage/(float)totalStorage);
-                long usedStorage = totalStorage - freeStorage;
+            if (mTotalStorage > 0) {
+                mColorBar.setRatios((mTotalStorage-mFreeStorage-mAppStorage)/(float)mTotalStorage,
+                        mAppStorage/(float)mTotalStorage, mFreeStorage/(float)mTotalStorage);
+                long usedStorage = mTotalStorage - mFreeStorage;
                 if (mLastUsedStorage != usedStorage) {
                     mLastUsedStorage = usedStorage;
                     String sizeStr = Formatter.formatShortFileSize(
@@ -369,10 +392,10 @@ public class ManageApplications extends Fragment implements
                     mUsedStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_foreground_processes, sizeStr));
                 }
-                if (mLastFreeStorage != freeStorage) {
-                    mLastFreeStorage = freeStorage;
+                if (mLastFreeStorage != mFreeStorage) {
+                    mLastFreeStorage = mFreeStorage;
                     String sizeStr = Formatter.formatShortFileSize(
-                            mOwner.getActivity(), freeStorage);
+                            mOwner.getActivity(), mFreeStorage);
                     mFreeStorageText.setText(mOwner.getActivity().getResources().getString(
                             R.string.service_background_processes, sizeStr));
                 }
@@ -391,7 +414,7 @@ public class ManageApplications extends Fragment implements
 
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-            mClickListener.onItemClick(parent, view, position, id);
+            mClickListener.onItemClick(this, parent, view, position, id);
         }
 
         void handleRunningProcessesAvail() {
@@ -711,6 +734,7 @@ public class ManageApplications extends Fragment implements
             if (mLastSortMode == SORT_ORDER_SIZE) {
                 rebuild(false);
             }
+            mTab.updateStorageUsage();
         }
         
         public int getCount() {
@@ -825,24 +849,24 @@ public class ManageApplications extends Fragment implements
         mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
         mComputingSizeStr = getActivity().getText(R.string.computing_size);
 
-        TabInfo tab = new TabInfo(this, mApplicationsState, mContainerService,
+        TabInfo tab = new TabInfo(this, mApplicationsState,
                 getActivity().getString(R.string.filter_apps_third_party),
                 LIST_TYPE_DOWNLOADED, this, savedInstanceState);
         mTabs.add(tab);
 
         if (!Environment.isExternalStorageEmulated()) {
-            tab = new TabInfo(this, mApplicationsState, mContainerService,
+            tab = new TabInfo(this, mApplicationsState,
                     getActivity().getString(R.string.filter_apps_onsdcard),
                     LIST_TYPE_SDCARD, this, savedInstanceState);
             mTabs.add(tab);
         }
 
-        tab = new TabInfo(this, mApplicationsState, mContainerService,
+        tab = new TabInfo(this, mApplicationsState,
                 getActivity().getString(R.string.filter_apps_running),
                 LIST_TYPE_RUNNING, this, savedInstanceState);
         mTabs.add(tab);
 
-        tab = new TabInfo(this, mApplicationsState, mContainerService,
+        tab = new TabInfo(this, mApplicationsState,
                 getActivity().getString(R.string.filter_apps_all),
                 LIST_TYPE_ALL, this, savedInstanceState);
         mTabs.add(tab);
@@ -866,6 +890,12 @@ public class ManageApplications extends Fragment implements
         PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
         tabs.setTabIndicatorColorResource(android.R.color.holo_blue_light);
 
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
+        }
+
         if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
             buildResetDialog();
         }
@@ -919,6 +949,17 @@ public class ManageApplications extends Fragment implements
     }
 
     @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        // We are going to keep the tab data structures around, but they
+        // are no longer attached to their view hierarchy.
+        for (int i=0; i<mTabs.size(); i++) {
+            mTabs.get(i).detachView();
+        }
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == INSTALLED_APP_DETAILS && mCurrentPkgName != null) {
             mApplicationsState.requestSize(mCurrentPkgName);
@@ -1129,10 +1170,10 @@ public class ManageApplications extends Fragment implements
         return true;
     }
     
-    public void onItemClick(AdapterView<?> parent, View view, int position,
+    public void onItemClick(TabInfo tab, AdapterView<?> parent, View view, int position,
             long id) {
-        if (mCurTab != null && mCurTab.mApplications != null) {
-            ApplicationsState.AppEntry entry = mCurTab.mApplications.getAppEntry(position);
+        if (tab.mApplications != null && tab.mApplications.getCount() > position) {
+            ApplicationsState.AppEntry entry = tab.mApplications.getAppEntry(position);
             mCurrentPkgName = entry.info.packageName;
             startApplicationDetailsActivity();
         }
@@ -1170,8 +1211,8 @@ public class ManageApplications extends Fragment implements
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
             mContainerService = IMediaContainerService.Stub.asInterface(service);
-            if (mCurTab != null) {
-                mCurTab.updateStorageUsage();
+            for (int i=0; i<mTabs.size(); i++) {
+                mTabs.get(i).setContainerService(mContainerService);
             }
         }
 
-- 
cgit v1.1


From b7446255080caa4754b310354eeb28bd5264607e Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Fri, 18 May 2012 10:54:31 -0700
Subject: Add seperate activity for setup wizard wifi picker to adjust theme

  Bug: 6517721

Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
---
 AndroidManifest.xml                                | 18 +++++++++++++----
 .../android/settings/wifi/WifiSetupActivity.java   | 23 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 src/com/android/settings/wifi/WifiSetupActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d73d2f6..62ca8fc 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -144,10 +144,8 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
-                  android:label="@string/wifi_setup_wizard_title"
-                  android:theme="@style/setup_wizard_theme"
-                  android:icon="@drawable/empty_icon"
-                  android:clearTaskOnLaunch="true">
+                android:parentActivityName="Settings"
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -155,6 +153,18 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".wifi.WifiSetupActivity"
+            android:theme="@style/setup_wizard_theme"
+            android:label="@string/wifi_setup_wizard_title"
+                android:icon="@drawable/empty_icon"
+            android:clearTaskOnLaunch="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
                   android:theme="@android:style/Theme.Holo.NoActionBar"
                   android:screenOrientation="behind"
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
new file mode 100644
index 0000000..8415954
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.wifi;
+
+import com.android.settings.ButtonBarHandler;
+
+// dummy class for setup wizard theme
+public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
+
+}
\ No newline at end of file
-- 
cgit v1.1


From c6608376e08427b50667a14138c8e4acb66329a1 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 18 May 2012 14:00:10 -0700
Subject: Avoid NPE until we understand better.

Bug: 6450986
Change-Id: I68af8fedc419cd3142ba2bb7530b77aca7718123
---
 src/com/android/settings/DataUsageSummary.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 4882fbe..1bdc1d1 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1067,6 +1067,10 @@ public class DataUsageSummary extends Fragment {
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
             final Context context = view.getContext();
             final AppItem app = (AppItem) parent.getItemAtPosition(position);
+
+            // TODO: sigh, remove this hack once we understand 6450986
+            if (mUidDetailProvider == null || app == null) return;
+
             final UidDetail detail = mUidDetailProvider.getUidDetail(app.appId, true);
             AppDetailsFragment.show(DataUsageSummary.this, app, detail.label);
         }
-- 
cgit v1.1


From ed427b6fbd60667c38467d0e522b92deaaaab1d3 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Wed, 23 May 2012 10:26:53 -0700
Subject: Match setup wizard wifi settings with new wireframes

  Bug: 6521472

Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
---
 res/drawable-hdpi/ic_menu_add.png               | Bin 534 -> 667 bytes
 res/drawable-mdpi/ic_menu_add.png               | Bin 476 -> 596 bytes
 res/drawable-xhdpi/ic_menu_add.png              | Bin 610 -> 761 bytes
 res/layout/setup_preference.xml                 |  55 ++++++++++++++++++------
 res/menu/wifi_setup.xml                         |  21 +++++++++
 res/values-sw600dp/dimens.xml                   |   1 +
 res/values/dimens.xml                           |   1 +
 res/values/strings.xml                          |   6 +++
 src/com/android/settings/wifi/WifiSettings.java |  40 +++++++++++------
 9 files changed, 99 insertions(+), 25 deletions(-)
 create mode 100644 res/menu/wifi_setup.xml

diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
index 9f7d982..4b68f52 100644
Binary files a/res/drawable-hdpi/ic_menu_add.png and b/res/drawable-hdpi/ic_menu_add.png differ
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
index 254a572..15ffadd 100644
Binary files a/res/drawable-mdpi/ic_menu_add.png and b/res/drawable-mdpi/ic_menu_add.png differ
diff --git a/res/drawable-xhdpi/ic_menu_add.png b/res/drawable-xhdpi/ic_menu_add.png
index 6b1df2f..420510e 100644
Binary files a/res/drawable-xhdpi/ic_menu_add.png and b/res/drawable-xhdpi/ic_menu_add.png differ
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index f90daa4..79d59b3 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -46,23 +46,13 @@
                 android:gravity="bottom" />
 
             <ImageButton
-                android:id="@+id/add_network"
-                android:layout_width="@dimen/setup_button_size"
-                android:layout_height="@dimen/setup_button_size"
-                android:layout_marginLeft="8dip"
-                android:layout_marginBottom="8dip"
-                android:src="@drawable/ic_menu_add"
-                android:background="?android:attr/actionBarItemBackground"
-                android:contentDescription="@string/wifi_add_network" />
-
-            <ImageButton
-                android:id="@+id/wps_push"
+                android:id="@+id/more"
                 android:layout_width="@dimen/setup_button_size"
                 android:layout_height="@dimen/setup_button_size"
                 android:layout_marginLeft="8dip"
                 android:layout_marginRight="8dip"
                 android:layout_marginBottom="8dip"
-                android:src="@drawable/ic_wps"
+                android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
                 android:background="?android:attr/actionBarItemBackground"
                 android:contentDescription="@string/wifi_menu_wps_pbc" />
 
@@ -102,6 +92,47 @@
             android:gravity="center"
             android:visibility="gone" />
 
+        <ImageView
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/setup_item_margin"
+            android:background="@*android:drawable/list_divider_holo_dark" />
+
+        <LinearLayout
+            android:id="@+id/other_network"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/setup_item_margin"
+            android:background="?android:attr/selectableItemBackground"
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeight"
+            android:paddingRight="?android:attr/scrollbarSize" >
+
+            <ImageView
+                android:id="@+id/add_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:src="@drawable/ic_menu_add" />
+
+            <TextView
+                android:id="@+id/other"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="6dip"
+                android:layout_marginLeft="15dip"
+                android:layout_marginRight="6dip"
+                android:layout_marginTop="6dip"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/wifi_other_network" />
+
+        </LinearLayout>
+
         <RelativeLayout
             android:id="@+id/button_bar"
             android:layout_width="match_parent"
diff --git a/res/menu/wifi_setup.xml b/res/menu/wifi_setup.xml
new file mode 100644
index 0000000..91d5516
--- /dev/null
+++ b/res/menu/wifi_setup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/wifi_wps"
+        android:title="@string/wifi_setup_wps" />
+</menu>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index e3c1bd2..80d5368 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -29,4 +29,5 @@
     <item type="dimen" name="setup_border_width">10%</item>
     <dimen name="setup_margin_bottom">0dip</dimen>
     <dimen name="setup_button_size">48dip</dimen>
+    <dimen name="setup_item_margin">32dip</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 49474fa..c397209 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,6 +41,7 @@
     <dimen name="setup_margin_bottom">0dip</dimen>
     <dimen name="setup_title_size">25sp</dimen>
     <dimen name="setup_button_size">32dip</dimen>
+    <dimen name="setup_item_margin">16dip</dimen>
 
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e1ca016..becfff3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1230,6 +1230,12 @@
     <string name="wifi_empty_list_wifi_off">To see available networks, turn Wi-Fi on.</string>
     <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
     <string name="wifi_empty_list_wifi_on">Searching for Wi-Fi networks\u2026</string>
+    <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+    <string name="wifi_other_network">Other network\u2026</string>
+    <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+    <string name="wifi_more">More</string>
+    <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+    <string name="wifi_setup_wps">Automatic setup (WPS)</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options -->
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ac7f321..28b0f36 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -59,6 +59,8 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ImageButton;
+import android.widget.PopupMenu;
+import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
@@ -193,26 +195,38 @@ public class WifiSettings extends SettingsPreferenceFragment
     }
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    public View onCreateView(final LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         if (mSetupWizardMode) {
             View view = inflater.inflate(R.layout.setup_preference, container, false);
-            ImageButton b1 = (ImageButton) view.findViewById(R.id.wps_push);
-            if (b1 != null) {
-                b1.setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        showDialog(WPS_PBC_DIALOG_ID);
+            View other = view.findViewById(R.id.other_network);
+            other.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mWifiManager.isWifiEnabled()) {
+                        onAddNetworkPressed();
                     }
-                });
-            }
-            ImageButton b2 = (ImageButton) view.findViewById(R.id.add_network);
-            if (b2 != null) {
-                b2.setOnClickListener(new OnClickListener() {
+                }
+            });
+            final ImageButton b = (ImageButton) view.findViewById(R.id.more);
+            if (b != null) {
+                b.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         if (mWifiManager.isWifiEnabled()) {
-                            onAddNetworkPressed();
+                            PopupMenu pm = new PopupMenu(inflater.getContext(), b);
+                            pm.inflate(R.menu.wifi_setup);
+                            pm.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+                                @Override
+                                public boolean onMenuItemClick(MenuItem item) {
+                                    if (R.id.wifi_wps == item.getItemId()) {
+                                        showDialog(WPS_PBC_DIALOG_ID);
+                                        return true;
+                                    }
+                                    return false;
+                                }
+                            });
+                            pm.show();
                         }
                     }
                 });
-- 
cgit v1.1


From 02939d4fd80a1d284987742817ec326c4b7b8a21 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 29 May 2012 10:19:50 -0700
Subject: Surface metered networks as "Mobile hotspots."

String changes to give clearer definition of metered networks, and
remove metered control for mobile network.  Also fix NPE when testing
hasEthernet() before session is ready.

Bug: 6494976
Change-Id: Ia55ca3362a05977b9f21ab41eb10bbc738e29620
---
 res/values/strings.xml                                | 12 ++++++------
 src/com/android/settings/DataUsageSummary.java        | 19 +++++++++++--------
 .../settings/net/DataUsageMeteredSettings.java        |  4 +++-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6f1bdad..214d2f5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3749,7 +3749,7 @@
     <!-- Title for checkbox menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_show_ethernet">Show Ethernet usage</string>
     <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
-    <string name="data_usage_menu_metered">Metered networks</string>
+    <string name="data_usage_menu_metered">Mobile hotspots</string>
 
     <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
     <string name="data_usage_change_cycle">Change cycle\u2026</string>
@@ -3804,13 +3804,13 @@
     <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=32] -->
     <string name="data_usage_app_restrict_background">Restrict background data</string>
     <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
-    <string name="data_usage_app_restrict_background_summary">Disable background data on metered networks. Unmetered networks will be used if available.</string>
+    <string name="data_usage_app_restrict_background_summary">Disable background data on mobile networks. Non-mobile networks will be used if available.</string>
     <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=64] -->
     <string name="data_usage_app_restrict_background_summary_disabled">To restrict background data for this app, first set a mobile data limit.</string>
     <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
     <string name="data_usage_app_restrict_dialog_title">Restrict background data?</string>
     <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_app_restrict_dialog">This feature may cause an app that depends on background data to stop working when only metered networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
+    <string name="data_usage_app_restrict_dialog">This feature may cause an app that depends on background data to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
     <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
     <string name="data_usage_restrict_denied_dialog">Restricting background data is possible only when you\'ve set a mobile data limit.</string>
 
@@ -3856,15 +3856,15 @@
     <string name="data_usage_total_during_range_mobile" product="default"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used, as measured by your phone. Your carrier\'s data usage accounting may differ.</string>
 
     <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
-    <string name="data_usage_metered_title">Metered networks</string>
+    <string name="data_usage_metered_title">Mobile hotspots</string>
     <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_metered_body">Select the networks for which data usage is metered.  Apps can be restricted from using these networks when in the background.  Apps may also warn before using these networks for large downloads.</string>
+    <string name="data_usage_metered_body">Select the Wi-Fi networks which are mobile hotspots.  Apps can be restricted from using these networks when in the background.  Apps may also warn before using these networks for large downloads.</string>
     <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
     <string name="data_usage_metered_mobile">Mobile networks</string>
     <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
     <string name="data_usage_metered_wifi">Wi-Fi networks</string>
     <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
-    <string name="data_usage_metered_wifi_disabled">To select metered Wi-Fi networks, turn Wi-Fi on.</string>
+    <string name="data_usage_metered_wifi_disabled">To select mobile hotspots, turn Wi-Fi on.</string>
 
     <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
     <string name="cryptkeeper_emergency_call">Emergency call</string>
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 94c8cda..c58e001 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -104,7 +104,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -2164,15 +2163,19 @@ public class DataUsageSummary extends Fragment {
         final boolean hasEthernet = conn.isNetworkSupported(TYPE_ETHERNET);
 
         final long ethernetBytes;
-        try {
-            ethernetBytes = mStatsSession.getSummaryForNetwork(
-                    NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
-                    .getTotalBytes();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
+        if (mStatsSession != null) {
+            try {
+                ethernetBytes = mStatsSession.getSummaryForNetwork(
+                        NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
+                        .getTotalBytes();
+            } catch (RemoteException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            ethernetBytes = 0;
         }
 
-        // suppress ethernet unless traffic has occurred
+        // only show ethernet when both hardware present and traffic has occurred
         return hasEthernet && ethernetBytes > 0;
     }
 
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index 69326bc..ad12311 100644
--- a/src/com/android/settings/net/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -41,6 +41,8 @@ import com.android.settings.SettingsPreferenceFragment;
  */
 public class DataUsageMeteredSettings extends SettingsPreferenceFragment {
 
+    private static final boolean SHOW_MOBILE_CATEGORY = false;
+
     private NetworkPolicyManager mPolicyManager;
     private WifiManager mWifiManager;
 
@@ -70,7 +72,7 @@ public class DataUsageMeteredSettings extends SettingsPreferenceFragment {
     }
 
     private void updateNetworks(Context context) {
-        if (hasReadyMobileRadio(context)) {
+        if (SHOW_MOBILE_CATEGORY && hasReadyMobileRadio(context)) {
             mMobileCategory.removeAll();
             mMobileCategory.addPreference(buildMobilePref(context));
         } else {
-- 
cgit v1.1


From 9d5cd89c4979b5665aa5227f00300b3c265dc15b Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Tue, 5 Jun 2012 13:20:45 -0700
Subject: Update headers when accounts are changed.

Also pass an account to authenticator settings to avoid Email settings crash.

Bug: 6610990
Change-Id: I42884619728dd97446de65cc77e1729f3e143efa
---
 src/com/android/settings/Settings.java                     | 14 +++++++++++++-
 .../android/settings/accounts/ManageAccountsSettings.java  |  8 ++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index a8599bf..353bc3a 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -26,6 +26,9 @@ import com.android.settings.deviceinfo.Memory;
 import com.android.settings.fuelgauge.PowerUsageSummary;
 import com.android.settings.wifi.WifiEnabler;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.OnAccountsUpdateListener;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -64,7 +67,8 @@ import java.util.List;
 /**
  * Top-level settings activity to handle single pane and double pane UI layout.
  */
-public class Settings extends PreferenceActivity implements ButtonBarHandler {
+public class Settings extends PreferenceActivity
+        implements ButtonBarHandler, OnAccountsUpdateListener {
 
     private static final String LOG_TAG = "Settings";
     private static final String META_DATA_KEY_HEADER_ID =
@@ -183,6 +187,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).resume();
+            AccountManager.get(this).addOnAccountsUpdatedListener(this, null, true);
         }
     }
 
@@ -193,6 +198,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).pause();
+            AccountManager.get(this).removeOnAccountsUpdatedListener(this);
         }
     }
 
@@ -711,6 +717,12 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
         super.setListAdapter(new HeaderAdapter(this, mHeaders, mAuthenticatorHelper));
     }
 
+    @Override
+    public void onAccountsUpdated(Account[] accounts) {
+        mAuthenticatorHelper.onAccountsUpdated(this, accounts);
+        invalidateHeaders();
+    }
+
     /*
      * Settings subclasses for launching independently.
      */
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 909fd92..85cf025 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -60,6 +60,7 @@ import java.util.HashSet;
 public class ManageAccountsSettings extends AccountPreferenceBase
         implements OnAccountsUpdateListener {
 
+    private static final String ACCOUNT_KEY = "account"; // to pass to auth settings
     public static final String KEY_ACCOUNT_TYPE = "account_type";
     public static final String KEY_ACCOUNT_LABEL = "account_label";
 
@@ -74,6 +75,8 @@ public class ManageAccountsSettings extends AccountPreferenceBase
     private SettingsDialogFragment mDialogFragment;
     // If an account type is set, then show only accounts of that type
     private String mAccountType;
+    // Temporary hack, to deal with backward compatibility 
+    private Account mFirstAccount;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -299,6 +302,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
     public void onAccountsUpdated(Account[] accounts) {
         if (getActivity() == null) return;
         getPreferenceScreen().removeAll();
+        mFirstAccount = null;
         addPreferencesFromResource(R.xml.manage_accounts_settings);
         for (int i = 0, n = accounts.length; i < n; i++) {
             final Account account = accounts[i];
@@ -322,6 +326,9 @@ public class ManageAccountsSettings extends AccountPreferenceBase
                 final AccountPreference preference =
                         new AccountPreference(getActivity(), account, icon, auths);
                 getPreferenceScreen().addPreference(preference);
+                if (mFirstAccount == null) {
+                    mFirstAccount = account;
+                }
             }
         }
         if (mAccountType != null) {
@@ -347,6 +354,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
                     prefs.removePreference(prefs.getPreference(i));
                     continue;
                 } else {
+                    intent.putExtra(ACCOUNT_KEY, mFirstAccount);
                     intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK);
                 }
             }
-- 
cgit v1.1


From 7154257b23d1a85f3a7ec4ecbf02c9e18e4440dd Mon Sep 17 00:00:00 2001
From: Amith Yamasani <yamasani@google.com>
Date: Wed, 6 Jun 2012 20:23:08 -0700
Subject: Add back a SYNC_SETTINGS screen

Revive the old Accounts&Sync screen as a dialog with the auto-sync
checkbox and a list of accounts. This will be launched when Apps
request a SYNC_SETTINGS page for controlling account and master sync.

Auto-sync data checkbox will also continue to exist in Data Usage.

Minor fixes to account list and account update monitoring.

Bug: 6614013
Bug: 6622995
Bug: 6610247
Change-Id: I35c0919a29c6bc7e5edf64f2734a3ef4f5ae5e7a
---
 AndroidManifest.xml                                |  12 +-
 res/values/dimens.xml                              |   2 +-
 res/xml/sync_settings.xml                          |  21 +++
 src/com/android/settings/AccountPreference.java    |  34 ++--
 src/com/android/settings/Settings.java             |  13 +-
 .../settings/accounts/ManageAccountsSettings.java  |  20 +--
 .../android/settings/accounts/SyncSettings.java    | 174 +++++++++++++++++++++
 .../settings/accounts/SyncSettingsActivity.java    |  34 ++++
 8 files changed, 287 insertions(+), 23 deletions(-)
 create mode 100644 res/xml/sync_settings.xml
 create mode 100644 src/com/android/settings/accounts/SyncSettings.java
 create mode 100644 src/com/android/settings/accounts/SyncSettingsActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 09767bf..cf1f888 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1366,6 +1366,7 @@
 
         <activity android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
+            android:parentActivityName="Settings"
             android:uiOptions="none">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1378,6 +1379,16 @@
                 android:resource="@id/account_settings" />
         </activity>
 
+        <activity android:name=".accounts.SyncSettingsActivity"
+            android:label="@string/account_sync_settings_title"
+            android:theme="@android:style/Theme.Holo.Dialog">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.SYNC_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="com.android.settings.accounts.AddAccountSettings"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -1441,7 +1452,6 @@
                 android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.SYNC_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3911fd5..9335788 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -48,7 +48,7 @@
     <dimen name="divider_margin_bottom">7dip</dimen>
 
     <!--  Size of icons in the top-level of settings  -->
-    <dimen name="header_icon_width">32dp</dimen>
+    <dimen name="header_icon_width">28dp</dimen>
     <dimen name="appwidget_min_width">260dip</dimen>
     <dimen name="appwidget_min_height">40dip</dimen>
 </resources>
diff --git a/res/xml/sync_settings.xml b/res/xml/sync_settings.xml
new file mode 100644
index 0000000..530f4ab
--- /dev/null
+++ b/res/xml/sync_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <CheckBoxPreference
+        android:key="sync_switch"
+        android:title="@string/sync_automatically" />
+</PreferenceScreen>
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java
index e7919dd..2cc013c 100644
--- a/src/com/android/settings/AccountPreference.java
+++ b/src/com/android/settings/AccountPreference.java
@@ -39,16 +39,24 @@ public class AccountPreference extends Preference {
     private int mStatus;
     private Account mAccount;
     private ArrayList<String> mAuthorities;
+    private ImageView mSyncStatusIcon;
+    private boolean mShowTypeIcon;
 
     public AccountPreference(Context context, Account account, Drawable icon,
-            ArrayList<String> authorities) {
+            ArrayList<String> authorities, boolean showTypeIcon) {
         super(context);
         mAccount = account;
         mAuthorities = authorities;
+        mShowTypeIcon = showTypeIcon;
+        if (showTypeIcon) {
+            setIcon(icon);
+        } else {
+            setIcon(getSyncStatusIcon(SYNC_DISABLED));
+        }
         setTitle(mAccount.name);
         setSummary("");
         setPersistent(false);
-        setSyncStatus(SYNC_DISABLED);
+        setSyncStatus(SYNC_DISABLED, false);
     }
 
     public Account getAccount() {
@@ -62,16 +70,22 @@ public class AccountPreference extends Preference {
     @Override
     protected void onBindView(View view) {
         super.onBindView(view);
-        setSummary(getSyncStatusMessage(mStatus));
-        ImageView iconView = (ImageView) view.findViewById(android.R.id.icon);
-        iconView.setImageResource(getSyncStatusIcon(mStatus));
-        iconView.setContentDescription(getSyncContentDescription(mStatus));
+        if (!mShowTypeIcon) {
+            mSyncStatusIcon = (ImageView) view.findViewById(android.R.id.icon);
+            mSyncStatusIcon.setImageResource(getSyncStatusIcon(mStatus));
+            mSyncStatusIcon.setContentDescription(getSyncContentDescription(mStatus));
+        }
     }
 
-    public void setSyncStatus(int status) {
+    public void setSyncStatus(int status, boolean updateSummary) {
         mStatus = status;
-        setIcon(getSyncStatusIcon(status));
-        setSummary(getSyncStatusMessage(status));
+        if (!mShowTypeIcon && mSyncStatusIcon != null) {
+            mSyncStatusIcon.setImageResource(getSyncStatusIcon(status));
+            mSyncStatusIcon.setContentDescription(getSyncContentDescription(mStatus));
+        }
+        if (updateSummary) {
+            setSummary(getSyncStatusMessage(status));
+        }
     }
 
     private int getSyncStatusMessage(int status) {
@@ -109,7 +123,7 @@ public class AccountPreference extends Preference {
                 res = R.drawable.ic_sync_red_holo;
                 break;
             case SYNC_IN_PROGRESS:
-                res = R.drawable.ic_sync_grey_holo;
+                res = R.drawable.ic_sync_green_holo;
                 break;
             default:
                 res = R.drawable.ic_sync_red_holo;
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 353bc3a..50019a3 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -112,6 +112,7 @@ public class Settings extends PreferenceActivity
 
     private AuthenticatorHelper mAuthenticatorHelper;
     private Header mLastHeader;
+    private boolean mListeningToAccountUpdates;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -187,7 +188,6 @@ public class Settings extends PreferenceActivity
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).resume();
-            AccountManager.get(this).addOnAccountsUpdatedListener(this, null, true);
         }
     }
 
@@ -198,6 +198,13 @@ public class Settings extends PreferenceActivity
         ListAdapter listAdapter = getListAdapter();
         if (listAdapter instanceof HeaderAdapter) {
             ((HeaderAdapter) listAdapter).pause();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (mListeningToAccountUpdates) {
             AccountManager.get(this).removeOnAccountsUpdatedListener(this);
         }
     }
@@ -462,6 +469,10 @@ public class Settings extends PreferenceActivity
         for (Header header : accountHeaders) {
             target.add(headerIndex++, header);
         }
+        if (!mListeningToAccountUpdates) {
+            AccountManager.get(this).addOnAccountsUpdatedListener(this, null, true);
+            mListeningToAccountUpdates = true;
+        }
         return headerIndex;
     }
 
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 85cf025..bb1ebdd 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -166,8 +166,8 @@ public class ManageAccountsSettings extends AccountPreferenceBase
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         boolean syncActive = ContentResolver.getCurrentSync() != null;
-        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive);
-        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive);
+        menu.findItem(MENU_SYNC_NOW_ID).setVisible(!syncActive && mFirstAccount != null);
+        menu.findItem(MENU_SYNC_CANCEL_ID).setVisible(syncActive && mFirstAccount != null);
     }
 
     @Override
@@ -274,16 +274,16 @@ public class ManageAccountsSettings extends AccountPreferenceBase
                 }
             }
             if (syncIsFailing) {
-                accountPref.setSyncStatus(AccountPreference.SYNC_ERROR);
+                accountPref.setSyncStatus(AccountPreference.SYNC_ERROR, true);
             } else if (syncCount == 0) {
-                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED);
+                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED, true);
             } else if (syncCount > 0) {
                 if (syncingNow) {
-                    accountPref.setSyncStatus(AccountPreference.SYNC_IN_PROGRESS);
+                    accountPref.setSyncStatus(AccountPreference.SYNC_IN_PROGRESS, true);
                 } else {
-                    accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED);
+                    accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED, true);
                     if (lastSuccessTime > 0) {
-                        accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED);
+                        accountPref.setSyncStatus(AccountPreference.SYNC_ENABLED, false);
                         date.setTime(lastSuccessTime);
                         final String timeString = formatSyncDate(date);
                         accountPref.setSummary(getResources().getString(
@@ -291,7 +291,7 @@ public class ManageAccountsSettings extends AccountPreferenceBase
                     }
                 }
             } else {
-                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED);
+                accountPref.setSyncStatus(AccountPreference.SYNC_DISABLED, true);
             }
         }
 
@@ -324,14 +324,14 @@ public class ManageAccountsSettings extends AccountPreferenceBase
             if (showAccount) {
                 final Drawable icon = getDrawableForType(account.type);
                 final AccountPreference preference =
-                        new AccountPreference(getActivity(), account, icon, auths);
+                        new AccountPreference(getActivity(), account, icon, auths, false);
                 getPreferenceScreen().addPreference(preference);
                 if (mFirstAccount == null) {
                     mFirstAccount = account;
                 }
             }
         }
-        if (mAccountType != null) {
+        if (mAccountType != null && mFirstAccount != null) {
             addAuthenticatorSettings();
         }
         onSyncStateUpdated();
diff --git a/src/com/android/settings/accounts/SyncSettings.java b/src/com/android/settings/accounts/SyncSettings.java
new file mode 100644
index 0000000..20c296a
--- /dev/null
+++ b/src/com/android/settings/accounts/SyncSettings.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.OnAccountsUpdateListener;
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.util.Log;
+
+import com.android.settings.AccountPreference;
+import com.android.settings.DialogCreatable;
+import com.android.settings.R;
+
+import java.util.ArrayList;
+
+public class SyncSettings extends AccountPreferenceBase
+        implements OnAccountsUpdateListener, DialogCreatable {
+
+    private static final String KEY_SYNC_SWITCH = "sync_switch";
+
+    private String[] mAuthorities;
+
+    private SettingsDialogFragment mDialogFragment;
+    private CheckBoxPreference mAutoSyncPreference;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        addPreferencesFromResource(R.xml.sync_settings);
+        mAutoSyncPreference =
+                (CheckBoxPreference) getPreferenceScreen().findPreference(KEY_SYNC_SWITCH);
+        mAutoSyncPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                ContentResolver.setMasterSyncAutomatically((Boolean) newValue);
+                return true;
+            }
+        });
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        Activity activity = getActivity();
+        AccountManager.get(activity).addOnAccountsUpdatedListener(this, null, true);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final Activity activity = getActivity();
+        mAutoSyncPreference.setChecked(ContentResolver.getMasterSyncAutomatically());
+        mAuthorities = activity.getIntent().getStringArrayExtra(AUTHORITIES_FILTER_KEY);
+
+        updateAuthDescriptions();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        final Activity activity = getActivity();
+        AccountManager.get(activity).removeOnAccountsUpdatedListener(this);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(PreferenceScreen preferences, Preference preference) {
+        if (preference instanceof AccountPreference) {
+            startAccountSettings((AccountPreference) preference);
+        } else {
+            return false;
+        }
+        return true;
+    }
+
+    private void startAccountSettings(AccountPreference acctPref) {
+        Intent intent = new Intent("android.settings.ACCOUNT_SYNC_SETTINGS");
+        intent.putExtra(AccountSyncSettings.ACCOUNT_KEY, acctPref.getAccount());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+        finish();
+    }
+
+    @Override
+    public void showDialog(int dialogId) {
+        if (mDialogFragment != null) {
+            Log.e(TAG, "Old dialog fragment not null!");
+        }
+        mDialogFragment = new SettingsDialogFragment(this, dialogId);
+        mDialogFragment.show(getActivity().getFragmentManager(), Integer.toString(dialogId));
+    }
+
+    private void removeAccountPreferences() {
+        PreferenceScreen parent = getPreferenceScreen();
+        for (int i = 0; i < parent.getPreferenceCount(); ) {
+            if (parent.getPreference(i) instanceof AccountPreference) {
+                parent.removePreference(parent.getPreference(i));
+            } else {
+                i++;
+            }
+        }
+    }
+
+    @Override
+    public void onAccountsUpdated(Account[] accounts) {
+        if (getActivity() == null) return;
+
+        removeAccountPreferences();
+        for (int i = 0, n = accounts.length; i < n; i++) {
+            final Account account = accounts[i];
+            final ArrayList<String> auths = getAuthoritiesForAccountType(account.type);
+
+            boolean showAccount = true;
+            if (mAuthorities != null && auths != null) {
+                showAccount = false;
+                for (String requestedAuthority : mAuthorities) {
+                    if (auths.contains(requestedAuthority)) {
+                        showAccount = true;
+                        break;
+                    }
+                }
+            }
+
+            if (showAccount) {
+                final Drawable icon = getDrawableForType(account.type);
+                final AccountPreference preference =
+                        new AccountPreference(getActivity(), account, icon, auths, true);
+                getPreferenceScreen().addPreference(preference);
+                preference.setSummary(getLabelForType(account.type));
+            }
+        }
+        onSyncStateUpdated();
+    }
+
+    @Override
+    protected void onAuthDescriptionsUpdated() {
+        // Update account icons for all account preference items
+        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
+            Preference pref = getPreferenceScreen().getPreference(i);
+            if (pref instanceof AccountPreference) {
+                AccountPreference accPref = (AccountPreference)
+                        getPreferenceScreen().getPreference(i);
+                accPref.setIcon(getDrawableForType(accPref.getAccount().type));
+                accPref.setSummary(getLabelForType(accPref.getAccount().type));
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/accounts/SyncSettingsActivity.java b/src/com/android/settings/accounts/SyncSettingsActivity.java
new file mode 100644
index 0000000..ed0089e
--- /dev/null
+++ b/src/com/android/settings/accounts/SyncSettingsActivity.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accounts;
+
+import android.content.Intent;
+import android.preference.PreferenceActivity;
+
+/**
+ * Launcher activity for the SyncSettings fragment.
+ *
+ */
+public class SyncSettingsActivity extends PreferenceActivity {
+    @Override
+    public Intent getIntent() {
+        Intent modIntent = new Intent(super.getIntent());
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, SyncSettings.class.getName());
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
+}
\ No newline at end of file
-- 
cgit v1.1


From d7b5290ed1511db4bd18c0d6868bd1031d60a1f1 Mon Sep 17 00:00:00 2001
From: Danielle Millett <dmillett@google.com>
Date: Wed, 6 Jun 2012 13:54:11 -0400
Subject: Removing head turn and putting blink back

Changing the strings and workflow in settings to be blink again
instead of the new head turn.  This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
---
 res/layout/biometric_weak_liveliness.xml           |  46 -------
 res/values/strings.xml                             |  11 +-
 res/xml/security_settings_biometric_weak.xml       |   6 +-
 .../android/settings/BiometricWeakLiveliness.java  | 136 ---------------------
 src/com/android/settings/SecuritySettings.java     |  36 +++++-
 5 files changed, 37 insertions(+), 198 deletions(-)
 delete mode 100644 res/layout/biometric_weak_liveliness.xml
 delete mode 100644 src/com/android/settings/BiometricWeakLiveliness.java

diff --git a/res/layout/biometric_weak_liveliness.xml b/res/layout/biometric_weak_liveliness.xml
deleted file mode 100644
index 916bd9a..0000000
--- a/res/layout/biometric_weak_liveliness.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:paddingLeft="6dip"
-    android:paddingRight="6dip"
-    android:layout_width="match_parent" android:layout_height="wrap_content"
-    android:scrollbars="vertical" >
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView android:id="@+id/biometric_weak_liveliness_explained"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dip"
-                android:gravity="top"
-                android:text="@string/biometric_weak_liveliness_explained"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-        </LinearLayout>
-
-    </ScrollView>
-
-</LinearLayout>
-
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ebe764c..7aa2b8a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -644,15 +644,10 @@
 
     <!-- Security settings screen when using face unlock, setting option name to start an activity that allows the user to improve accuracy by adding additional enrollment faces -->
     <string name="biometric_weak_improve_matching_title">Improve face matching</string>
-    <!-- On the security settings screen when using face unlock.  This goes to a screen that explains liveliness detection and allows for it to be turned on/off -->
+<!-- On the security settings screen when using face unlock.  This checkbox is used to toggle whether liveliness detection is required.  If it is checked the user must blink during unlock to prove it's not a photo  -->
     <string name="biometric_weak_liveliness_title">Liveness check</string>
-    <!-- Used to describe the on state of the face unlock liveliness feature -->
-    <string name="biometric_weak_liveliness_on_summary">On - head turn required to unlock</string>
-    <!-- Used to describe the off state of the face unlock liveliness feature -->
-    <string name="biometric_weak_liveliness_off_summary">Off</string>
-    <!-- Explanation of the Face Unlock liveliness feature. It's displayed on a screen with an on/off toggle switch. -->
-    <!-- Explanation of the Face Unlock liveliness feature. It's displayed on a screen with an on/off toggle switch. -->
-    <string name="biometric_weak_liveliness_explained" product="default">To improve security, you\'ll be asked to turn your head while unlocking.  When prompted, turn to the left or right.</string>
+    <!-- On the security settings screen when using face unlock.  The summary of the liveliness checkbox -->
+    <string name="biometric_weak_liveliness_summary">Require eye blink while unlocking</string>
 
     <!-- Security settings screen, setting option name to change screen timeout -->
     <string name="lock_after_timeout">Automatically lock</string>
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 66cca28..6593f07 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -30,10 +30,10 @@
             android:key="biometric_weak_improve_matching"
             android:title="@string/biometric_weak_improve_matching_title"/>
 
-        <PreferenceScreen
+        <CheckBoxPreference
            android:key="biometric_weak_liveliness"
-           android:fragment="com.android.settings.BiometricWeakLiveliness"
-           android:title="@string/biometric_weak_liveliness_title"/>
+           android:title="@string/biometric_weak_liveliness_title"
+           android:summary="@string/biometric_weak_liveliness_summary"/>
 
         <CheckBoxPreference
             android:key="visiblepattern"
diff --git a/src/com/android/settings/BiometricWeakLiveliness.java b/src/com/android/settings/BiometricWeakLiveliness.java
deleted file mode 100644
index 6bba77f..0000000
--- a/src/com/android/settings/BiometricWeakLiveliness.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.Fragment;
-import android.os.Bundle;
-import android.os.Handler;
-import android.content.Intent;
-import android.preference.PreferenceActivity;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CompoundButton;
-import android.widget.Switch;
-import com.android.settings.R;
-
-import com.android.internal.widget.LockPatternUtils;
-
-public class BiometricWeakLiveliness extends Fragment
-        implements CompoundButton.OnCheckedChangeListener {
-    private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
-
-    private View mView;
-    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
-    private LockPatternUtils mLockPatternUtils;
-    private Switch mActionBarSwitch;
-    private boolean mSuppressCheckChanged;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Activity activity = getActivity();
-
-        mActionBarSwitch = new Switch(activity);
-        mSuppressCheckChanged = false;
-
-        if (activity instanceof PreferenceActivity) {
-            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
-            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
-                final int padding = activity.getResources().getDimensionPixelSize(
-                        R.dimen.action_bar_switch_padding);
-                mActionBarSwitch.setPadding(0, 0, padding, 0);
-                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                        ActionBar.DISPLAY_SHOW_CUSTOM);
-                activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.RIGHT));
-                activity.getActionBar().setTitle(R.string.biometric_weak_liveliness_title);
-            }
-        }
-
-        mActionBarSwitch.setOnCheckedChangeListener(this);
-
-        mLockPatternUtils = new LockPatternUtils(getActivity());
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
-        mActionBarSwitch.setChecked(mLockPatternUtils.isBiometricWeakLivelinessEnabled());
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        mView = inflater.inflate(R.layout.biometric_weak_liveliness, container, false);
-        initView(mView);
-        return mView;
-    }
-
-    private void initView(View view) {
-        mActionBarSwitch.setOnCheckedChangeListener(this);
-        mActionBarSwitch.setChecked(mLockPatternUtils.isBiometricWeakLivelinessEnabled());
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean desiredState) {
-        if (mSuppressCheckChanged) {
-            return;
-        }
-        mActionBarSwitch.setEnabled(false);
-        if (desiredState) {
-            mLockPatternUtils.setBiometricWeakLivelinessEnabled(true);
-            mActionBarSwitch.setChecked(true);
-        } else {
-            // In this case the user has just turned it off, but this action requires them
-            // to confirm their password.  We need to turn the switch back on until
-            // they've confirmed their password
-            mActionBarSwitch.setChecked(true);
-            mActionBarSwitch.requestLayout();
-            ChooseLockSettingsHelper helper =
-                    new ChooseLockSettingsHelper(this.getActivity(), this);
-            if (!helper.launchConfirmationActivity(
-                            CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF, null, null)) {
-                // If this returns false, it means no password confirmation is required, so
-                // go ahead and turn it off here.
-                // Note: currently a backup is required for biometric_weak so this code path
-                // can't be reached, but is here in case things change in the future
-                mLockPatternUtils.setBiometricWeakLivelinessEnabled(false);
-                mActionBarSwitch.setChecked(false);
-                mActionBarSwitch.requestLayout();
-            }
-        }
-        mActionBarSwitch.setEnabled(true);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF &&
-                resultCode == Activity.RESULT_OK) {
-            final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
-            lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
-            mSuppressCheckChanged = true;
-            mActionBarSwitch.setChecked(false);
-            mSuppressCheckChanged = false;
-            return;
-        }
-    }
-
-}
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 6b67730..a12da3e 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -62,6 +62,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String KEY_LOCK_AFTER_TIMEOUT = "lock_after_timeout";
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
+    private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
 
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
@@ -76,7 +77,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private LockPatternUtils mLockPatternUtils;
     private ListPreference mLockAfter;
 
-    private PreferenceScreen mBiometricWeakLiveliness;
+    private CheckBoxPreference mBiometricWeakLiveliness;
     private CheckBoxPreference mVisiblePattern;
     private CheckBoxPreference mTactileFeedback;
 
@@ -162,7 +163,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
         // biometric weak liveliness
         mBiometricWeakLiveliness =
-                (PreferenceScreen) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS);
+                (CheckBoxPreference) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS);
 
         // visible pattern
         mVisiblePattern = (CheckBoxPreference) root.findPreference(KEY_VISIBLE_PATTERN);
@@ -338,9 +339,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
         if (mBiometricWeakLiveliness != null) {
-            mBiometricWeakLiveliness.setSummary(lockPatternUtils.isBiometricWeakLivelinessEnabled()?
-                    R.string.biometric_weak_liveliness_on_summary:
-                    R.string.biometric_weak_liveliness_off_summary);
+            mBiometricWeakLiveliness.setChecked(
+                    lockPatternUtils.isBiometricWeakLivelinessEnabled());
         }
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
@@ -382,6 +382,26 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 // can't be reached, but is here in case things change in the future
                 startBiometricWeakImprove();
             }
+        } else if (KEY_BIOMETRIC_WEAK_LIVELINESS.equals(key)) {
+            if (isToggled(preference)) {
+                lockPatternUtils.setBiometricWeakLivelinessEnabled(true);
+            } else {
+                // In this case the user has just unchecked the checkbox, but this action requires
+                // them to confirm their password.  We need to re-check the checkbox until
+                // they've confirmed their password
+                mBiometricWeakLiveliness.setChecked(true);
+                ChooseLockSettingsHelper helper =
+                        new ChooseLockSettingsHelper(this.getActivity(), this);
+                if (!helper.launchConfirmationActivity(
+                                CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF, null, null)) {
+                    // If this returns false, it means no password confirmation is required, so
+                    // go ahead and uncheck it here.
+                    // Note: currently a backup is required for biometric_weak so this code path
+                    // can't be reached, but is here in case things change in the future
+                    lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
+                    mBiometricWeakLiveliness.setChecked(false);
+                }
+            }
         } else if (KEY_LOCK_ENABLED.equals(key)) {
             lockPatternUtils.setLockPatternEnabled(isToggled(preference));
         } else if (KEY_VISIBLE_PATTERN.equals(key)) {
@@ -422,6 +442,12 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 resultCode == Activity.RESULT_OK) {
             startBiometricWeakImprove();
             return;
+        } else if (requestCode == CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF &&
+                resultCode == Activity.RESULT_OK) {
+            final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
+            lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
+            mBiometricWeakLiveliness.setChecked(false);
+            return;
         }
         createPreferenceHierarchy();
     }
-- 
cgit v1.1