PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug #13140648 Settings needs to support the new Quantum Paper theme"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-02-25 22:31:06 +00:00
committed by Android (Google) Code Review
parent 9050c57707 0e2f949c90
commit 167f82de3a
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/colors.xml
View File

@@ -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>

3
res/xml/settings_headers.xml
View File

@@ -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"

11
src/com/android/settings/SettingsActivity.java
View File

@@ -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;