Fix bug #13140648 Settings needs to support the new Quantum Paper theme
Second pass: - use Theme Holo for the Drawer too - add a temporary background for Drawer icons (so that they dont mix with the Drawer background) - remove the "More..." icon as it was not needed This CL will show that there is a discrepancy into the Drawer icons size (some are smaller than the standard size, some other bigger). This issue will be fixed when the new set of Icons will be delivered by the UX team. Change-Id: I431882df9b98157e98a1b735f31d9e77ef846767
This commit is contained in:
@@ -15,7 +15,8 @@
|
||||
-->
|
||||
|
||||
<resources>
|
||||
<color name="background_drawer">#ff777777</color>
|
||||
<color name="background_drawer">@android:color/white</color>
|
||||
<color name="background_drawer_icon">#ffcccccc</color>
|
||||
|
||||
<color name="black">#000</color>
|
||||
<color name="red">#F00</color>
|
||||
|
@@ -62,8 +62,7 @@
|
||||
android:id="@+id/wireless_settings"
|
||||
android:title="@string/radio_controls_title"
|
||||
android:breadCrumbTitle="@string/wireless_networks_settings_title"
|
||||
android:fragment="com.android.settings.WirelessSettings"
|
||||
android:icon="@drawable/empty_icon" />
|
||||
android:fragment="com.android.settings.WirelessSettings" />
|
||||
|
||||
<!-- DEVICE -->
|
||||
<header android:id="@+id/device_section"
|
||||
|
@@ -521,13 +521,7 @@ public class SettingsActivity extends Activity
|
||||
DevicePolicyManager dpm =
|
||||
(DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
|
||||
|
||||
// As the Settings Theme is now Holo Light, the primary text color is "Black" ... but
|
||||
// we want the text color of the Drawer items to be "White", so use the inverse Theme (Holo)
|
||||
// for the Header adapter (and thus making the TextView appearance to have a white color.
|
||||
Context headersContext = new ContextThemeWrapper(this,
|
||||
com.android.internal.R.style.Theme_Holo);
|
||||
|
||||
mHeaderAdapter= new HeaderAdapter(headersContext, getHeaders(), mAuthenticatorHelper, dpm);
|
||||
mHeaderAdapter= new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper, dpm);
|
||||
|
||||
mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
|
||||
Context.MODE_PRIVATE);
|
||||
@@ -1543,6 +1537,9 @@ public class SettingsActivity extends Activity
|
||||
view.findViewById(com.android.internal.R.id.summary);
|
||||
break;
|
||||
}
|
||||
if (holder.mIcon != null) {
|
||||
holder.mIcon.setBackgroundResource(R.color.background_drawer_icon);
|
||||
}
|
||||
view.setTag(holder);
|
||||
} else {
|
||||
view = convertView;
|
||||
|
Reference in New Issue
Block a user