Loading res/values/cm_arrays.xml +14 −0 Original line number Diff line number Diff line Loading @@ -256,6 +256,20 @@ <item>2</item> </string-array> <!-- Profile expanded desktop mode options. Do not translate. --> <string-array name="profile_expanded_desktop_entries" translatable="false"> <item>@string/profile_lockmode_default</item> <item>@string/connection_state_enabled</item> <item>@string/connection_state_disabled</item> </string-array> <!-- Values for profile expanded desktop mode. Do not translate. --> <string-array name="profile_expanded_desktop_values" translatable="false"> <item>0</item> <item>1</item> <item>2</item> </string-array> <!-- Volume Overlay options. --> <string-array name="volume_overlay_entries" translatable="false"> <item>@string/volume_overlay_single</item> Loading src/com/android/settings/profiles/ProfileConfig.java +23 −3 Original line number Diff line number Diff line Loading @@ -72,6 +72,8 @@ public class ProfileConfig extends SettingsPreferenceFragment private ListPreference mScreenLockModePreference; private ListPreference mExpandedDesktopModePreference; // constant value that can be used to check return code from sub activity. private static final int PROFILE_GROUP_DETAILS = 1; Loading Loading @@ -273,6 +275,20 @@ public class ProfileConfig extends SettingsPreferenceFragment } systemPrefs.addPreference(mScreenLockModePreference); // Expanded Desktop mExpandedDesktopModePreference = new ListPreference(getActivity()); mExpandedDesktopModePreference.setTitle(R.string.power_menu_expanded_desktop); mExpandedDesktopModePreference.setEntries(R.array.profile_expanded_desktop_entries); mExpandedDesktopModePreference.setEntryValues(R.array.profile_expanded_desktop_values); mExpandedDesktopModePreference.setPersistent(false); mExpandedDesktopModePreference.setSummary(getResources().getStringArray( R.array.profile_expanded_desktop_entries)[mProfile.getExpandedDesktopMode()]); mExpandedDesktopModePreference.setValue(String.valueOf(mProfile .getExpandedDesktopMode())); mExpandedDesktopModePreference.setOnPreferenceChangeListener(this); systemPrefs.addPreference(mExpandedDesktopModePreference); } // Populate the audio streams list Loading Loading @@ -371,6 +387,10 @@ public class ProfileConfig extends SettingsPreferenceFragment mProfile.setScreenLockMode(Integer.valueOf((String) newValue)); mScreenLockModePreference.setSummary(getResources().getStringArray( R.array.profile_lockmode_summaries)[mProfile.getScreenLockMode()]); } else if (preference == mExpandedDesktopModePreference) { mProfile.setExpandedDesktopMode(Integer.valueOf((String) newValue)); mExpandedDesktopModePreference.setSummary(getResources().getStringArray( R.array.profile_expanded_desktop_entries)[mProfile.getExpandedDesktopMode()]); } return true; } Loading Loading
res/values/cm_arrays.xml +14 −0 Original line number Diff line number Diff line Loading @@ -256,6 +256,20 @@ <item>2</item> </string-array> <!-- Profile expanded desktop mode options. Do not translate. --> <string-array name="profile_expanded_desktop_entries" translatable="false"> <item>@string/profile_lockmode_default</item> <item>@string/connection_state_enabled</item> <item>@string/connection_state_disabled</item> </string-array> <!-- Values for profile expanded desktop mode. Do not translate. --> <string-array name="profile_expanded_desktop_values" translatable="false"> <item>0</item> <item>1</item> <item>2</item> </string-array> <!-- Volume Overlay options. --> <string-array name="volume_overlay_entries" translatable="false"> <item>@string/volume_overlay_single</item> Loading
src/com/android/settings/profiles/ProfileConfig.java +23 −3 Original line number Diff line number Diff line Loading @@ -72,6 +72,8 @@ public class ProfileConfig extends SettingsPreferenceFragment private ListPreference mScreenLockModePreference; private ListPreference mExpandedDesktopModePreference; // constant value that can be used to check return code from sub activity. private static final int PROFILE_GROUP_DETAILS = 1; Loading Loading @@ -273,6 +275,20 @@ public class ProfileConfig extends SettingsPreferenceFragment } systemPrefs.addPreference(mScreenLockModePreference); // Expanded Desktop mExpandedDesktopModePreference = new ListPreference(getActivity()); mExpandedDesktopModePreference.setTitle(R.string.power_menu_expanded_desktop); mExpandedDesktopModePreference.setEntries(R.array.profile_expanded_desktop_entries); mExpandedDesktopModePreference.setEntryValues(R.array.profile_expanded_desktop_values); mExpandedDesktopModePreference.setPersistent(false); mExpandedDesktopModePreference.setSummary(getResources().getStringArray( R.array.profile_expanded_desktop_entries)[mProfile.getExpandedDesktopMode()]); mExpandedDesktopModePreference.setValue(String.valueOf(mProfile .getExpandedDesktopMode())); mExpandedDesktopModePreference.setOnPreferenceChangeListener(this); systemPrefs.addPreference(mExpandedDesktopModePreference); } // Populate the audio streams list Loading Loading @@ -371,6 +387,10 @@ public class ProfileConfig extends SettingsPreferenceFragment mProfile.setScreenLockMode(Integer.valueOf((String) newValue)); mScreenLockModePreference.setSummary(getResources().getStringArray( R.array.profile_lockmode_summaries)[mProfile.getScreenLockMode()]); } else if (preference == mExpandedDesktopModePreference) { mProfile.setExpandedDesktopMode(Integer.valueOf((String) newValue)); mExpandedDesktopModePreference.setSummary(getResources().getStringArray( R.array.profile_expanded_desktop_entries)[mProfile.getExpandedDesktopMode()]); } return true; } Loading