Merge "Set MODE_LARGE to sliceView in the homepage."
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index e305f9d..8cb6f51 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -38,7 +38,8 @@
android:tint="?android:attr/colorAccent"
android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical"
- android:layout_marginEnd="@dimen/restricted_icon_margin_end"/>
+ android:layout_marginEnd="@dimen/restricted_icon_margin_end"
+ android:visibility="gone" />
<com.android.settings.widget.ToggleSwitch
android:id="@+id/switch_widget"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c99d7ad..0c3caf6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -10068,4 +10068,10 @@
<!-- Homepage bottom menu. Title for display personalized Settings [CHAR LIMIT=30] -->
<string name="homepage_personal_settings">Your Settings</string>
+ <!-- Setting Checkbox title whether to enable CBRS data. [CHAR LIMIT=40] -->
+ <string name="cbrs_data_switch">CBRS Data</string>
+
+ <!-- Title of implications of enabling CBRS Data -->
+ <string name="cbrs_data_switch_summary">CBRS Data</string>
+
</resources>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 8cc8001..5b6d215 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -234,6 +234,11 @@
android:title="@string/usb_default_label"/>
<SwitchPreference
+ android:key="cbrs_data_switch"
+ android:title="@string/cbrs_data_switch"
+ android:summary="@string/cbrs_data_switch" />
+
+ <SwitchPreference
android:key="bluetooth_show_devices_without_names"
android:title="@string/bluetooth_show_devices_without_names"
android:summary="@string/bluetooth_show_devices_without_names_summary" />
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index ffce321..ea2370c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -648,7 +648,6 @@
PackageManager pm = getPackageManager();
final UserManager um = UserManager.get(this);
final boolean isAdmin = um.isAdminUser();
- final FeatureFactory featureFactory = FeatureFactory.getFactory(this);
boolean somethingChanged = false;
final String packageName = getPackageName();
final StringBuilder changedList = new StringBuilder();
@@ -661,7 +660,6 @@
pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin)
|| somethingChanged;
-
// Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
// enable DataPlanUsageSummaryActivity.
somethingChanged = setTileEnabled(changedList,
diff --git a/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
new file mode 100644
index 0000000..ec1f8e0
--- /dev/null
+++ b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.development;
+
+import android.content.Context;
+import android.util.Log;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class CbrsDataSwitchPreferenceController extends DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+ private static final String CBRS_DATA_SWITCH_KEY = "cbrs_data_switch";
+ private static final String TAG = "CbrsDataSwitchPreferenceController";
+ private Context mContext;
+
+ private TelephonyManager mTelephonyManager;
+
+ public CbrsDataSwitchPreferenceController(Context context) {
+ super(context);
+ mContext = context;
+ mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return CBRS_DATA_SWITCH_KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return mTelephonyManager != null;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ boolean state = (Boolean)newValue;
+ return mTelephonyManager.setAlternativeNetworkAccessState(state);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ boolean state = mTelephonyManager.isAlternativeNetworkAccessEnabled();
+ ((SwitchPreference) mPreference).setChecked(state);
+ }
+
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 937de20..873cec4 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -460,6 +460,7 @@
controllers.add(new FreeformWindowsPreferenceController(context));
controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
+ controllers.add(new CbrsDataSwitchPreferenceController(context));
controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
index a55fcff..f777f71 100644
--- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java
+++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
@@ -105,7 +105,7 @@
// soon as possible.
context.getSystemService(JobScheduler.class).schedule(
new JobInfo.Builder(jobId, jobComponent)
- .setPersisted(true)
+ .setPersisted(false)
.setMinimumLatency(1000)
.setOverrideDeadline(1)
.build());
diff --git a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
new file mode 100644
index 0000000..be9b123
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.development;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public final class CbrsDataSwitchPreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ private Context mContext;
+ private TelephonyManager mTelephonyManager;
+ private SwitchPreference mPreference;
+ private CbrsDataSwitchPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new CbrsDataSwitchPreferenceController(mContext);
+ mPreference = new SwitchPreference(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
+ mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChanged_settingEnabled_shouldEnableANAS() {
+ mController.onPreferenceChange(mPreference, true);
+
+ assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isTrue();
+ }
+
+ @Test
+ public void onPreferenceChanged_settingDisabled_shouldDisableANAS() {
+ mController.onPreferenceChange(mPreference, false);
+
+ assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isFalse();
+ }
+
+ @Test
+ public void updateState_settingEnabled_shouldEnablePreference() {
+ mTelephonyManager.setAlternativeNetworkAccessState(true);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_settingDisabled_shouldDisablePreference() {
+ mTelephonyManager.setAlternativeNetworkAccessState(false);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+}