Merge "Remove obsolete bluetooth pages"
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index 8adfeab..115499a 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -70,10 +70,8 @@
public void onStart() {
super.onStart();
- if (mLocalAdapter != null) {
- updateContent(mLocalAdapter.getBluetoothState());
- mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
- }
+ updateContent(mLocalAdapter.getBluetoothState());
+ mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
}
@Override
diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java
index df61234..a2bad8a 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -17,6 +17,8 @@
package com.android.settings.gestures;
import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
@@ -27,14 +29,20 @@
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
public abstract class GesturePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
- LifecycleObserver, OnStart, OnStop {
+ LifecycleObserver, OnStart, OnStop, OnCreate, OnSaveInstanceState {
+
+ @VisibleForTesting
+ static final String KEY_VIDEO_PAUSED = "key_video_paused";
private VideoPreference mVideoPreference;
+ private boolean mVideoPaused;
public GesturePreferenceController(Context context, Lifecycle lifecycle) {
super(context);
@@ -67,6 +75,21 @@
}
@Override
+ public void onCreate(Bundle savedInstanceState) {
+ if (savedInstanceState != null) {
+ mVideoPaused = savedInstanceState.getBoolean(KEY_VIDEO_PAUSED, false);
+ }
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ if (mVideoPreference != null) {
+ mVideoPaused = mVideoPreference.isVideoPaused();
+ }
+ outState.putBoolean(KEY_VIDEO_PAUSED, mVideoPaused);
+ }
+
+ @Override
public void onStop() {
if (mVideoPreference != null) {
mVideoPreference.onViewInvisible();
@@ -76,7 +99,7 @@
@Override
public void onStart() {
if (mVideoPreference != null) {
- mVideoPreference.onViewVisible();
+ mVideoPreference.onViewVisible(mVideoPaused);
}
}
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 0229056..802b21e 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -25,6 +25,7 @@
import android.database.ContentObserver;
import android.net.ConnectivityManager;
import android.net.Uri;
+import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
@@ -38,6 +39,7 @@
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
import com.android.settingslib.core.lifecycle.events.OnDestroy;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
@@ -45,11 +47,12 @@
import java.util.concurrent.atomic.AtomicReference;
import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
+
import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
-public class TetherPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, OnDestroy {
+public class TetherPreferenceController extends AbstractPreferenceController implements
+ PreferenceControllerMixin, LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy {
private static final String KEY_TETHER_SETTINGS = "tether_settings";
@@ -57,7 +60,8 @@
private final AtomicReference<BluetoothPan> mBluetoothPan;
private final ConnectivityManager mConnectivityManager;
private final BluetoothAdapter mBluetoothAdapter;
- private final BluetoothProfile.ServiceListener mBtProfileServiceListener =
+ @VisibleForTesting
+ final BluetoothProfile.ServiceListener mBtProfileServiceListener =
new android.bluetooth.BluetoothProfile.ServiceListener() {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
mBluetoothPan.set((BluetoothPan) proxy);
@@ -93,10 +97,6 @@
if (lifecycle != null) {
lifecycle.addObserver(this);
}
- if (mBluetoothAdapter != null) {
- mBluetoothAdapter.getProfileProxy(context, mBtProfileServiceListener,
- BluetoothProfile.PAN);
- }
}
@Override
@@ -132,6 +132,14 @@
}
@Override
+ public void onCreate(Bundle savedInstanceState) {
+ if (mBluetoothAdapter != null) {
+ mBluetoothAdapter.getProfileProxy(mContext, mBtProfileServiceListener,
+ BluetoothProfile.PAN);
+ }
+ }
+
+ @Override
public void onResume() {
if (mAirplaneModeObserver == null) {
mAirplaneModeObserver = new SettingObserver();
@@ -140,7 +148,7 @@
mTetherReceiver = new TetherBroadcastReceiver();
}
mContext.registerReceiver(
- mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
+ mTetherReceiver, new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED));
mContext.getContentResolver()
.registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
}
diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java
index e06ef56..7758c6e 100644
--- a/src/com/android/settings/widget/VideoPreference.java
+++ b/src/com/android/settings/widget/VideoPreference.java
@@ -45,6 +45,7 @@
private MediaPlayer mMediaPlayer;
private boolean mAnimationAvailable;
private boolean mVideoReady;
+ private boolean mVideoPaused;
private int mPreviewResource;
public VideoPreference(Context context, AttributeSet attrs) {
@@ -100,9 +101,11 @@
if (mMediaPlayer.isPlaying()) {
mMediaPlayer.pause();
playButton.setVisibility(View.VISIBLE);
+ mVideoPaused = true;
} else {
mMediaPlayer.start();
playButton.setVisibility(View.GONE);
+ mVideoPaused = false;
}
}
});
@@ -133,6 +136,10 @@
public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
if (mVideoReady && imageView.getVisibility() == View.VISIBLE) {
imageView.setVisibility(View.GONE);
+ if (!mVideoPaused && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
+ mMediaPlayer.start();
+ playButton.setVisibility(View.GONE);
+ }
}
if (mMediaPlayer != null && !mMediaPlayer.isPlaying() &&
playButton.getVisibility() != View.VISIBLE) {
@@ -152,7 +159,8 @@
super.onDetached();
}
- public void onViewVisible() {
+ public void onViewVisible(boolean videoPaused) {
+ mVideoPaused = videoPaused;
if (mVideoReady && mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
mMediaPlayer.seekTo(0);
}
@@ -163,4 +171,9 @@
mMediaPlayer.pause();
}
}
+
+ public boolean isVideoPaused() {
+ return mVideoPaused;
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index 8b4ef61..f1f54b0 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.gestures;
import android.content.Context;
+import android.os.Bundle;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
@@ -38,6 +39,7 @@
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -84,15 +86,29 @@
}
@Test
- public void onStart_shouldStartVideoPreference() {
+ public void onStart_shouldStartVideoPreferenceWithVideoPauseState() {
final VideoPreference videoPreference = mock(VideoPreference.class);
when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
mController.mIsPrefAvailable = true;
mController.displayPreference(mScreen);
- mController.onStart();
+ final Bundle savedState = new Bundle();
- verify(videoPreference).onViewVisible();
+ mController.onCreate(null);
+ mController.onStart();
+ verify(videoPreference).onViewVisible(false);
+
+ reset(videoPreference);
+ savedState.putBoolean(mController.KEY_VIDEO_PAUSED, true);
+ mController.onCreate(savedState);
+ mController.onStart();
+ verify(videoPreference).onViewVisible(true);
+
+ reset(videoPreference);
+ savedState.putBoolean(mController.KEY_VIDEO_PAUSED, false);
+ mController.onCreate(savedState);
+ mController.onStart();
+ verify(videoPreference).onViewVisible(false);
}
@Test
@@ -108,6 +124,24 @@
}
@Test
+ public void onSaveInstanceState_shouldSaveVideoPauseState() {
+ final VideoPreference videoPreference = mock(VideoPreference.class);
+ when(mScreen.findPreference(mController.getVideoPrefKey())).thenReturn(videoPreference);
+ mController.mIsPrefAvailable = true;
+ mController.displayPreference(mScreen);
+ final Bundle outState = mock(Bundle.class);
+
+ when(videoPreference.isVideoPaused()).thenReturn(true);
+ mController.onSaveInstanceState(outState);
+ verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, true);
+
+ reset(outState);
+ when(videoPreference.isVideoPaused()).thenReturn(false);
+ mController.onSaveInstanceState(outState);
+ verify(outState).putBoolean(mController.KEY_VIDEO_PAUSED, false);
+ }
+
+ @Test
public void updateState_preferenceSetCheckedWhenSettingIsOn() {
// Mock a TwoStatePreference
final TwoStatePreference preference = mock(TwoStatePreference.class);
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 4ae8c2c..b8a6d28 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -16,7 +16,6 @@
package com.android.settings.network;
-
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
@@ -78,6 +77,14 @@
}
@Test
+ public void lifeCycle_onCreate_shouldInitBluetoothPan() {
+ mController.onCreate(null);
+
+ verify(mBluetoothAdapter).getProfileProxy(mContext, mController.mBtProfileServiceListener,
+ BluetoothProfile.PAN);
+ }
+
+ @Test
public void goThroughLifecycle_shouldDestoryBluetoothProfile() {
final BluetoothPan pan = mock(BluetoothPan.class);
final AtomicReference<BluetoothPan> panRef =
@@ -161,7 +168,8 @@
mController.onResume();
verify(mContext).registerReceiver(
- any(TetherPreferenceController.TetherBroadcastReceiver.class), any(IntentFilter.class));
+ any(TetherPreferenceController.TetherBroadcastReceiver.class),
+ any(IntentFilter.class));
}
@Test
@@ -172,7 +180,7 @@
mController.onPause();
verify(mContext).unregisterReceiver(
- any(TetherPreferenceController.TetherBroadcastReceiver.class));
+ any(TetherPreferenceController.TetherBroadcastReceiver.class));
}
@Test