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

Merge "Disable settings preferences when the packages do not exist" into qt-dev

Browse Source 
am: 46b356d37d

Change-Id: I9642829f5d22e4641fa1627e13ae8d3fa48c493c
This commit is contained in:
Winson Chung
2019-05-07 21:29:28 -07:00
committed by android-build-merger
parent 83ff47b4d1 46b356d37d
commit 0936f8f942
7 changed files with 47 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceController.java
View File

@@ -39,7 +39,7 @@ public class SystemNavigationEdgeToEdgePreferenceController extends
@VisibleForTesting
public SystemNavigationEdgeToEdgePreferenceController(Context context,
IOverlayManager overlayManager, String key) {
super(context, overlayManager, key);
super(context, overlayManager, key, NAV_BAR_MODE_GESTURAL_OVERLAY);
}
@Override

2
src/com/android/settings/gestures/SystemNavigationLegacyPreferenceController.java
View File

@@ -39,7 +39,7 @@ public class SystemNavigationLegacyPreferenceController extends
@VisibleForTesting
public SystemNavigationLegacyPreferenceController(Context context,
IOverlayManager overlayManager, String key) {
super(context, overlayManager, key);
super(context, overlayManager, key, NAV_BAR_MODE_3BUTTON_OVERLAY);
}
@Override

30
src/com/android/settings/gestures/SystemNavigationPreferenceController.java
View File

@@ -52,16 +52,18 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer
protected final IOverlayManager mOverlayManager;
protected PreferenceScreen mPreferenceScreen;
private final String mOverlayPackage;
public SystemNavigationPreferenceController(Context context, IOverlayManager overlayManager,
String key) {
String key, String overlayPackage) {
super(context, key);
mOverlayManager = overlayManager;
mOverlayPackage = overlayPackage;
}
@Override
public int getAvailabilityStatus() {
return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return isGestureAvailable(mContext, mOverlayPackage) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
@@ -105,23 +107,43 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer
return PREF_KEY_VIDEO;
}
static boolean isGestureAvailable(Context context) {
return isGestureAvailable(context, null /* overlayPackage */);
}
static boolean isGestureAvailable(Context context, String overlayPackage) {
// Skip if the swipe up settings are not available
if (!context.getResources().getBoolean(
com.android.internal.R.bool.config_swipe_up_gesture_setting_available)) {
return false;
}
// Skip if the recents component is not defined
final ComponentName recentsComponentName = ComponentName.unflattenFromString(
context.getString(com.android.internal.R.string.config_recentsComponentName));
if (recentsComponentName == null) {
return false;
}
// Skip if the overview proxy service exists
final PackageManager pm = context.getPackageManager();
final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
.setPackage(recentsComponentName.getPackageName());
if (context.getPackageManager().resolveService(quickStepIntent,
PackageManager.MATCH_SYSTEM_ONLY) == null) {
if (pm.resolveService(quickStepIntent, PackageManager.MATCH_SYSTEM_ONLY) == null) {
return false;
}
// Skip if the required overlay package is defined but doesn't exist
if (overlayPackage != null) {
try {
return pm.getPackageInfo(overlayPackage, 0 /* flags */) != null;
} catch (PackageManager.NameNotFoundException e) {
// Not found, just return unavailable
return false;
}
}
return true;
}

2
src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceController.java
View File

@@ -39,7 +39,7 @@ public class SystemNavigationSwipeUpPreferenceController extends
@VisibleForTesting
public SystemNavigationSwipeUpPreferenceController(Context context,
IOverlayManager overlayManager, String key) {
super(context, overlayManager, key);
super(context, overlayManager, key, NAV_BAR_MODE_2BUTTON_OVERLAY);
}
@Override

6
tests/robotests/src/com/android/settings/gestures/SystemNavigationEdgeToEdgePreferenceControllerTest.java
View File

@@ -130,6 +130,12 @@ public class SystemNavigationEdgeToEdgePreferenceControllerTest {
.isFalse();
}
@Test
public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
assertThat(SystemNavigationEdgeToEdgePreferenceController.isGestureAvailable(mContext,
"com.package.fake")).isFalse();
}
@Test
public void testIsChecked_defaultIsEdgeToEdge_shouldReturnTrue() {
SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,

6
tests/robotests/src/com/android/settings/gestures/SystemNavigationLegacyPreferenceControllerTest.java
View File

@@ -130,6 +130,12 @@ public class SystemNavigationLegacyPreferenceControllerTest {
SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext)).isFalse();
}
@Test
public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
assertThat(SystemNavigationLegacyPreferenceController.isGestureAvailable(mContext,
"com.package.fake")).isFalse();
}
@Test
public void testIsChecked_defaultIsLegacy_shouldReturnTrue() {
SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,

6
tests/robotests/src/com/android/settings/gestures/SystemNavigationSwipeUpPreferenceControllerTest.java
View File

@@ -130,6 +130,12 @@ public class SystemNavigationSwipeUpPreferenceControllerTest {
.isFalse();
}
@Test
public void testIsGestureAvailable_noOverlayPackage_shouldReturnFalse() {
assertThat(SystemNavigationSwipeUpPreferenceController.isGestureAvailable(mContext,
"com.package.fake")).isFalse();
}
@Test
public void testIsChecked_defaultIsSwipeUp_shouldReturnTrue() {
SettingsShadowResources.overrideResource(R.integer.config_navBarInteractionMode,