Update tile summary from ContentProvider.
A subscription is created and destroyed based on the lifecycle events. Fetching the summary is done asynchronously to prevent blocking the UI thread. Test: make RunSettingsRoboTests Test: manually flip flags, confirm tile has dynamic summary Bug: 264812018 Change-Id: Ib1149ec6907b6a70226c36d37431023aaf6ad557
This commit is contained in:
@@ -0,0 +1,145 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.biometrics.activeunlock;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.robolectric.shadows.ShadowLooper.idleMainLooper;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.settings.biometrics.activeunlock.ActiveUnlockContentListener.OnContentChangedListener;
|
||||
import com.android.settings.testutils.ActiveUnlockTestUtils;
|
||||
import com.android.settings.testutils.shadow.ShadowDeviceConfig;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(shadows = {ShadowDeviceConfig.class})
|
||||
public class ActiveUnlockContentListenerTest {
|
||||
|
||||
@Rule public final MockitoRule mMocks = MockitoJUnit.rule();
|
||||
@Mock private PackageManager mPackageManager;
|
||||
|
||||
private Context mContext;
|
||||
private ActiveUnlockContentListener mContentListener;
|
||||
@Nullable private String mContent;
|
||||
private int mUpdateCount;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
Robolectric.setupContentProvider(
|
||||
FakeContentProvider.class, FakeContentProvider.AUTHORITY);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
||||
OnContentChangedListener listener = new OnContentChangedListener() {
|
||||
@Override
|
||||
public void onContentChanged(String newValue) {
|
||||
mContent = newValue;
|
||||
mUpdateCount++;
|
||||
}
|
||||
};
|
||||
ActiveUnlockTestUtils.enable(mContext);
|
||||
mContentListener =
|
||||
new ActiveUnlockContentListener(
|
||||
mContext,
|
||||
listener,
|
||||
"logTag",
|
||||
FakeContentProvider.METHOD_SUMMARY,
|
||||
FakeContentProvider.KEY_SUMMARY);
|
||||
FakeContentProvider.init(mContext);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void subscribe_contentFetched() {
|
||||
String newContent = "newContent";
|
||||
FakeContentProvider.setTileSummary(newContent);
|
||||
|
||||
mContentListener.subscribe();
|
||||
idleMainLooper();
|
||||
|
||||
assertThat(mContent).isEqualTo(newContent);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void contentUpdated_contentUpdated() {
|
||||
mContentListener.subscribe();
|
||||
idleMainLooper();
|
||||
|
||||
String newContent = "newContent";
|
||||
updateContent(newContent);
|
||||
|
||||
assertThat(mContent).isEqualTo(newContent);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void contentUpdated_unsubscribed_contentNotUpdated() {
|
||||
mContentListener.subscribe();
|
||||
idleMainLooper();
|
||||
|
||||
mContentListener.unsubscribe();
|
||||
updateContent("newContent");
|
||||
|
||||
assertThat(mContent).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void multipleContentUpdates_contentIsNewestValueAndUpdatedTwice() {
|
||||
mContentListener.subscribe();
|
||||
idleMainLooper();
|
||||
|
||||
updateContent("temporaryContent");
|
||||
String newContent = "newContent";
|
||||
updateContent(newContent);
|
||||
|
||||
assertThat(mContent).isEqualTo(newContent);
|
||||
assertThat(mUpdateCount).isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void duplicateContentUpdates_onContentChangedOnlyCalledOnce() {
|
||||
mContentListener.subscribe();
|
||||
idleMainLooper();
|
||||
|
||||
updateContent("newContent");
|
||||
updateContent("newContent");
|
||||
|
||||
assertThat(mUpdateCount).isEqualTo(1);
|
||||
}
|
||||
|
||||
private void updateContent(String content) {
|
||||
FakeContentProvider.setTileSummary(content);
|
||||
mContext.getContentResolver().notifyChange(
|
||||
FakeContentProvider.URI, null /* observer */);
|
||||
idleMainLooper();
|
||||
}
|
||||
}
|
||||
@@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyInt;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.robolectric.shadows.ShadowLooper.idleMainLooper;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
@@ -43,6 +44,7 @@ import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
import org.robolectric.Robolectric;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
@@ -66,6 +68,7 @@ public class ActiveUnlockStatusPreferenceControllerTest {
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
Robolectric.setupContentProvider(FakeContentProvider.class, FakeContentProvider.AUTHORITY);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
when(mContext.getPackageManager()).thenReturn(mPackageManager);
|
||||
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)).thenReturn(true);
|
||||
@@ -80,6 +83,7 @@ public class ActiveUnlockStatusPreferenceControllerTest {
|
||||
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
|
||||
when(mFaceManager.isHardwareDetected()).thenReturn(true);
|
||||
ActiveUnlockTestUtils.enable(mContext);
|
||||
FakeContentProvider.init(mContext);
|
||||
mController = new ActiveUnlockStatusPreferenceController(mContext);
|
||||
}
|
||||
|
||||
@@ -136,4 +140,31 @@ public class ActiveUnlockStatusPreferenceControllerTest {
|
||||
|
||||
assertThat(mPreference.isVisible()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void defaultState_summaryIsEmpty() {
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
|
||||
idleMainLooper();
|
||||
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo(" ");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onStart_summaryIsUpdated() {
|
||||
String summary = "newSummary";
|
||||
updateSummary(summary);
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
|
||||
mController.onStart();
|
||||
idleMainLooper();
|
||||
|
||||
assertThat(mPreference.getSummary().toString()).isEqualTo(summary);
|
||||
}
|
||||
|
||||
private void updateSummary(String summary) {
|
||||
FakeContentProvider.setTileSummary(summary);
|
||||
mContext.getContentResolver().notifyChange(FakeContentProvider.URI, null /* observer */);
|
||||
idleMainLooper();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
* Copyright (C) 2023 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.biometrics.activeunlock;
|
||||
|
||||
import android.content.ContentProvider;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.ContentValues;
|
||||
import android.content.Context;
|
||||
import android.database.Cursor;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.provider.Settings;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.settings.testutils.ActiveUnlockTestUtils;
|
||||
|
||||
/** ContentProvider to provider tile summary for ActiveUnlock in tests. */
|
||||
public final class FakeContentProvider extends ContentProvider {
|
||||
public static final String AUTHORITY = ActiveUnlockTestUtils.PROVIDER;
|
||||
public static final Uri URI = new Uri.Builder()
|
||||
.scheme(ContentResolver.SCHEME_CONTENT)
|
||||
.authority(AUTHORITY)
|
||||
.appendPath("getSummary")
|
||||
.build();
|
||||
public static final String METHOD_SUMMARY = "getSummary";
|
||||
public static final String KEY_SUMMARY = "com.android.settings.summary";
|
||||
@Nullable private static String sTileSummary;
|
||||
@Nullable private static String sDeviceName;
|
||||
|
||||
public FakeContentProvider() {
|
||||
super();
|
||||
}
|
||||
|
||||
public static void setTileSummary(String summary) {
|
||||
sTileSummary = summary;
|
||||
}
|
||||
|
||||
public static void init(Context context) {
|
||||
Settings.Secure.putString(
|
||||
context.getContentResolver(), ActiveUnlockTestUtils.PROVIDER_SETTING, AUTHORITY);
|
||||
sTileSummary = null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Bundle call(String method, String arg, Bundle extras) {
|
||||
Bundle bundle = new Bundle();
|
||||
if (METHOD_SUMMARY.equals(method)) {
|
||||
bundle.putCharSequence(KEY_SUMMARY, sTileSummary);
|
||||
}
|
||||
return bundle;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreate() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Cursor query(Uri uri, String[] projection, String selection,
|
||||
String[] selectionArgs, String sortOrder) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Uri insert(Uri uri, ContentValues values) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int update(Uri uri, ContentValues values, String selection,
|
||||
String[] selectionArgs) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int delete(Uri uri, String selection, String[] selectionArgs) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType(Uri uri) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user