diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/device_info_settings.xml | 9 | ||||
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 13 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 4 |
4 files changed, 12 insertions, 16 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index cc677ad..fbeca0e 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2552,7 +2552,7 @@ found in the list of installed applications.</string> <string name="builtin_keyboard_settings_summary">Physical keyboard settings</string> <!-- Development Settings. the title for the item to take the user to Development settings. Development settings are settings meant for application developers. --> - <string name="development_settings_title">Development</string> + <string name="development_settings_title">Developer options</string> <!-- Development Settings summary. The summary of the item to take the user to Development settings. Development settings are settings meant for application developers. --> <string name="development_settings_summary">Set options for application development</string> <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. --> diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 492c9d1..4dfc718 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -23,7 +23,7 @@ android:summary="@string/system_update_settings_list_item_summary"> <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" /> </PreferenceScreen> - + <!-- Device status - launches activity --> <PreferenceScreen android:key="status_info" android:title="@string/device_status" @@ -32,13 +32,6 @@ android:targetPackage="com.android.settings" android:targetClass="com.android.settings.deviceinfo.Status" /> </PreferenceScreen> - - <PreferenceScreen - android:key="power_usage" - android:fragment="com.android.settings.fuelgauge.PowerUsageSummary" - android:title="@string/power_usage_summary_title" - android:summary="@string/power_usage_summary"> - </PreferenceScreen> <!-- Legal Information --> <PreferenceScreen diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index c3fe955..76f5a8e 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -40,7 +40,7 @@ import java.util.regex.Pattern; public class DeviceInfoSettings extends SettingsPreferenceFragment { - private static final String TAG = "DeviceInfoSettings"; + private static final String LOG_TAG = "DeviceInfoSettings"; private static final String KEY_CONTAINER = "container"; private static final String KEY_TEAM = "team"; @@ -128,6 +128,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { try { startActivity(intent); } catch (Exception e) { + Log.e(LOG_TAG, "Unable to start activity " + intent.toString()); } } } @@ -142,7 +143,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { try { preferenceGroup.removePreference(findPreference(preference)); } catch (RuntimeException e) { - Log.d(TAG, "Property '" + property + "' missing and no '" + Log.d(LOG_TAG, "Property '" + property + "' missing and no '" + preference + "' preference"); } } @@ -163,7 +164,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { SystemProperties.get(property, getResources().getString(R.string.device_info_default))); } catch (RuntimeException e) { - + // No recovery } } @@ -192,10 +193,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { Matcher m = p.matcher(procVersionStr); if (!m.matches()) { - Log.e(TAG, "Regex did not match on /proc/version: " + procVersionStr); + Log.e(LOG_TAG, "Regex did not match on /proc/version: " + procVersionStr); return "Unavailable"; } else if (m.groupCount() < 4) { - Log.e(TAG, "Regex match on /proc/version only returned " + m.groupCount() + Log.e(LOG_TAG, "Regex match on /proc/version only returned " + m.groupCount() + " groups"); return "Unavailable"; } else { @@ -204,7 +205,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { .append(m.group(4))).toString(); } } catch (IOException e) { - Log.e(TAG, + Log.e(LOG_TAG, "IO Exception when getting kernel version for Device Info screen", e); diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index f07d965..8badf85 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -211,7 +211,9 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler { public Intent getIntent() { Intent superIntent = super.getIntent(); String startingFragment = getStartingFragmentClass(superIntent); - if (startingFragment != null && !isMultiPane()) { + // This is called from super.onCreate, isMultiPane() is not yet reliable + // Do not use onIsHidingHeaders either, which relies itself on this method + if (startingFragment != null && !onIsMultiPane()) { Intent modIntent = new Intent(superIntent); modIntent.putExtra(EXTRA_SHOW_FRAGMENT, startingFragment); Bundle args = superIntent.getExtras(); |