From 9d6c40e56d799427ba30495238b2077cdc3c2115 Mon Sep 17 00:00:00 2001
From: Maggie Benthall <mbenthall@google.com>
Date: Thu, 5 Sep 2013 15:33:58 -0400
Subject: [PATCH] Activity for messaging installed CA certs, and icon in
 Settings.

Add the MonitoringCertInfoActivity, used by Settings, QuickSettings
and notification to explain about CA certs enabling network traffic
monitoring.
Add a button on the Security item in Settings when a cert is installed.

Bug: 10633199

Change-Id: Ic753fe22b66c30d837a9ba471a0632a07bb7471f
---
 AndroidManifest.xml                           |  12 ++
 res/drawable-hdpi/ic_qs_certificate_info.png  | Bin 0 -> 1803 bytes
 res/drawable-mdpi/ic_qs_certificate_info.png  | Bin 0 -> 1252 bytes
 res/drawable-xhdpi/ic_qs_certificate_info.png | Bin 0 -> 2554 bytes
 .../ic_qs_certificate_info.png                | Bin 0 -> 3039 bytes
 res/layout/preference_header_button_item.xml  |  83 +++++++++++++
 res/values/dimens.xml                         |   1 +
 res/values/strings.xml                        |  16 +++
 res/values/styles.xml                         |   8 ++
 .../settings/MonitoringCertInfoActivity.java  |  94 +++++++++++++++
 src/com/android/settings/Settings.java        | 110 +++++++++++++-----
 11 files changed, 297 insertions(+), 27 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_qs_certificate_info.png
 create mode 100644 res/drawable-mdpi/ic_qs_certificate_info.png
 create mode 100644 res/drawable-xhdpi/ic_qs_certificate_info.png
 create mode 100644 res/drawable-xxhdpi/ic_qs_certificate_info.png
 create mode 100644 res/layout/preference_header_button_item.xml
 create mode 100644 src/com/android/settings/MonitoringCertInfoActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 653290d45f7..eced663e67a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -854,6 +854,18 @@
                 android:resource="@id/security_settings" />
         </activity>
 
+        <activity android:name="MonitoringCertInfoActivity"
+                android:label="@string/ssl_ca_cert_dialog_title"
+                android:theme="@style/Transparent"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.android.settings.MONITORING_CERT_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name="Settings$TrustedCredentialsSettingsActivity"
                 android:label="@string/trusted_credentials"
                 android:taskAffinity=""
diff --git a/res/drawable-hdpi/ic_qs_certificate_info.png b/res/drawable-hdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..1fdaaf9f8dac775324bbaf3f9fc2c9c7cb0298c3
GIT binary patch
literal 1803
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_qs_certificate_info.png b/res/drawable-mdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b49472cd9ae57e23ab59905e6495fe3c7b5e43c
GIT binary patch
literal 1252
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}U;vjb?
zhIQv;UV>C6dj$D1FjT2AFf_C<F#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~
zy9>jA5L~c#`DCC7XMsm#F_88EW4Dvpb_@*6TRdGHLn00zo$lKq>Mn4+-uV5`jXzw4
zLhf{PXnQ%BHK`m?74YPf3;7@=z}hV5<j^FpKWR=;w|KrKi+#}qnI@M`j<yE}bv{12
z{z~gnpb1x2$1&5&_wx^jyj^|W+V=g^l*0kWw*OcC3ok7%HQn<pjE8xW$j8(R!Ab58
z*MD~>ZTRWtBC%u3^ZSuUk5o8qVl8P?4En7uakyt^cy~j2<M)QI2WGpy;!oh(!4k98
zu0KTG-RkvL+twx1_UcdnvUJJsRZ-!^v%lY+uqFJG)8$;&*=Ge;%zVxFfwO=mf^iQ+
z9osp^%Lk0RFGL@(KERi7=+`>N-;JIN?wZt=&YS+N?#P~56TkE>x!B-Y$~{?H<!?sS
zdX?H)Zb<<zYCkMadopjyS<ao?Y(KyK_})n1rt-_yn;B|?Y~=?SgXc`!a_rYL)}mUs
zr1>{zq`!|={j0lD`K5EY!SlV+_0gBSJ<qG=@-#1B7^nNv+B4o;%JX01M8`{c#m~ID
zP77LOa>Xxcmfn_oKfYCV!`i%~>~Fre{l4?NxOu(t16j{*Bkpq>g(odjiS6h%-aOB&
zMfX<MjVs#oe;@8--)Xv8p*P_0BD?%;_rGT_PFeQiR<zH&a_g7-N?jAo3;1{N<$QT@
z<xS~(>*S*1Gmg1cFE=gmTCd-Do9)##72fv|Y(2Mrdwg22FQK-6rc8feS9B6f1g8zl
zzodfV!?D%ROqAd6U{?!gvAtyb@}>FYby>=Re2sHuCusS8=Y8>3{sCubT)e@Oi_Zi?
zU!U&Wm-s2OWPwS(_XE*_=~;Q<)*7>Sx99sMtUa0eUcam9(zBDwg(sh||2N)a`F^4K
zT>065*0NumlUs4^iQeS7M<R0Wc4U6o=e#w#jH$nA@?8l=bEC`#&V<>5+36lzn%+c5
zFuv9-m){^_;kT77>PYLnCm&^}ZOrqE3Y+}+Z|&|S@hX2+GHWM&O%l7CQhHF>`aoKt
zW@E;K851o;&;2MnaP?fJg|&@s|E)?z&-uK;!aoXkg<M*q`A;FUFyPyv#arG_`^7C<
zp5${Wbo0ktsfB9%GF!YZr5YQkzFd53bIrQC=up-#CrbQTCb>>?Xge~=Kz33|VCYKI
zWvgC&)zFz{qW5yalIXU%6H7F1WXst&AL`7R`enD|w@<$}@|J~Pn%|h>ekpS`W6iBi
z&HTG&9Qm|o$*u_%FKykX#{EqylKvrT;rrgCclxYbMK;x;o;SWpZZeaP$as>*QEI<;
zkHLp9lMm}coR4gdmh#_k|4sIM^SWf`yM4wfL3i)%;Vow0@=ad$c_35Qsoo{PjI3JX
z8c~vxSdwa$T$Bo=7>o=IjdcwybdAhH3@ojTjI0bTbPdd{3=9^XdXRvkAvZrIGp!Q0
zhRf3<?f^ANf@}!RPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQJedkAZ5TXV{an^LB{Ts5
DfjA|x

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_qs_certificate_info.png b/res/drawable-xhdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3de2ce847b7d1ae3f8ea18e3557504405c303f0
GIT binary patch
literal 2554
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
I>ANNU2mec~N&o-=

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_qs_certificate_info.png b/res/drawable-xxhdpi/ic_qs_certificate_info.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d6f6c772cd51bb8a8396f2e8f6fde1d81602166
GIT binary patch
literal 3039
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
HsgnNy^)VP2

literal 0
HcmV?d00001

diff --git a/res/layout/preference_header_button_item.xml b/res/layout/preference_header_button_item.xml
new file mode 100644
index 00000000000..ecbd14b024d
--- /dev/null
+++ b/res/layout/preference_header_button_item.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 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.
+-->
+
+<!-- Layout of a header item in PreferenceActivity. -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:descendantFocusability="blocksDescendants"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="48dp"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:gravity="center_vertical"
+    android:paddingEnd="?android:attr/scrollbarSize">
+
+    <LinearLayout
+        android:layout_width="@dimen/header_icon_width"
+        android:layout_marginStart="6dip"
+        android:layout_marginEnd="6dip"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="2dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
+        android:layout_weight="1">
+
+        <TextView android:id="@+android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:ellipsize="end"
+            android:maxLines="2" />
+
+    </RelativeLayout>
+
+   <View
+       android:id="@+id/divider"
+       style="@style/VertDivider"
+       android:layout_marginTop="6dp"
+       android:layout_marginBottom="6dp" />
+
+   <ImageButton android:id="@+id/buttonWidget"
+       android:layout_width="wrap_content"
+       android:layout_height="wrap_content"
+       android:layout_gravity="center"
+       android:padding="8dip"
+       android:focusable="false"
+       style="?android:attr/borderlessButtonStyle"
+       android:clickable="true" />
+
+
+</LinearLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 6529c6e6f9a..bf697d63452 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -46,6 +46,7 @@
     <dimen name="divider_height">3dip</dimen>
     <dimen name="divider_margin_top">6dip</dimen>
     <dimen name="divider_margin_bottom">7dip</dimen>
+    <dimen name="vert_divider_width">1dip</dimen>
 
     <!--  Size of icons in the top-level of settings  -->
     <dimen name="header_icon_width">28dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4b3e26137f8..2dd887b4015 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4580,6 +4580,22 @@
     <string name="selinux_status_permissive">Permissive</string>
     <string name="selinux_status_enforcing">Enforcing</string>
 
+    <!-- Notification of installed CA Certs --> <skip/>
+
+    <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning">Network may be monitored</string>
+    <!-- Button to close the SSL CA cert warning dialog box.  [CHAR LIMIT=NONE] -->
+    <string name="done_button">Done</string>
+    <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_dialog_title">Network monitoring</string>
+    <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_info_message">This device is managed by: <xliff:g id="managing_domain">%s</xliff:g>.\n\nYour administrator is capable of monitoring your network activity, including emails, apps, and secure websites.\n\nFor more information, contact your administrator.</string>
+    <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+    <string name="ssl_ca_cert_warning_message">A third party is capable of monitoring your network\nactivity, including emails, apps, and secure websites.\n\nA trusted credential installed on your device is making this possible.</string>
+    <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+    <string name="ssl_ca_cert_settings_button">Check trusted credentials</string>
+
     <!-- User settings -->
     <skip/>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index adf406bbec9..4805cb6ac09 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -117,6 +117,14 @@
         <item name="android:scrollbarStyle">outsideOverlay</item>
     </style>
 
+    <style name="VertDivider">
+        <item name="android:layout_width">@dimen/vert_divider_width</item>
+        <item name="android:layout_height">fill_parent</item>
+        <item name="android:background">@color/divider_color</item>
+        <item name="android:focusable">false</item>
+        <item name="android:clickable">false</item>
+    </style>
+
     <!-- We'd like to have this as 16dip hight including paddingTop/paddingBottom to
          be consistent with ProgressBar -->
     <style name="TopDivider">
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
new file mode 100644
index 00000000000..e2ac5d072b8
--- /dev/null
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2013 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.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
+
+/**
+ * Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
+ * traffic.
+ */
+public class MonitoringCertInfoActivity extends Activity implements OnClickListener {
+
+    private boolean hasDeviceOwner = false;
+
+    @Override
+    protected void onCreate(Bundle savedStates) {
+        super.onCreate(savedStates);
+
+        DevicePolicyManager dpm =
+                (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.ssl_ca_cert_dialog_title);
+        builder.setCancelable(true);
+        hasDeviceOwner = dpm.getDeviceOwner() != null;
+        int buttonLabel;
+        if (hasDeviceOwner) {
+            // Institutional case.  Show informational message.
+            String message = this.getResources().getString(R.string.ssl_ca_cert_info_message,
+                    dpm.getDeviceOwnerName());
+            builder.setMessage(message);
+            buttonLabel = R.string.done_button;
+        } else {
+            // Consumer case.  Show scary warning.
+            builder.setIcon(android.R.drawable.stat_notify_error);
+            builder.setMessage(R.string.ssl_ca_cert_warning_message);
+            buttonLabel = R.string.ssl_ca_cert_settings_button;
+        }
+
+        builder.setPositiveButton(buttonLabel, this);
+
+        final Dialog dialog = builder.create();
+        dialog.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
+        try {
+            WindowManagerGlobal.getWindowManagerService().dismissKeyguard();
+        } catch (RemoteException e) {
+        }
+        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override public void onCancel(DialogInterface dialog) {
+                finish();
+            }
+        });
+
+        dialog.show();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (hasDeviceOwner) {
+            finish();
+        } else {
+            Intent intent =
+                    new Intent(android.provider.Settings.ACTION_TRUSTED_CREDENTIALS_USER);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            startActivity(intent);
+            finish();
+        }
+    }
+}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index bcfffcb59ac..6b6e7043c5e 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -19,6 +19,7 @@ package com.android.settings;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
+import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -48,6 +49,7 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.Switch;
@@ -745,17 +747,21 @@ public class Settings extends PreferenceActivity
         static final int HEADER_TYPE_CATEGORY = 0;
         static final int HEADER_TYPE_NORMAL = 1;
         static final int HEADER_TYPE_SWITCH = 2;
-        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_SWITCH + 1;
+        static final int HEADER_TYPE_BUTTON = 3;
+        private static final int HEADER_TYPE_COUNT = HEADER_TYPE_BUTTON + 1;
 
         private final WifiEnabler mWifiEnabler;
         private final BluetoothEnabler mBluetoothEnabler;
         private AuthenticatorHelper mAuthHelper;
+        private DevicePolicyManager mDevicePolicyManager;
 
         private static class HeaderViewHolder {
             ImageView icon;
             TextView title;
             TextView summary;
             Switch switch_;
+            ImageButton button_;
+            View divider_;
         }
 
         private LayoutInflater mInflater;
@@ -765,6 +771,8 @@ public class Settings extends PreferenceActivity
                 return HEADER_TYPE_CATEGORY;
             } else if (header.id == R.id.wifi_settings || header.id == R.id.bluetooth_settings) {
                 return HEADER_TYPE_SWITCH;
+            } else if (header.id == R.id.security_settings) {
+                return HEADER_TYPE_BUTTON;
             } else {
                 return HEADER_TYPE_NORMAL;
             }
@@ -797,7 +805,7 @@ public class Settings extends PreferenceActivity
         }
 
         public HeaderAdapter(Context context, List<Header> objects,
-                AuthenticatorHelper authenticatorHelper) {
+                AuthenticatorHelper authenticatorHelper, DevicePolicyManager dpm) {
             super(context, 0, objects);
 
             mAuthHelper = authenticatorHelper;
@@ -807,6 +815,7 @@ public class Settings extends PreferenceActivity
             // Switches inflated from their layouts. Must be done before adapter is set in super
             mWifiEnabler = new WifiEnabler(context, new Switch(context));
             mBluetoothEnabler = new BluetoothEnabler(context, new Switch(context));
+            mDevicePolicyManager = dpm;
         }
 
         @Override
@@ -836,6 +845,18 @@ public class Settings extends PreferenceActivity
                         holder.switch_ = (Switch) view.findViewById(R.id.switchWidget);
                         break;
 
+                    case HEADER_TYPE_BUTTON:
+                        view = mInflater.inflate(R.layout.preference_header_button_item, parent,
+                                false);
+                        holder.icon = (ImageView) view.findViewById(R.id.icon);
+                        holder.title = (TextView)
+                                view.findViewById(com.android.internal.R.id.title);
+                        holder.summary = (TextView)
+                                view.findViewById(com.android.internal.R.id.summary);
+                        holder.button_ = (ImageButton) view.findViewById(R.id.buttonWidget);
+                        holder.divider_ = view.findViewById(R.id.divider);
+                        break;
+
                     case HEADER_TYPE_NORMAL:
                         view = mInflater.inflate(
                                 R.layout.preference_header_item, parent,
@@ -866,38 +887,71 @@ public class Settings extends PreferenceActivity
                     } else {
                         mBluetoothEnabler.setSwitch(holder.switch_);
                     }
-                    // No break, fall through on purpose to update common fields
+                    updateCommonHeaderView(header, holder);
+                    break;
+
+                case HEADER_TYPE_BUTTON:
+                    if (header.id == R.id.security_settings) {
+                        boolean hasCert = DevicePolicyManager.hasAnyCaCertsInstalled();
+                        if (hasCert) {
+                            holder.button_.setVisibility(View.VISIBLE);
+                            holder.divider_.setVisibility(View.VISIBLE);
+                            boolean isManaged = mDevicePolicyManager.getDeviceOwner() != null;
+                            if (isManaged) {
+                                holder.button_.setImageResource(R.drawable.ic_qs_certificate_info);
+                            } else {
+                                holder.button_.setImageResource(
+                                        android.R.drawable.stat_notify_error);
+                            }
+                            holder.button_.setOnClickListener(new OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    Intent intent = new Intent(
+                                            android.provider.Settings.ACTION_MONITORING_CERT_INFO);
+                                    getContext().startActivity(intent);
+                                }
+                            });
+                        } else {
+                            holder.button_.setVisibility(View.GONE);
+                            holder.divider_.setVisibility(View.GONE);
+                        }
+                    }
+                    updateCommonHeaderView(header, holder);
+                    break;
 
-                    //$FALL-THROUGH$
                 case HEADER_TYPE_NORMAL:
-                    if (header.extras != null &&
-                            header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
-                        String accType = header.extras.getString(
-                                ManageAccountsSettings.KEY_ACCOUNT_TYPE);
-                        Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
-                        setHeaderIcon(holder, icon);
-                    } else if (header.extras != null &&
-                            header.extras.containsKey(HomeSettings.CURRENT_HOME)) {
-                        ActivityInfo ai = header.extras.getParcelable(HomeSettings.CURRENT_HOME);
-                        Drawable icon = ai.loadIcon(getContext().getPackageManager());
-                        setHeaderIcon(holder, icon);
-                    } else {
-                        holder.icon.setImageResource(header.iconRes);
-                    }
-                    holder.title.setText(header.getTitle(getContext().getResources()));
-                    CharSequence summary = header.getSummary(getContext().getResources());
-                    if (!TextUtils.isEmpty(summary)) {
-                        holder.summary.setVisibility(View.VISIBLE);
-                        holder.summary.setText(summary);
-                    } else {
-                        holder.summary.setVisibility(View.GONE);
-                    }
+                    updateCommonHeaderView(header, holder);
                     break;
             }
 
             return view;
         }
 
+        private void updateCommonHeaderView(Header header, HeaderViewHolder holder) {
+                if (header.extras != null
+                        && header.extras.containsKey(ManageAccountsSettings.KEY_ACCOUNT_TYPE)) {
+                    String accType = header.extras.getString(
+                            ManageAccountsSettings.KEY_ACCOUNT_TYPE);
+                    Drawable icon = mAuthHelper.getDrawableForType(getContext(), accType);
+                    setHeaderIcon(holder, icon);
+                } else if (header.extras != null &&
+                        header.extras.containsKey(HomeSettings.CURRENT_HOME)) {
+                    ActivityInfo ai = header.extras.getParcelable(HomeSettings.CURRENT_HOME);
+                    Drawable icon = ai.loadIcon(getContext().getPackageManager());
+                    setHeaderIcon(holder, icon);
+                } else {
+                    holder.icon.setImageResource(header.iconRes);
+                }
+                holder.title.setText(header.getTitle(getContext().getResources()));
+                CharSequence summary = header.getSummary(getContext().getResources());
+                if (!TextUtils.isEmpty(summary)) {
+                    holder.summary.setVisibility(View.VISIBLE);
+                    holder.summary.setText(summary);
+                } else {
+                    holder.summary.setVisibility(View.GONE);
+                }
+            }
+
         private void setHeaderIcon(HeaderViewHolder holder, Drawable icon) {
             ViewGroup.LayoutParams lp = holder.icon.getLayoutParams();
             lp.width = getContext().getResources().getDimensionPixelSize(
@@ -963,7 +1017,9 @@ public class Settings extends PreferenceActivity
         if (adapter == null) {
             super.setListAdapter(null);
         } else {
-            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper));
+            DevicePolicyManager dpm =
+                    (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
+            super.setListAdapter(new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper, dpm));
         }
     }