Text instead of icons in account settings options

Also changed the default style to remove the opaque title background.

Change-Id: I948d9a15961223c3703bb607e2e5a6bf41e0ff5e
This commit is contained in:
Gilles Debunne
2011-07-25 11:36:15 -07:00
parent 672b3c6576
commit cd8e5246f1
4 changed files with 18 additions and 17 deletions

View File

@@ -16,6 +16,11 @@
package com.android.settings;
import com.android.settings.accounts.AccountSyncSettings;
import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.wifi.WifiEnabler;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -37,11 +42,6 @@ import android.widget.ListAdapter;
import android.widget.Switch;
import android.widget.TextView;
import com.android.settings.accounts.ManageAccountsSettings;
import com.android.settings.bluetooth.BluetoothEnabler;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.wifi.WifiEnabler;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -81,7 +81,7 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
@Override
protected void onCreate(Bundle savedInstanceState) {
final int theme = getIntent().getIntExtra(
EXTRA_THEME, android.R.style.Theme_Holo_SolidActionBar_SplitActionBarWhenNarrow);
EXTRA_THEME, android.R.style.Theme_Holo_SplitActionBarWhenNarrow);
setTheme(theme);
getMetaData();
@@ -289,8 +289,8 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler {
// some fragments would like a custom activity theme
if (DataUsageSummary.class.getName().equals(fragmentName) ||
PowerUsageSummary.class.getName().equals(fragmentName) ||
UserDictionarySettings.class.getName().equals(fragmentName) ||
ManageAccountsSettings.class.getName().equals(fragmentName)) {
AccountSyncSettings.class.getName().equals(fragmentName) ||
UserDictionarySettings.class.getName().equals(fragmentName)) {
intent.putExtra(EXTRA_THEME, android.R.style.Theme_Holo_SolidActionBar);
}