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

Merge "Default emergency gesture setting On."

Browse Source
This commit is contained in:
TreeHugger Robot
2021-01-21 02:49:25 +00:00
committed by Android (Google) Code Review
parent f6390d7924 e81091175e
commit 9c4e419b61
12 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java → src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.gestures;
package com.android.settings.emergency;
import android.content.Context;
import android.content.Intent;

2
src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java → src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.gestures;
package com.android.settings.emergency;
import static android.content.DialogInterface.BUTTON_POSITIVE;

2
src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java → src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.gestures;
package com.android.settings.emergency;
import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_NUMBER_OVERRIDE_AUTHORITY;

4
src/com/android/settings/gestures/EmergencyGesturePreferenceController.java → src/com/android/settings/emergency/EmergencyGesturePreferenceController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.gestures;
package com.android.settings.emergency;
import android.content.Context;
import android.provider.Settings;
@@ -71,7 +71,7 @@ public class EmergencyGesturePreferenceController extends BasePreferenceControll
@VisibleForTesting
public boolean isChecked() {
return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON;
return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON;
}
@Override

2
src/com/android/settings/gestures/EmergencyGestureSettings.java → src/com/android/settings/emergency/EmergencyGestureSettings.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.gestures;
package com.android.settings.emergency;
import android.app.settings.SettingsEnums;
import android.content.Context;

10
src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java → src/com/android/settings/emergency/EmergencyGestureSoundPreferenceController.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package com.android.settings.gestures;
package com.android.settings.emergency;
import android.content.Context;
import android.provider.Settings;
@@ -22,11 +22,12 @@ import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
/**
* Preference controller for emergency sos gesture setting
*/
public class EmergencyGestureSoundPreferenceController extends GesturePreferenceController {
public class EmergencyGestureSoundPreferenceController extends TogglePreferenceController {
@VisibleForTesting
static final int ON = 1;
@@ -39,11 +40,6 @@ public class EmergencyGestureSoundPreferenceController extends GesturePreference
super(context, key);
}
@Override
protected String getVideoPrefKey() {
return "emergency_gesture_screen_video";
}
private static boolean isGestureAvailable(Context context) {
return context.getResources()
.getBoolean(R.bool.config_show_emergency_gesture_settings);