From fcdfc2d83fe3ff4fd2e75676023cbab895941151 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Wed, 28 Feb 2018 10:31:06 -0800 Subject: [PATCH] Return back-up slices for unavailable settings When an inline slice is requested, and the setting is unavailable, we should present more useful information to the user. This CL handles: - Unsupported: return intent slice to Settings home page - Disabled for user: intent to the setting page - Unknown reason: intent to setting page - Disabled dependency: Create intent-based Slice rather than the requested inline slice. Bug: 71640747 Test: robotests Change-Id: I9c1a0ee36119d4f9f3b205e0824c251f4356db55 --- res/values/strings.xml | 21 +++++ .../slices/SettingsSliceProvider.java | 6 ++ .../slices/SliceBroadcastReceiver.java | 25 +++++- .../settings/slices/SliceBuilderUtils.java | 78 ++++++++++++++++--- .../FakeUnavailablePreferenceController.java | 21 +++++ .../slices/SliceBuilderUtilsTest.java | 54 ++++++++++++- 6 files changed, 187 insertions(+), 18 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/slices/FakeUnavailablePreferenceController.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 006ca5b2b33..512c2143ab7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9615,6 +9615,27 @@ show both names, with the directory name wrapped in parenthesis --> %1$s (%2$s) + + + + Setting isn’t supported on this phone + + + Setting isn’t supported on this tablet + + + Setting isn’t supported on this device + + + Setting can’t be changed by current user + + + Depends on another setting + + + Setting unavailable + +