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

Merge "Implement Holo Light Theme for Settings"

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-02-25 17:53:04 +00:00
committed by Android (Google) Code Review
parent 1a666ff6e0 dca2806a23
commit a90ecd775e
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/settings_main.xml
View File

@@ -76,6 +76,6 @@
android:layout_width="300dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ff333333"/>
android:background="@color/background_drawer"/>
</android.support.v4.widget.DrawerLayout>

2
res/values/colors.xml
View File

@@ -15,6 +15,8 @@
-->
<resources>
<color name="background_drawer">#ff777777</color>
<color name="black">#000</color>
<color name="red">#F00</color>

3
res/values/themes.xml
View File

@@ -59,7 +59,7 @@
<item name="wifi_signal">@drawable/wifi_signal_light</item>
</style>
<style name="Theme.Settings" parent="@android:style/Theme.Holo">
<style name="Theme.Settings" parent="@android:style/Theme.Holo.Light">
<item name="@*android:preferenceHeaderPanelStyle">@style/PreferenceHeaderPanelSinglePane</item>
<item name="@*android:preferencePanelStyle">@style/PreferencePanelSinglePane</item>
<item name="@*android:preferenceListStyle">@style/PreferenceHeaderListSinglePane</item>
@@ -70,6 +70,5 @@
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="android:actionBarStyle">@android:style/Widget.Holo.ActionBar.Solid</item>
</style>
</resources>

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

@@ -65,6 +65,7 @@ import android.util.Log;
import android.util.Pair;
import android.util.TypedValue;
import android.util.Xml;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
@@ -519,7 +520,14 @@ public class SettingsActivity extends Activity
DevicePolicyManager dpm =
(DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
mHeaderAdapter= new HeaderAdapter(this, getHeaders(), mAuthenticatorHelper, dpm);
// 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);
mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
Context.MODE_PRIVATE);
@@ -1438,8 +1446,6 @@ public class SettingsActivity extends Activity
static int getHeaderType(Header header) {
if (header.fragment == null && header.intent == null) {
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 {