Merge "Add dialog for summary tip" into pi-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c9045d8..a94938e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -87,6 +87,7 @@
<uses-permission android:name="android.permission.DELETE_PACKAGES"/>
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
<uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
+ <uses-permission android:name="android.permission.MANAGE_APP_OPS_MODES" />
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
<uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
@@ -746,7 +747,7 @@
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
- android:value="com.android.settings.notification.ZenModeBlockedEffectsSetting" />
+ android:value="com.android.settings.notification.ZenModeBlockedEffectsSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
diff --git a/res/layout/data_usage_summary_preference.xml b/res/layout/data_usage_summary_preference.xml
index 445e7cd..b54362a 100644
--- a/res/layout/data_usage_summary_preference.xml
+++ b/res/layout/data_usage_summary_preference.xml
@@ -106,7 +106,8 @@
android:id="@+id/data_limits"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="5dp" />
+ android:paddingBottom="5dp"
+ android:textColor="?android:attr/textColorSecondary" />
</LinearLayout>
diff --git a/res/layout/instant_app_buttons.xml b/res/layout/instant_app_buttons.xml
index 1ef9f41..f80ac10 100644
--- a/res/layout/instant_app_buttons.xml
+++ b/res/layout/instant_app_buttons.xml
@@ -48,11 +48,16 @@
<Space
android:layout_width="16dp"
android:layout_height="wrap_content" />
- <Button
- android:id="@+id/clear_data"
+ <FrameLayout
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_height="wrap_content"
- android:layout_marginBottom="4dp"
- android:text="@string/clear_instant_app_data"/>
+ android:layout_height="wrap_content">
+ <Button
+ android:id="@+id/clear_data"
+ style="@style/ActionSecondaryButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="4dp"
+ android:text="@string/clear_instant_app_data"/>
+ </FrameLayout>
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 504bcd3..978c294 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1136,25 +1136,25 @@
<!-- Security Picker --><skip />
- <!-- Title for suggested actions for screen lock [CHAR LIMIT=34] -->
- <string name="suggested_lock_settings_title">Set screen lock for security</string>
+ <!-- Title for suggested actions for screen lock [CHAR LIMIT=46] -->
+ <string name="suggested_lock_settings_title">Secure your phone</string>
- <!-- Summary for suggested actions for screen lock (tablet) -->
- <string name="suggested_lock_settings_summary" product="tablet">Prevent others from using your tablet</string>
- <!-- Summary for suggested actions for screen lock (device) -->
- <string name="suggested_lock_settings_summary" product="device">Prevent others from using your device</string>
- <!-- Summary for suggested actions for screen lock (phone) -->
- <string name="suggested_lock_settings_summary" product="default">Prevent others from using your phone</string>
+ <!-- Summary for suggested actions for screen lock (tablet) [CHAR LIMIT=55] -->
+ <string name="suggested_lock_settings_summary" product="tablet">Set screen lock to protect tablet</string>
+ <!-- Summary for suggested actions for screen lock (device) [CHAR LIMIT=55] -->
+ <string name="suggested_lock_settings_summary" product="device">Set screen lock to protect device</string>
+ <!-- Summary for suggested actions for screen lock (phone) [CHAR LIMIT=55] -->
+ <string name="suggested_lock_settings_summary" product="default">Set screen lock to protect phone</string>
- <!-- Title for suggested actions for settings up a fingerprint lock [CHAR LIMIT=34] -->
+ <!-- Title for suggested actions for settings up a fingerprint lock [CHAR LIMIT=46] -->
<string name="suggested_fingerprint_lock_settings_title">Unlock with fingerprint</string>
- <!-- Summary for suggested actions for settings up a fingerprint lock (tablet) -->
- <string name="suggested_fingerprint_lock_settings_summary" product="tablet">Unlock with your fingerprint</string>
- <!-- Summary for suggested actions for settings up a fingerprint lock (device) -->
- <string name="suggested_fingerprint_lock_settings_summary" product="device">Unlock with your fingerprint</string>
- <!-- Summary for suggested actions for settings up a fingerprint lock (phone) -->
- <string name="suggested_fingerprint_lock_settings_summary" product="default">Unlock with your fingerprint</string>
+ <!-- Summary for suggested actions for settings up a fingerprint lock (tablet) [CHAR LIMIT=55] -->
+ <string name="suggested_fingerprint_lock_settings_summary" product="tablet"></string>
+ <!-- Summary for suggested actions for settings up a fingerprint lock (device) [CHAR LIMIT=55] -->
+ <string name="suggested_fingerprint_lock_settings_summary" product="device"></string>
+ <!-- Summary for suggested actions for settings up a fingerprint lock (phone) [CHAR LIMIT=55] -->
+ <string name="suggested_fingerprint_lock_settings_summary" product="default"></string>
<!-- Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
<string name="lock_settings_picker_title">Choose screen lock</string>
@@ -2251,10 +2251,10 @@
<!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
<string name="wifi_calling_settings_title">Wi-Fi calling</string>
- <!-- Title of suggestion to turn on wifi calling [CHAR LIMIT=30] -->
- <string name="wifi_calling_suggestion_title">Extend call coverage with Wi\u2011Fi</string>
- <!-- Summary of suggestion to turn on wifi calling [CHAR LIMIT=60] -->
- <string name="wifi_calling_suggestion_summary">Turn on Wi\u2011Fi calling</string>
+ <!-- Title of suggestion to turn on wifi calling [CHAR LIMIT=46] -->
+ <string name="wifi_calling_suggestion_title">Extend calls with Wi\u2011Fi</string>
+ <!-- Summary of suggestion to turn on wifi calling [CHAR LIMIT=55] -->
+ <string name="wifi_calling_suggestion_summary">Turn on Wi\u2011Fi calling to extend coverage</string>
<!-- Title of WFC preference item [CHAR LIMIT=30] -->
<string name="wifi_calling_mode_title">Calling preference</string>
<!-- Title of WFC preference selection dialog [CHAR LIMIT=30] -->
@@ -2532,9 +2532,9 @@
<string name="wallpaper_settings_summary_default">Default</string>
<!-- Wallpaper settings summary when wallpaper has been updated [CHAR LIMIT=NONE] -->
<string name="wallpaper_settings_summary_custom">Custom</string>
- <!-- Wallpaper suggestion title [CHAR LIMIT=30] -->
+ <!-- Wallpaper suggestion title [CHAR LIMIT=46] -->
<string name="wallpaper_suggestion_title">Change wallpaper</string>
- <!-- Wallpaper suggestion title [CHAR LIMIT=60] -->
+ <!-- Wallpaper suggestion summary [CHAR LIMIT=55] -->
<string name="wallpaper_suggestion_summary">Personalize your screen</string>
<!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
<string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
@@ -6949,10 +6949,10 @@
<!-- Do not disturb: Title for a specific zen mode automatic rule in settings. [CHAR LIMIT=30] -->
<string name="zen_mode_automatic_rule_settings_page_title">Automatic rule</string>
- <!-- Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=34] -->
+ <!-- Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=46] -->
<string name="zen_mode_automation_suggestion_title">Silence phone at certain times</string>
- <!-- Do not disturb: Summary for the zen mode automation option Suggestion. [CHAR LIMIT=NONE] -->
+ <!-- Do not disturb: Summary for the zen mode automation option Suggestion. [CHAR LIMIT=55] -->
<string name="zen_mode_automation_suggestion_summary">Set Do Not Disturb rules</string>
<!-- Do not disturb: Switch toggle to toggle whether to use an automatic dnd rule or not [CHAR LIMIT=40] -->
@@ -7004,6 +7004,11 @@
<!-- Do not disturb: what to block summary, all effects -->
<string name="zen_mode_block_effect_summary_all">Sound, vibration, and visual signs of notifications</string>
+ <!-- Do not disturb: Zen mode no sounds are exceptions to bypass do not disturb-->
+ <string name="zen_mode_no_exceptions">None</string>
+ <!-- Do not disturb: Zen mode catch all "other" sounds can bypass do not disturb -->
+ <string name="zen_mode_other_options">other options</string>
+
<!-- Do not disturb: Button to add new automatic rule to DND. [CHAR LIMIT=30] -->
<string name="zen_mode_add">Add</string>
@@ -7597,8 +7602,8 @@
<!-- [CHAR LIMIT=50] Zen mode settings: Media option -->
<string name="zen_mode_media">Media</string>
- <!-- [CHAR LIMIT=50] Zen mode settings: System option which includes sounds such as touch and charging sounds -->
- <string name="zen_mode_system">Touch and charging sounds</string>
+ <!-- [CHAR LIMIT=50] Zen mode settings: System option which includes sounds such as touch sounds -->
+ <string name="zen_mode_system">Touch sounds</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
<string name="zen_mode_reminders">Reminders</string>
@@ -8580,10 +8585,10 @@
<!-- Summary of condition that work mode is off [CHAR LIMIT=NONE] -->
<string name="condition_work_summary">Apps, background sync, and other features related to your work profile are turned off.</string>
- <!-- Night display: Title for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
+ <!-- Night display: Title for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=46] -->
<string name="night_display_suggestion_title">Set Night Light schedule</string>
- <!-- Night display: Summary for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
+ <!-- Night display: Summary for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=55] -->
<string name="night_display_suggestion_summary">Automatically tint screen every night</string>
<!-- Title of condition that night display is on (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
@@ -8679,10 +8684,10 @@
<!-- Format for a summary describing the amount of data before the user is warned or limited [CHAR LIMIT=NONE] -->
<string name="cell_warning_and_limit"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> Data warning / <xliff:g name="amount" example="2 GB">%2$s</xliff:g> Data limit</string>
- <!-- Title of button and screen for billing cycle preferences [CHAR LIMIT=30] -->
+ <!-- Title of button and screen for billing cycle preferences [CHAR LIMIT=40] -->
<string name="billing_cycle">Data warning & limit</string>
- <!-- Title of button for application usage cycle preferences [CHAR LIMIT=30] -->
+ <!-- Title of button for application usage cycle preferences [CHAR LIMIT=40] -->
<string name="app_usage_cycle">App data usage cycle</string>
<!-- Summary describing when the billing cycle for their phone carrier starts [CHAR LIMIT=NONE] -->
@@ -8709,6 +8714,9 @@
<!-- Label for button to set the amount of data before user is warned about usage [CHAR LIMIT=30] -->
<string name="data_warning">Data warning</string>
+ <!-- Label for footnote on Data warning and limit page to warn of device discrepancies -->
+ <string name="data_warning_footnote">Data warning and data limit are measured by your device. This may be different from carrier data.</string>
+
<!-- Label for switch about whether to limit how much data can be used [CHAR LIMIT=30] -->
<string name="set_data_limit">Set data limit</string>
@@ -8791,10 +8799,10 @@
<!-- Summary of the preference controlling whether the device encryption *password* must be entered before being able to start the device. [CHAR LIMIT=NONE]-->
<string name="lockpattern_settings_require_password_before_startup_summary">Require password to start up your device. While off, this device can\'t receive calls, messages, notifications, or alarms.</string>
- <!-- Title for suggestion adding more fingerprints [CHAR LIMIT=30] -->
+ <!-- Title for suggestion adding more fingerprints [CHAR LIMIT=46] -->
<string name="suggestion_additional_fingerprints">Add another fingerprint</string>
- <!-- Summary for suggestion adding more fingerprints [CHAR LIMIT=60] -->
+ <!-- Summary for suggestion adding more fingerprints [CHAR LIMIT=55] -->
<string name="suggestion_additional_fingerprints_summary">Unlock with a different finger</string>
<!-- Summary of battery saver when on [CHAR LIMIT=NONE] -->
@@ -9475,4 +9483,13 @@
<!-- Summary for media output settings when the media stream is being captured by something else. -->
<string name="media_output_summary_unavailable">Unavailable</string>
+ <!-- Title for battery Suggestion. (tablet) [CHAR LIMIT=46] -->
+ <string name="battery_suggestion_title" product="tablet" >Improve tablet\'s battery life</string>
+ <!-- Title for battery Suggestion. (device) [CHAR LIMIT=46] -->
+ <string name="battery_suggestion_title" product="device" >Improve device\'s battery life</string>
+ <!-- Title for battery Suggestion. (phone) [CHAR LIMIT=46] -->
+ <string name="battery_suggestion_title" product="default" >Improve phone\'s battery life</string>
+ <!-- Summary for battery Suggestion. [CHAR LIMIT=55] -->
+ <string name="battery_suggestion_summary"></string>
+
</resources>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index b5bfc49..9500e24 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -20,41 +20,41 @@
android:title="@string/sound_settings"
android:key="sound_settings"
settings:keywords="@string/keywords_sounds"
- settings:initialExpandedChildrenCount="6">
+ settings:initialExpandedChildrenCount="7">
<!-- Media volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="media_volume"
android:icon="@*android:drawable/ic_audio_media"
android:title="@string/media_volume_option_title"
- android:order="-106"/>
+ android:order="-170"/>
<!-- Alarm volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="alarm_volume"
android:icon="@*android:drawable/ic_audio_alarm"
android:title="@string/alarm_volume_option_title"
- android:order="-105"/>
+ android:order="-160"/>
<!-- Ring volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="ring_volume"
android:icon="@*android:drawable/ic_audio_ring_notif"
android:title="@string/ring_volume_option_title"
- android:order="-104"/>
+ android:order="-150"/>
<!-- Notification volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="notification_volume"
android:icon="@*android:drawable/ic_audio_ring_notif"
android:title="@string/notification_volume_option_title"
- android:order="-103"/>
+ android:order="-140"/>
<!-- Also vibrate for calls -->
<SwitchPreference
android:key="vibrate_when_ringing"
android:title="@string/vibrate_when_ringing_title"
- android:order="-102"/>
+ android:order="-130"/>
<!-- Interruptions -->
<com.android.settingslib.RestrictedPreference
@@ -64,7 +64,7 @@
settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
android:fragment="com.android.settings.notification.ZenModeSettings"
settings:allowDividerAbove="true"
- android:order="-101"/>
+ android:order="-120"/>
<!-- Phone ringtone -->
<com.android.settings.DefaultRingtonePreference
@@ -83,7 +83,7 @@
android:dialogTitle="@string/notification_ringtone_title"
android:summary="@string/summary_placeholder"
android:ringtoneType="notification"
- android:order="-99"/>
+ android:order="-90"/>
<!-- Default alarm ringtone -->
<com.android.settings.DefaultRingtonePreference
@@ -93,7 +93,7 @@
android:summary="@string/summary_placeholder"
android:persistent="false"
android:ringtoneType="alarm"
- android:order="-98"/>
+ android:order="-80"/>
<!-- Other sounds -->
<PreferenceCategory
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 34d18e9..8cec3e7 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -91,6 +91,8 @@
mEnableDataLimit = (SwitchPreference) findPreference(KEY_SET_DATA_LIMIT);
mEnableDataLimit.setOnPreferenceChangeListener(this);
mDataLimit = findPreference(KEY_DATA_LIMIT);
+
+ mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.data_warning_footnote);
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index b143b42..2718756 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -94,31 +94,29 @@
};
String getBehaviorSettingSummary(Policy policy, int zenMode) {
- List<String> enabledCategories;
+ List<String> enabledCategories = getEnabledCategories(policy);
- if (zenMode == Settings.Global.ZEN_MODE_NO_INTERRUPTIONS) {
- return mContext.getString(R.string.zen_mode_behavior_total_silence);
- } else if (zenMode == Settings.Global.ZEN_MODE_ALARMS) {
- return mContext.getString(R.string.zen_mode_behavior_alarms_only);
- } else {
- enabledCategories = getEnabledCategories(policy);
- }
-
- // no sound categories can bypass dnd
int numCategories = enabledCategories.size();
if (numCategories == 0) {
- return mContext.getString(R.string.zen_mode_behavior_total_silence);
+ return mContext.getString(R.string.zen_mode_no_exceptions);
+ } else if (numCategories == 1) {
+ return enabledCategories.get(0);
+ } else if (numCategories == 2) {
+ return mContext.getString(R.string.join_two_items, enabledCategories.get(0),
+ enabledCategories.get(1).toLowerCase());
+ } else if (numCategories == 3){
+ String secondaryText = mContext.getString(R.string.join_two_unrelated_items,
+ enabledCategories.get(0), enabledCategories.get(1).toLowerCase());
+ return mContext.getString(R.string.join_two_items, secondaryText,
+ enabledCategories.get(2).toLowerCase());
+ } else {
+ String secondaryText = mContext.getString(R.string.join_many_items_middle,
+ enabledCategories.get(0), enabledCategories.get(1).toLowerCase());
+ secondaryText = mContext.getString(R.string.join_many_items_middle, secondaryText,
+ enabledCategories.get(2).toLowerCase());
+ return mContext.getString(R.string.join_many_items_last, secondaryText,
+ mContext.getString(R.string.zen_mode_other_options));
}
-
- // only alarms and media can bypass dnd
- if (numCategories == 2 &&
- isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_ALARMS) &&
- isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_MEDIA)) {
- return mContext.getString(R.string.zen_mode_behavior_alarms_only);
- }
-
- // custom
- return mContext.getString(R.string.zen_mode_behavior_summary_custom);
}
String getSoundSummary() {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
index 5fa4e25..8fdae80 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
@@ -38,7 +38,7 @@
@Override
public void updateState(Preference preference) {
final boolean settingsOn = Settings.Global.getInt(mContext.getContentResolver(),
- Settings.Global.SOFT_AP_TIMEOUT_ENABLED, 0) != 0;
+ Settings.Global.SOFT_AP_TIMEOUT_ENABLED, 1) != 0;
((SwitchPreference) preference).setChecked(settingsOn);
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index 5c81efc..bd94bf5 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -47,27 +47,12 @@
}
@Test
- public void testGetBehaviorSettingSummary_customBehavior() {
- NotificationManager.Policy policy = new NotificationManager.Policy(
- NotificationManager.Policy.PRIORITY_CATEGORY_EVENTS
- | NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS
- | NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS
- | NotificationManager.Policy.PRIORITY_CATEGORY_MEDIA,
- 0, 0);
- final String result = mBuilder.getBehaviorSettingSummary(policy,
- Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
-
- String custom = mContext.getString(R.string.zen_mode_behavior_summary_custom);
- assertEquals(custom, result);
- }
-
- @Test
- public void testGetBehaviorSettingSummary_totalSilence() {
+ public void testGetBehaviorSettingSummary_noSoundsCanBypass() {
NotificationManager.Policy policy = new NotificationManager.Policy(0, 0, 0);
final String result = mBuilder.getBehaviorSettingSummary(policy,
Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- String totalSilence = mContext.getString(R.string.zen_mode_behavior_total_silence);
+ String totalSilence = mContext.getString(R.string.zen_mode_no_exceptions);
assertEquals(totalSilence, result);
}
@@ -80,7 +65,9 @@
final String result = mBuilder.getBehaviorSettingSummary(policy,
Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- String alarmsAndMedia = mContext.getString(R.string.zen_mode_behavior_alarms_only);
+ String alarmsAndMedia = mContext.getString(R.string.join_two_items,
+ mContext.getString(R.string.zen_mode_alarms),
+ mContext.getString(R.string.zen_mode_media).toLowerCase());
assertEquals(alarmsAndMedia, result);
}
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
index 2b14e88..c553764 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
@@ -81,6 +81,13 @@
assertThat(mSwitchPreference.isChecked()).isFalse();
}
+ @Test
+ public void testUpdateState_toggleDefaultOn() {
+ mController.updateState(mSwitchPreference);
+
+ assertThat(mSwitchPreference.isChecked()).isTrue();
+ }
+
private int getAutoOffSetting() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.SOFT_AP_TIMEOUT_ENABLED, OFF);