Merge "Revert "Update for 1.0.0-beta1"" into pi-dev am: 767743d64d
am: 5853856ead
Change-Id: I7615fbcdaf6f77385e487fd92cf51dd3a10ed9ad
diff --git a/Android.mk b/Android.mk
index 61851cf..a4044e2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,9 @@
# Build the Settings APK
include $(CLEAR_VARS)
+# See b/74756073.
+LOCAL_USE_R8=false
+
LOCAL_PACKAGE_NAME := Settings
LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a94938e..903be0c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1166,6 +1166,17 @@
</intent-filter>
</activity-alias>
+ <activity android:name=".applications.InstalledAppOpenByDefaultPage"
+ android:label="@string/application_info_label"
+ android:permission="android.permission.OPEN_APPLICATION_DETAILS_OPEN_BY_DEFAULT_PAGE"
+ android:exported="true">
+ <intent-filter android:priority="1">
+ <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS_OPEN_BY_DEFAULT_PAGE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:scheme="package" />
+ </intent-filter>
+ </activity>
+
<!-- Provide direct entry into manage apps showing running services. -->
<activity android:name="Settings$RunningServicesActivity"
android:label="@string/runningservices_settings_title"
diff --git a/res/layout/preference_widget_gear_optional_background.xml b/res/layout/preference_widget_gear_optional_background.xml
new file mode 100644
index 0000000..d02f638
--- /dev/null
+++ b/res/layout/preference_widget_gear_optional_background.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<!-- Settings button with optional ripple background through toggling visiblity. -->
+<FrameLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <ImageView
+ android:id="@+id/settings_button_no_background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:scaleType="center"
+ android:src="@drawable/ic_settings"
+ android:contentDescription="@string/settings_button" />
+ <!-- Additional overdraw background to stop parent's material ripple -->
+ <FrameLayout
+ android:id="@+id/settings_button"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="invisible"
+ android:background="?android:attr/colorBackground">
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:background="?android:attr/selectableItemBackground"
+ android:scaleType="center"
+ android:src="@drawable/ic_settings"
+ android:contentDescription="@string/settings_button" />
+ </FrameLayout>
+</FrameLayout>
diff --git a/res/layout/usb_dialog_container.xml b/res/layout/usb_dialog_container.xml
deleted file mode 100644
index bc6399f..0000000
--- a/res/layout/usb_dialog_container.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015 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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:paddingTop="10dp"
- android:paddingBottom="5dp">
-
- <LinearLayout
- android:id="@+id/container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="20dp"
- android:orientation="vertical" />
-
-</ScrollView>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9f2fe1b..d388946 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1731,6 +1731,8 @@
<string name="wifi_band_5ghz">5 GHz</string>
<!-- Wifi Sign in text for button [CHAR LIMIT = 40]-->
<string name="wifi_sign_in_button_text">Sign in</string>
+ <!-- Wifi Sign in CTA for wifi settings when captive portal auth is required [CHAR LIMIT = 50] -->
+ <string name="wifi_tap_to_sign_in">Tap here to sign in to network</string>
<!-- Link speed on Wifi Status screen -->
<string name="link_speed">%1$d Mbps</string>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 282a5121..b64882a 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -396,11 +396,6 @@
android:order="700">
<SwitchPreference
- android:key="force_hw_ui"
- android:title="@string/force_hw_ui"
- android:summary="@string/force_hw_ui_summary" />
-
- <SwitchPreference
android:key="show_hw_screen_updates"
android:title="@string/show_hw_screen_updates"
android:summary="@string/show_hw_screen_updates_summary" />
diff --git a/res/xml/sim_lock_settings.xml b/res/xml/sim_lock_settings.xml
index 2b823f9..174e5c2 100644
--- a/res/xml/sim_lock_settings.xml
+++ b/res/xml/sim_lock_settings.xml
@@ -31,6 +31,7 @@
android:dialogTitle="@string/sim_change_pin"
android:dialogMessage="@string/sim_enter_old"
android:positiveButtonText="@string/sim_enter_ok"
- android:negativeButtonText="@string/sim_enter_cancel"/>
+ android:negativeButtonText="@string/sim_enter_cancel"
+ android:persistent="false"/>
</PreferenceScreen>
diff --git a/src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java b/src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java
new file mode 100644
index 0000000..40eef25
--- /dev/null
+++ b/src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java
@@ -0,0 +1,36 @@
+/*
+ * 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.applications;
+
+import android.content.Intent;
+
+import com.android.settings.SettingsActivity;
+
+public class InstalledAppOpenByDefaultPage extends SettingsActivity {
+
+ @Override
+ public Intent getIntent() {
+ Intent modIntent = new Intent(super.getIntent());
+ modIntent.putExtra(EXTRA_SHOW_FRAGMENT, AppLaunchSettings.class.getName());
+ return modIntent;
+ }
+
+ @Override
+ protected boolean isValidFragment(String fragmentName) {
+ return AppLaunchSettings.class.getName().equals(fragmentName);
+ }
+}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 9666a6c..0d30f27 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -428,7 +428,6 @@
controllers.add(new TransitionAnimationScalePreferenceController(context));
controllers.add(new AnimatorDurationScalePreferenceController(context));
controllers.add(new SecondaryDisplayPreferenceController(context));
- controllers.add(new ForceGpuRenderingPreferenceController(context));
controllers.add(new GpuViewUpdatesPreferenceController(context));
controllers.add(new HardwareLayersUpdatesPreferenceController(context));
controllers.add(new DebugGpuOverdrawPreferenceController(context));
diff --git a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
deleted file mode 100644
index 72074cb..0000000
--- a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2017 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.os.SystemProperties;
-import android.support.annotation.VisibleForTesting;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.Preference;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.development.SystemPropPoker;
-
-public class ForceGpuRenderingPreferenceController extends DeveloperOptionsPreferenceController
- implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
-
- private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
-
- @VisibleForTesting
- static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
-
- public ForceGpuRenderingPreferenceController(Context context) {
- super(context);
- }
-
- @Override
- public String getPreferenceKey() {
- return FORCE_HARDWARE_UI_KEY;
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object newValue) {
- final boolean isEnabled = (Boolean) newValue;
- SystemProperties.set(HARDWARE_UI_PROPERTY,
- isEnabled ? Boolean.toString(true) : Boolean.toString(false));
- SystemPropPoker.getInstance().poke();
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- final boolean isEnabled = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY,
- false /* default */);
- ((SwitchPreference) mPreference).setChecked(isEnabled);
- }
-
- @Override
- protected void onDeveloperOptionsSwitchDisabled() {
- super.onDeveloperOptionsSwitchDisabled();
- SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
- ((SwitchPreference) mPreference).setChecked(false);
- }
-}
diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
index 0d8cbaf..a6cb6f5 100644
--- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
+++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
@@ -29,6 +29,7 @@
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.CheckBox;
import android.widget.CompoundButton;
import com.android.internal.app.LocalePicker;
@@ -159,10 +160,13 @@
dragCell.setShowCheckbox(mRemoveMode);
dragCell.setShowMiniLabel(!mRemoveMode);
dragCell.setShowHandle(!mRemoveMode && mDragEnabled);
- dragCell.setChecked(mRemoveMode ? feedItem.getChecked() : false);
dragCell.setTag(feedItem);
- dragCell.getCheckbox()
- .setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ CheckBox checkbox = dragCell.getCheckbox();
+ // clear listener before setChecked() in case another item already bind to
+ // current ViewHolder and checked event is triggered on stale listener mistakenly.
+ checkbox.setOnCheckedChangeListener(null);
+ checkbox.setChecked(mRemoveMode ? feedItem.getChecked() : false);
+ checkbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
LocaleStore.LocaleInfo feedItem =
diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
index 514525c..e9e1560 100644
--- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
+++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
@@ -31,12 +31,31 @@
public class ConnectedAccessPointPreference extends AccessPointPreference implements
View.OnClickListener {
+ private final CaptivePortalStatus mCaptivePortalStatus;
private OnGearClickListener mOnGearClickListener;
+ private boolean mCaptivePortalNetwork;
public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
- UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks) {
+ UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks,
+ CaptivePortalStatus captivePortalStatus) {
super(accessPoint, context, cache, iconResId, forSavedNetworks);
- setWidgetLayoutResource(R.layout.preference_widget_gear_no_bg);
+ mCaptivePortalStatus = captivePortalStatus;
+ }
+
+ @Override
+ protected int getWidgetLayoutResourceId() {
+ return R.layout.preference_widget_gear_optional_background;
+ }
+
+ @Override
+ public void refresh() {
+ super.refresh();
+
+ mCaptivePortalNetwork = mCaptivePortalStatus.isCaptivePortalNetwork();
+ setShowDivider(mCaptivePortalNetwork);
+ if (mCaptivePortalNetwork) {
+ setSummary(R.string.wifi_tap_to_sign_in);
+ }
}
public void setOnGearClickListener(OnGearClickListener l) {
@@ -45,6 +64,18 @@
}
@Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+
+ final View gear = holder.findViewById(R.id.settings_button);
+ gear.setOnClickListener(this);
+
+ final View gearNoBg = holder.findViewById(R.id.settings_button_no_background);
+ gearNoBg.setVisibility(mCaptivePortalNetwork ? View.INVISIBLE : View.VISIBLE);
+ gear.setVisibility(mCaptivePortalNetwork ? View.VISIBLE : View.INVISIBLE);
+ }
+
+ @Override
public void onClick(View v) {
if (v.getId() == R.id.settings_button) {
if (mOnGearClickListener != null) {
@@ -56,4 +87,8 @@
public interface OnGearClickListener {
void onGearClick(ConnectedAccessPointPreference p);
}
+
+ public interface CaptivePortalStatus {
+ boolean isCaptivePortalNetwork();
+ }
}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 3972b85..4f67012 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -26,6 +26,8 @@
import android.content.Intent;
import android.content.res.Resources;
import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
import android.net.NetworkInfo;
import android.net.NetworkInfo.State;
import android.net.wifi.WifiConfiguration;
@@ -60,6 +62,7 @@
import com.android.settings.widget.SummaryUpdater.OnSummaryChangeListener;
import com.android.settings.widget.SwitchBarController;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
+import com.android.settings.wrapper.ConnectivityManagerWrapper;
import com.android.settings.wrapper.WifiManagerWrapper;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.wifi.AccessPoint;
@@ -117,6 +120,7 @@
};
protected WifiManager mWifiManager;
+ private ConnectivityManager mConnectivityManager;
private WifiManager.ActionListener mConnectListener;
private WifiManager.ActionListener mSaveListener;
private WifiManager.ActionListener mForgetListener;
@@ -238,6 +242,11 @@
getActivity(), this, getLifecycle(), true, true);
mWifiManager = mWifiTracker.getManager();
+ final Activity activity = getActivity();
+ if (activity != null) {
+ mConnectivityManager = getActivity().getSystemService(ConnectivityManager.class);
+ }
+
mConnectListener = new WifiManager.ActionListener() {
@Override
public void onSuccess() {
@@ -777,9 +786,11 @@
@NonNull
private ConnectedAccessPointPreference createConnectedAccessPointPreference(
- AccessPoint accessPoint) {
+ AccessPoint accessPoint,
+ ConnectedAccessPointPreference.CaptivePortalStatus captivePortalStatus) {
return new ConnectedAccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
- R.drawable.ic_wifi_signal_0, false /* forSavedNetworks */);
+ R.drawable.ic_wifi_signal_0, false /* forSavedNetworks */,
+ captivePortalStatus);
}
/**
@@ -828,21 +839,30 @@
* {@link #mConnectedAccessPointPreferenceCategory}.
*/
private void addConnectedAccessPointPreference(AccessPoint connectedAp) {
- final ConnectedAccessPointPreference pref = createConnectedAccessPointPreference(
- connectedAp);
+ final ConnectedAccessPointPreference pref =
+ createConnectedAccessPointPreference(
+ connectedAp, this::isConnectedToCaptivePortalNetwork);
- // Launch details page on click.
- pref.setOnPreferenceClickListener(preference -> {
- pref.getAccessPoint().saveWifiState(pref.getExtras());
+ // Launch details page or captive portal on click.
+ pref.setOnPreferenceClickListener(
+ preference -> {
+ pref.getAccessPoint().saveWifiState(pref.getExtras());
+ Network network = getConnectedWifiNetwork();
+ if (isConnectedToCaptivePortalNetwork(network)) {
+ ConnectivityManagerWrapper connectivityManagerWrapper =
+ new ConnectivityManagerWrapper(mConnectivityManager);
+ connectivityManagerWrapper.startCaptivePortalApp(network);
+ } else {
+ launchNetworkDetailsFragment(pref);
+ }
+ return true;
+ });
- new SubSettingLauncher(getContext())
- .setTitle(pref.getTitle())
- .setDestination(WifiNetworkDetailsFragment.class.getName())
- .setArguments(pref.getExtras())
- .setSourceMetricsCategory(getMetricsCategory())
- .launch();
- return true;
- });
+ pref.setOnGearClickListener(
+ preference -> {
+ pref.getAccessPoint().saveWifiState(pref.getExtras());
+ launchNetworkDetailsFragment(pref);
+ });
pref.refresh();
@@ -854,6 +874,43 @@
}
}
+ private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) {
+ new SubSettingLauncher(getContext())
+ .setTitle(pref.getTitle())
+ .setDestination(WifiNetworkDetailsFragment.class.getName())
+ .setArguments(pref.getExtras())
+ .setSourceMetricsCategory(getMetricsCategory())
+ .launch();
+ }
+
+ private boolean isConnectedToCaptivePortalNetwork() {
+ return isConnectedToCaptivePortalNetwork(getConnectedWifiNetwork());
+ }
+
+ private boolean isConnectedToCaptivePortalNetwork(Network network) {
+ if (mConnectivityManager == null || network == null) {
+ return false;
+ }
+ return WifiUtils.canSignIntoNetwork(mConnectivityManager.getNetworkCapabilities(network));
+ }
+
+ private Network getConnectedWifiNetwork() {
+ if (mConnectivityManager != null) {
+ Network networks[] = mConnectivityManager.getAllNetworks();
+ if (networks != null) {
+ for (Network network : networks) {
+ NetworkCapabilities capabilities =
+ mConnectivityManager.getNetworkCapabilities(network);
+ if (capabilities != null
+ && capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
+ return network;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
/** Removes all preferences and hide the {@link #mConnectedAccessPointPreferenceCategory}. */
private void removeConnectedAccessPointPreference() {
mConnectedAccessPointPreferenceCategory.removeAll();
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index 34c86d1..5ef66c0 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -16,11 +16,11 @@
package com.android.settings.wifi;
-import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.pm.PackageManager;
+import android.net.NetworkCapabilities;
import android.net.wifi.WifiConfiguration;
import android.provider.Settings;
import android.text.TextUtils;
@@ -101,4 +101,10 @@
Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 0) != 0;
return isLockdownFeatureEnabled;
}
+
+ /** Returns true if the provided NetworkCapabilities indicate a captive portal network. */
+ public static boolean canSignIntoNetwork(NetworkCapabilities capabilities) {
+ return (capabilities != null
+ && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL));
+ }
}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 4d9ad27..e7f0fdd 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -511,8 +511,7 @@
* Returns whether the user can sign into the network represented by this preference.
*/
private boolean canSignIntoNetwork() {
- return mNetworkCapabilities != null && mNetworkCapabilities.hasCapability(
- NET_CAPABILITY_CAPTIVE_PORTAL);
+ return WifiUtils.canSignIntoNetwork(mNetworkCapabilities);
}
/**
diff --git a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
deleted file mode 100644
index 3c4f297..0000000
--- a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2017 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 com.android.settings.development.ForceGpuRenderingPreferenceController.HARDWARE_UI_PROPERTY;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.support.v14.preference.SwitchPreference;
-import android.support.v7.preference.PreferenceScreen;
-
-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;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class ForceGpuRenderingPreferenceControllerTest {
-
- @Mock
- private SwitchPreference mPreference;
- @Mock
- private PreferenceScreen mPreferenceScreen;
-
- private Context mContext;
- private ForceGpuRenderingPreferenceController mController;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = new ForceGpuRenderingPreferenceController(mContext);
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
- mController.displayPreference(mPreferenceScreen);
- }
-
- @Test
- public void onPreferenceChanged_settingEnabled_turnOnForceGpuRendering() {
- mController.onPreferenceChange(mPreference, true /* new value */);
-
- final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
-
- assertThat(mode).isTrue();
- }
-
- @Test
- public void onPreferenceChanged_settingDisabled_turnOffForceGpuRendering() {
- mController.onPreferenceChange(mPreference, false /* new value */);
-
- final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
-
- assertThat(mode).isFalse();
- }
-
- @Test
- public void updateState_settingEnabled_preferenceShouldBeChecked() {
- SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(true));
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(true);
- }
-
- @Test
- public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- SystemProperties.set(HARDWARE_UI_PROPERTY, Boolean.toString(false));
- mController.updateState(mPreference);
-
- verify(mPreference).setChecked(false);
- }
-
- @Test
- public void onDeveloperOptionsDisabled_shouldDisablePreference() {
- mController.onDeveloperOptionsDisabled();
-
- final boolean mode = SystemProperties.getBoolean(HARDWARE_UI_PROPERTY, false /* default */);
-
- assertThat(mode).isFalse();
- verify(mPreference).setEnabled(false);
- verify(mPreference).setChecked(false);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
index 8d1b8ac..b9b29d2 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
@@ -32,6 +32,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
@@ -44,6 +45,8 @@
private View mView;
@Mock
private ConnectedAccessPointPreference.OnGearClickListener mOnGearClickListener;
+ @Mock
+ private ConnectedAccessPointPreference.CaptivePortalStatus mCaptivePortalStatus;
private Context mContext;
private ConnectedAccessPointPreference mConnectedAccessPointPreference;
@@ -53,7 +56,7 @@
mContext = RuntimeEnvironment.application;
mConnectedAccessPointPreference = new ConnectedAccessPointPreference(mAccessPoint, mContext,
- null, 0 /* iconResId */, false /* forSavedNetworks */);
+ null, 0 /* iconResId */, false /* forSavedNetworks */, mCaptivePortalStatus);
mConnectedAccessPointPreference.setOnGearClickListener(mOnGearClickListener);
}
@@ -74,8 +77,22 @@
}
@Test
+ public void testCaptivePortalStatus_isCaptivePortal_dividerDrawn() {
+ Mockito.when(mCaptivePortalStatus.isCaptivePortalNetwork()).thenReturn(true);
+ mConnectedAccessPointPreference.refresh();
+ assertThat(mConnectedAccessPointPreference.shouldShowDivider()).isTrue();
+ }
+
+ @Test
+ public void testCaptivePortalStatus_isNotCaptivePortal_dividerNotDrawn() {
+ Mockito.when(mCaptivePortalStatus.isCaptivePortalNetwork()).thenReturn(false);
+ mConnectedAccessPointPreference.refresh();
+ assertThat(mConnectedAccessPointPreference.shouldShowDivider()).isFalse();
+ }
+
+ @Test
public void testWidgetLayoutPreference() {
assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource())
- .isEqualTo(R.layout.preference_widget_gear_no_bg);
+ .isEqualTo(R.layout.preference_widget_gear_optional_background);
}
}