Merge "Add action/ or intent/ to all custom slice uri path."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a08d028..c5e512e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -114,6 +114,14 @@
<uses-library android:name="org.apache.http.legacy" />
<!-- Settings -->
+ <!-- TODO(b/118444000): Remove this. -->
+ <activity android:name="SettingsActivity"
+ android:label="@string/settings_label_launcher"
+ android:launchMode="singleTask">
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
<activity android:name=".homepage.SettingsHomepageActivity"
android:label="@string/settings_label_launcher"
android:theme="@style/Theme.Settings.Home"
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
new file mode 100644
index 0000000..ee84576
--- /dev/null
+++ b/res/layout/settings_main_dashboard.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- TODO(118444000): Remove this -->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <include layout="@layout/search_bar" />
+
+ <FrameLayout
+ android:id="@+id/main_content"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 0ddd3ea..33976a6 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -701,6 +701,15 @@
<item>120000</item>
</integer-array>
+ <!-- Summaries of accessibility timeout, pairs to Values -->
+ <string-array name="accessibility_timeout_summaries" translatable="false">
+ <item>@string/accessibility_timeout_default</item>
+ <item>@string/accessibility_timeout_10secs</item>
+ <item>@string/accessibility_timeout_30secs</item>
+ <item>@string/accessibility_timeout_1min</item>
+ <item>@string/accessibility_timeout_2mins</item>
+ </string-array>
+
<!-- Titles for the list of long press timeout options. -->
<string-array name="long_press_timeout_selector_titles">
<!-- A title for the option for short long-press timeout [CHAR LIMIT=25] -->
diff --git a/res/values/themes.xml b/res/values/themes.xml
index a787443..1e24770 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -54,6 +54,10 @@
<item name="batteryGoodColor">@color/battery_good_color_light</item>
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
<item name="batteryBadColor">@color/battery_bad_color_light</item>
+
+ <!-- TODO(118444000): Remove colorPrimary and colorPrimaryVariant -->
+ <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
+ <item name="colorPrimaryVariant">@android:color/white</item>
</style>
<!-- Variant of the settings theme with no action bar. -->
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 1f331d7..ca54b07 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -33,11 +33,11 @@
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.storage.IStorageManager;
import android.os.storage.StorageManager;
import android.provider.Settings;
+import android.sysprop.VoldProperties;
import android.telecom.TelecomManager;
import android.telephony.TelephonyManager;
import android.text.Editable;
@@ -400,7 +400,7 @@
super.onCreate(savedInstanceState);
// If we are not encrypted or encrypting, get out quickly.
- final String state = SystemProperties.get("vold.decrypt");
+ final String state = VoldProperties.decrypt().orElse("");
if (!isDebugView() && ("".equals(state) || DECRYPT_STATE.equals(state))) {
disableCryptKeeperComponent(this);
// Typically CryptKeeper is launched as the home app. We didn't
@@ -468,7 +468,7 @@
return;
}
- final String progress = SystemProperties.get("vold.encrypt_progress");
+ final String progress = VoldProperties.encrypt_progress().orElse("");
if (!"".equals(progress) || isDebugView(FORCE_VIEW_PROGRESS)) {
setContentView(R.layout.crypt_keeper_progress);
encryptionProgressInit();
@@ -636,7 +636,7 @@
}
private void updateProgress() {
- final String state = SystemProperties.get("vold.encrypt_progress");
+ final String state = VoldProperties.encrypt_progress().orElse("");
if ("error_partially_encrypted".equals(state)) {
showFactoryReset(false);
@@ -657,8 +657,7 @@
// Now try to get status as time remaining and replace as appropriate
Log.v(TAG, "Encryption progress: " + progress);
try {
- final String timeProperty = SystemProperties.get("vold.encrypt_time_remaining");
- int time = Integer.parseInt(timeProperty);
+ int time = VoldProperties.encrypt_time_remaining().get();
if (time >= 0) {
// Round up to multiple of 10 - this way display is less jerky
time = (time + 9) / 10 * 10;
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 97942fe..307bbc1 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -39,6 +39,7 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
+import android.sysprop.VoldProperties;
import android.telephony.euicc.EuiccManager;
import android.text.TextUtils;
import android.util.Log;
@@ -440,7 +441,7 @@
}
private boolean isExtStorageEncrypted() {
- String state = SystemProperties.get("vold.decrypt");
+ String state = VoldProperties.decrypt().orElse("");
return !"".equals(state);
}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 222c18c..9b5fc00 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -35,9 +35,9 @@
import android.transition.TransitionManager;
import android.util.Log;
import android.view.View;
-import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
+import android.widget.Toolbar;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
@@ -168,6 +168,12 @@
private Button mNextButton;
+ /**
+ * TODO(b/118444000): Remove this and all related code.
+ */
+ @Deprecated
+ private boolean mIsShowingDashboard;
+
private ViewGroup mContent;
// Categories
@@ -250,7 +256,11 @@
setTheme(R.style.Theme_SubSettings);
}
- setContentView(R.layout.settings_main_prefs);
+ mIsShowingDashboard = TextUtils.equals(
+ SettingsActivity.class.getName(), intent.getComponent().getClassName());
+
+ setContentView(mIsShowingDashboard ?
+ R.layout.settings_main_dashboard : R.layout.settings_main_prefs);
mContent = findViewById(R.id.main_content);
@@ -273,12 +283,21 @@
}
final boolean deviceProvisioned = Utils.isDeviceProvisioned(this);
+ if (mIsShowingDashboard) {
+ findViewById(R.id.search_bar).setVisibility(
+ deviceProvisioned ? View.VISIBLE : View.INVISIBLE);
+ findViewById(R.id.action_bar).setVisibility(View.GONE);
+ final Toolbar toolbar = findViewById(R.id.search_action_bar);
+ setActionBar(toolbar);
+ FeatureFactory.getFactory(this).getSearchFeatureProvider()
+ .initSearchToolbar(this, toolbar);
+ }
ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned);
actionBar.setHomeButtonEnabled(deviceProvisioned);
- actionBar.setDisplayShowTitleEnabled(true);
+ actionBar.setDisplayShowTitleEnabled(!mIsShowingDashboard);
}
mSwitchBar = findViewById(R.id.switch_bar);
if (mSwitchBar != null) {
@@ -292,26 +311,20 @@
if (buttonBar != null) {
buttonBar.setVisibility(View.VISIBLE);
- Button backButton = (Button) findViewById(R.id.back_button);
- backButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- setResult(RESULT_CANCELED, null);
- finish();
- }
+ Button backButton = findViewById(R.id.back_button);
+ backButton.setOnClickListener(v -> {
+ setResult(RESULT_CANCELED, null);
+ finish();
});
- Button skipButton = (Button) findViewById(R.id.skip_button);
- skipButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- setResult(RESULT_OK, null);
- finish();
- }
+ Button skipButton = findViewById(R.id.skip_button);
+ skipButton.setOnClickListener(v -> {
+ setResult(RESULT_OK, null);
+ finish();
});
- mNextButton = (Button) findViewById(R.id.next_button);
- mNextButton.setOnClickListener(new OnClickListener() {
- public void onClick(View v) {
- setResult(RESULT_OK, null);
- finish();
- }
+ mNextButton = findViewById(R.id.next_button);
+ mNextButton.setOnClickListener(v -> {
+ setResult(RESULT_OK, null);
+ finish();
});
// set our various button parameters
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 65b0e86..d6590fa 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -21,6 +21,7 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
+import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
@@ -63,6 +64,8 @@
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
+import com.google.common.primitives.Ints;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -125,6 +128,11 @@
"vibration_preference_screen";
private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
"daltonizer_preference";
+ private static final String ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE =
+ "accessibility_content_timeout_preference_fragment";
+ private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
+ "accessibility_control_timeout_preference_fragment";
+
// Extras passed to sub-fragments.
static final String EXTRA_PREFERENCE_KEY = "preference_key";
@@ -718,6 +726,31 @@
updateAutoclickSummary(mAutoclickPreferenceScreen);
updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
+
+ updateAccessibilityTimeoutSummary(getContentResolver(),
+ findPreference(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE));
+ updateAccessibilityTimeoutSummary(getContentResolver(),
+ findPreference(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE));
+ }
+
+ void updateAccessibilityTimeoutSummary(ContentResolver resolver, Preference pref) {
+
+ String[] timeoutSummarys = getResources().getStringArray(
+ R.array.accessibility_timeout_summaries);
+ int[] timeoutValues = getResources().getIntArray(
+ R.array.accessibility_timeout_selector_values);
+
+ int timeoutValue = 0;
+ if (pref.getKey().equals(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE)) {
+ timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
+ resolver, AccessibilityTimeoutController.CONTENT_TIMEOUT_SETTINGS_SECURE);
+ } else if (pref.getKey().equals(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE)) {
+ timeoutValue = AccessibilityTimeoutController.getSecureAccessibilityTimeoutValue(
+ resolver, AccessibilityTimeoutController.CONTROL_TIMEOUT_SETTINGS_SECURE);
+ }
+
+ int idx = Ints.indexOf(timeoutValues, timeoutValue);
+ pref.setSummary(timeoutSummarys[idx == -1 ? 0 : idx]);
}
private void updateMagnificationSummary(Preference pref) {
diff --git a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
index 2995df5..d933d92 100644
--- a/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
+++ b/src/com/android/settings/accessibility/AccessibilityTimeoutController.java
@@ -31,6 +31,8 @@
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.google.common.primitives.Ints;
+
import java.lang.Integer;
import java.util.HashMap;
@@ -38,6 +40,10 @@
public class AccessibilityTimeoutController extends AbstractPreferenceController implements
LifecycleObserver, RadioButtonPreference.OnClickListener, PreferenceControllerMixin {
+ static final String CONTENT_TIMEOUT_SETTINGS_SECURE =
+ Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS;
+ static final String CONTROL_TIMEOUT_SETTINGS_SECURE =
+ Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS;
// pair the preference key and timeout value
private final Map<String, Integer> mAccessibilityTimeoutKeyToValueMap = new HashMap<>();
@@ -64,6 +70,15 @@
mfragmentTag = fragmentTag;
}
+ protected static int getSecureAccessibilityTimeoutValue(ContentResolver resolver, String name) {
+ String timeOutSec = Settings.Secure.getString(resolver, name);
+ if (timeOutSec == null) {
+ return 0;
+ }
+ Integer timeOutValue = Ints.tryParse(timeOutSec);
+ return timeOutValue == null ? 0 : timeOutValue;
+ }
+
public void setOnChangeListener(OnChangeListener listener) {
mOnChangeListener = listener;
}
@@ -131,16 +146,17 @@
}
}
- protected void getAccessibilityUiValue() {
- String timeoutValue = null;
- if (mfragmentTag.equals(AccessibilityContentTimeoutPreferenceFragment.TAG)) {
- timeoutValue = Settings.Secure.getString(mContentResolver,
- Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS);
- } else if (mfragmentTag.equals(AccessibilityControlTimeoutPreferenceFragment.TAG)) {
- timeoutValue = Settings.Secure.getString(mContentResolver,
- Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS);
+ private int getAccessibilityTimeoutValue(String fragmentTag) {
+ int timeoutValue = 0;
+ // two kinds of Secure value, one is content timeout, the other is control timeout.
+ if (AccessibilityContentTimeoutPreferenceFragment.TAG.equals(fragmentTag)) {
+ timeoutValue = getSecureAccessibilityTimeoutValue(mContentResolver,
+ CONTENT_TIMEOUT_SETTINGS_SECURE);
+ } else if (AccessibilityControlTimeoutPreferenceFragment.TAG.equals(fragmentTag)) {
+ timeoutValue = getSecureAccessibilityTimeoutValue(mContentResolver,
+ CONTROL_TIMEOUT_SETTINGS_SECURE);
}
- mAccessibilityUiTimeoutValue = timeoutValue == null? 0: Integer.parseInt(timeoutValue);
+ return timeoutValue;
}
protected void updatePreferenceCheckedState(int value) {
@@ -153,7 +169,7 @@
public void updateState(Preference preference) {
super.updateState(preference);
- getAccessibilityUiValue();
+ mAccessibilityUiTimeoutValue = getAccessibilityTimeoutValue(mfragmentTag);
// reset RadioButton
mPreference.setChecked(false);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index cb2aa8b..00980ad 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -18,10 +18,10 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import android.content.ContentResolver;
import android.content.Context;
import android.os.Vibrator;
import android.provider.Settings;
@@ -32,6 +32,7 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
@@ -42,31 +43,43 @@
@RunWith(SettingsRobolectricTestRunner.class)
public class AccessibilitySettingsTest {
+ private static final String VIBRATION_PREFERENCE_SCREEN = "vibration_preference_screen";
+ private static final String ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE =
+ "accessibility_content_timeout_preference_fragment";
+ private static final String ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE =
+ "accessibility_control_timeout_preference_fragment";
+
+ private Context mContext;
+ private ContentResolver mContentResolver;
+ private AccessibilitySettings mSettings;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mContentResolver = mContext.getContentResolver();
+ mSettings = spy(new AccessibilitySettings());
+ doReturn(mContext).when(mSettings).getContext();
+ }
@Test
public void testNonIndexableKeys_existInXmlLayout() {
- final Context context = RuntimeEnvironment.application;
final List<String> niks = AccessibilitySettings.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
+ .getNonIndexableKeys(mContext);
final List<String> keys = new ArrayList<>();
- keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.accessibility_settings));
+ keys.addAll(XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings));
assertThat(keys).containsAllIn(niks);
}
@Test
public void testUpdateVibrationSummary_shouldUpdateSummary() {
- MockitoAnnotations.initMocks(this);
- final Context mContext = RuntimeEnvironment.application;
- final AccessibilitySettings mSettings = spy(new AccessibilitySettings());
-
final Preference mVibrationPreferenceScreen = new Preference(mContext);
- doReturn(mVibrationPreferenceScreen).when(mSettings).findPreference(anyString());
+ doReturn(mVibrationPreferenceScreen).when(mSettings).findPreference(
+ VIBRATION_PREFERENCE_SCREEN);
- doReturn(mContext).when(mSettings).getContext();
-
- mVibrationPreferenceScreen.setKey("vibration_preference_screen");
+ mVibrationPreferenceScreen.setKey(VIBRATION_PREFERENCE_SCREEN);
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.NOTIFICATION_VIBRATION_INTENSITY,
@@ -81,4 +94,58 @@
VibrationIntensityPreferenceController.getIntensityString(mContext,
Vibrator.VIBRATION_INTENSITY_OFF));
}
+
+ @Test
+ public void testUpdateAccessibilityTimeoutSummary_shouldUpdateSummary() {
+ String[] testingValues = {null, "0", "10000", "30000", "60000", "120000"};
+ int[] exceptedResIds = {R.string.accessibility_timeout_default,
+ R.string.accessibility_timeout_default,
+ R.string.accessibility_timeout_10secs,
+ R.string.accessibility_timeout_30secs,
+ R.string.accessibility_timeout_1min,
+ R.string.accessibility_timeout_2mins
+ };
+
+ for (int i = 0; i < testingValues.length; i++) {
+ Settings.Secure.putString(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, testingValues[i]);
+
+ verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTENT_TIMEOUT_PREFERENCE,
+ exceptedResIds[i]);
+
+ Settings.Secure.putString(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, testingValues[i]);
+
+ verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
+ exceptedResIds[i]);
+ }
+ }
+
+ @Test
+ public void testUpdateAccessibilityControlTimeoutSummary_invalidData_shouldUpdateSummary() {
+ String[] testingValues = {"-9009", "98277466643738977979666555536362343", "Hello,a prank"};
+
+ for (String value : testingValues) {
+ Settings.Secure.putString(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_NON_INTERACTIVE_UI_TIMEOUT_MS, value);
+
+ verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
+ R.string.accessibility_timeout_default);
+
+ Settings.Secure.putString(mContentResolver,
+ Settings.Secure.ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS, value);
+
+ verifyAccessibilityTimeoutSummary(ACCESSIBILITY_CONTROL_TIMEOUT_PREFERENCE,
+ R.string.accessibility_timeout_default);
+ }
+ }
+
+ private void verifyAccessibilityTimeoutSummary(String preferenceKey, int resId) {
+ final Preference preference = new Preference(mContext);
+ doReturn(preference).when(mSettings).findPreference(preferenceKey);
+ preference.setKey(preferenceKey);
+ mSettings.updateAccessibilityTimeoutSummary(mContentResolver, preference);
+
+ assertThat(preference.getSummary()).isEqualTo(mContext.getResources().getString(resId));
+ }
}