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

Merge "Moves Swipe Up overlay from Settings app to android.internal" into pi-dev am: 9a93a1dbe9

Browse Source 
am: 84586334b2

Change-Id: Ic2818dc965defb3b2df3192604cedbfcddf36714
This commit is contained in:
Mehdi Alizadeh
2018-05-16 16:53:44 -07:00
committed by android-build-merger
parent ec5a3f9c01 84586334b2
commit 6ed77203e8
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/gestures/SwipeUpPreferenceController.java
View File

@@ -23,7 +23,7 @@ import android.content.pm.PackageManager;
import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.R;
import com.android.internal.R;
public class SwipeUpPreferenceController extends GesturePreferenceController {
@@ -45,7 +45,7 @@ public class SwipeUpPreferenceController extends GesturePreferenceController {
}
final ComponentName recentsComponentName = ComponentName.unflattenFromString(
context.getString(com.android.internal.R.string.config_recentsComponentName));
context.getString(R.string.config_recentsComponentName));
final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
.setPackage(recentsComponentName.getPackageName());
if (context.getPackageManager().resolveService(quickStepIntent,
@@ -80,7 +80,7 @@ public class SwipeUpPreferenceController extends GesturePreferenceController {
@Override
public boolean isChecked() {
final int defaultValue = mContext.getResources()
.getBoolean(com.android.internal.R.bool.config_swipe_up_gesture_default) ? ON : OFF;
.getBoolean(R.bool.config_swipe_up_gesture_default) ? ON : OFF;
final int swipeUpEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.SWIPE_UP_TO_SWITCH_APPS_ENABLED, defaultValue);
return swipeUpEnabled != OFF;