PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Prevent accounts page directly opening in screen pinning mode"

Browse Source 
This reverts commit f3242dab35.

Reason for revert: use another way to handle this.

Change-Id: I83c97db5189cfda3a09f5249d8591ea91dbd3bcb
This commit is contained in:
Mill Chen
2019-09-06 09:18:23 +00:00
parent f3242dab35
commit 348234565a
2 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/settings/accounts/AccountDashboardFragment.java
View File

@@ -15,17 +15,11 @@
*/ */
package com.android.settings.accounts; package com.android.settings.accounts;
import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED;
import static android.provider.Settings.EXTRA_AUTHORITIES; import static android.provider.Settings.EXTRA_AUTHORITIES;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
@@ -46,14 +40,6 @@ public class AccountDashboardFragment extends DashboardFragment {
private static final String TAG = "AccountDashboardFrag"; private static final String TAG = "AccountDashboardFrag";
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
if (isLockTaskModePinned()) {
Log.w(TAG, "Devices lock task mode pinned.");
finish();
}
}
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
@@ -97,13 +83,6 @@ public class AccountDashboardFragment extends DashboardFragment {
return controllers; return controllers;
} }
@VisibleForTesting
boolean isLockTaskModePinned() {
final ActivityManager activityManager =
getContext().getSystemService(ActivityManager.class);
return activityManager.getLockTaskModeState() == LOCK_TASK_MODE_PINNED;
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() { new BaseSearchIndexProvider() {
@Override @Override

34
tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
View File

@@ -15,16 +15,8 @@
*/ */
package com.android.settings.accounts; package com.android.settings.accounts;
import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.app.ActivityManager;
import android.content.Context;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import com.android.settingslib.drawer.CategoryKey; import com.android.settingslib.drawer.CategoryKey;
@@ -34,8 +26,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowActivityManager;
import java.util.List; import java.util.List;
@@ -43,12 +33,10 @@ import java.util.List;
public class AccountDashboardFragmentTest { public class AccountDashboardFragmentTest {
private AccountDashboardFragment mFragment; private AccountDashboardFragment mFragment;
private Context mContext;
@Before @Before
public void setUp() { public void setUp() {
mFragment = new AccountDashboardFragment(); mFragment = new AccountDashboardFragment();
mContext = RuntimeEnvironment.application;
} }
@Test @Test
@@ -65,26 +53,4 @@ public class AccountDashboardFragmentTest {
assertThat(indexRes).isNotNull(); assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId()); assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
} }
@Test
public void isLockTaskModePinned_disableLockTaskMode_shouldReturnFalse() {
final AccountDashboardFragment fragment = spy(mFragment);
doReturn(mContext).when(fragment).getContext();
final ShadowActivityManager activityManager =
Shadow.extract(mContext.getSystemService(ActivityManager.class));
activityManager.setLockTaskModeState(LOCK_TASK_MODE_NONE);
assertThat(fragment.isLockTaskModePinned()).isFalse();
}
@Test
public void isLockTaskModePinned_hasTaskPinned_shouldReturnTrue() {
final AccountDashboardFragment fragment = spy(mFragment);
doReturn(mContext).when(fragment).getContext();
final ShadowActivityManager activityManager =
Shadow.extract(mContext.getSystemService(ActivityManager.class));
activityManager.setLockTaskModeState(LOCK_TASK_MODE_PINNED);
assertThat(fragment.isLockTaskModePinned()).isTrue();
}
} }