Merge "Add shadow to AdaptiveIconDrawables using View level shadow" into oc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index da88f76..781e816 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -902,23 +902,13 @@
android:icon="@drawable/ic_settings_night_display"
android:taskAffinity="">
<intent-filter android:priority="1">
- <action android:name="android.intent.action.MAIN" />
- <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
- </intent-filter>
- <intent-filter android:priority="1">
<action android:name="android.settings.NIGHT_DISPLAY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.display.NightDisplaySettings" />
- <meta-data android:name="com.android.settings.dismiss"
- android:value="30" />
- <meta-data android:name="com.android.settings.title"
- android:resource="@string/night_display_suggestion_title" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/night_display_suggestion_summary" />
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
</activity>
<activity android:name="Settings$DeviceInfoSettingsActivity"
diff --git a/res/layout/preference_widget_summary.xml b/res/layout/preference_widget_summary.xml
index aa4c76b..2d7ed1d 100644
--- a/res/layout/preference_widget_summary.xml
+++ b/res/layout/preference_widget_summary.xml
@@ -18,5 +18,6 @@
android:id="@+id/widget_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textAlignment="viewEnd"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" />
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8980568..873576c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -388,6 +388,21 @@
<item>GTC</item>
</string-array>
+ <!-- Type of EAP method when EAP SIM, AKA, AKA' are supported -->
+ <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+ <item>None</item>
+ <!-- Do not translate. -->
+ <item>MSCHAPV2</item>
+ <!-- Do not translate. -->
+ <item>GTC</item>
+ <!-- Do not translate. -->
+ <item>SIM</item>
+ <!-- Do not translate. -->
+ <item>AKA</item>
+ <!-- Do not translate. -->
+ <item>AKA\'</item>
+ </string-array>
+
<!-- Phase 2 options for rest of EAP methods -->
<string-array name="wifi_phase2_entries">
<item>None</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f6b36b4..fba0ef5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -743,7 +743,7 @@
<!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
<string name="account_settings_title">Accounts</string>
<!-- Main Settings screen setting option title for the item to take you to the security screen -->
- <string name="security_settings_title">Security & screen lock</string>
+ <string name="security_settings_title">Security & Location</string>
<!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
<string name="encryption_and_credential_settings_title">Encryption & credentials</string>
<!-- Security Settings screen Encryption and crendential summary -->
@@ -762,9 +762,9 @@
<!-- In the security screen, the header title for security statuses -->
<string name="security_status_title">Security status</string>
<!-- Summary for Security settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
- <string name="security_dashboard_summary">Location, fingerprint</string>
+ <string name="security_dashboard_summary">Screen lock, fingerprint</string>
<!-- Summary for Security settings when fingerprint is not supported [CHAR LIMIT=NONE]-->
- <string name="security_dashboard_summary_no_fingerprint">Location</string>
+ <string name="security_dashboard_summary_no_fingerprint">Screen lock</string>
<!-- Fingerprint enrollment and settings --><skip />
<!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
<string name="security_settings_fingerprint_preference_title">Fingerprint</string>
@@ -2365,6 +2365,8 @@
<string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn screen saver on.</string>
<!-- Dream settings screen, action label, when to dream -->
<string name="screensaver_settings_when_to_dream">When to start</string>
+ <!-- Dream settings screen, action label, current selected screen saver -->
+ <string name="screensaver_settings_current">Current screen saver</string>
<!-- Dream settings screen, button label to start dreaming -->
<string name="screensaver_settings_dream_start">Start now</string>
<!-- Dream settings screen, button label for settings for a specific screensaver -->
@@ -3065,7 +3067,7 @@
<string name="tether_settings_title_bluetooth">Bluetooth tethering</string>
<!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
<string name="tether_settings_title_usb_bluetooth">Tethering</string>
- <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=50]-->
+ <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=60]-->
<string name="tether_settings_title_all">Hotspot & tethering</string>
<!-- Tethering setting summary when both Wi-Fi hotspot and tether are turned on [CHAR LIMIT=NONE]-->
<string name="tether_settings_summary_hotspot_on_tether_on">Hotspot on, tethering</string>
@@ -3861,7 +3863,7 @@
<string name="language_settings">Languages & input</string>
<!-- Title of Languages & input settings screen -->
<string name="language_keyboard_settings_title">Languages & input</string>
- <!-- Title of preference category that lists all settings about helping user input such as spell checker [CHAR LIMIT=60]-->
+ <!-- Title of preference category that lists all settings about helping user text input such as spell checker [CHAR LIMIT=60]-->
<string name="input_assistance">Input assistance</string>
<!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
<string name="keyboard_settings_category">Keyboard & input methods</string>
@@ -6424,10 +6426,10 @@
<!-- Do not disturb: Title for the zen mode automation listing. [CHAR LIMIT=30] -->
<string name="zen_mode_automation_settings_title">Automatic rules</string>
- <!-- Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=30] -->
+ <!-- Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=50] -->
<string name="zen_mode_automation_suggestion_title">Set Do Not Disturb rules</string>
- <!-- Do not disturb: Summary for the zen mode automation option Suggestion. [CHAR LIMIT=30] -->
+ <!-- Do not disturb: Summary for the zen mode automation option Suggestion. [CHAR LIMIT=NONE] -->
<string name="zen_mode_automation_suggestion_summary">Limit sounds & vibrations at certain times</string>
<!-- Do not disturb: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
@@ -7871,12 +7873,6 @@
<!-- Summary of condition that work mode is off [CHAR LIMIT=NONE] -->
<string name="condition_work_summary">Apps, background sync, and other features related to your work profile are turned off.</string>
- <!-- Night display: Title for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->
- <string name="night_display_suggestion_title">Set Night Light schedule</string>
-
- <!-- Night display: Summary for the night display option Suggestion (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
- <string name="night_display_suggestion_summary">Tint screen amber to help you fall asleep</string>
-
<!-- Title of condition that night display is on (renamed "Night Light" with title caps). [CHAR LIMIT=30] -->
<string name="condition_night_display_title">Night Light is on</string>
@@ -8390,7 +8386,7 @@
<!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
<string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device.</string>
- <!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=80]-->
+ <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
<string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
<!-- Summary text for fingerprint swipe for notifications (phone) [CHAR LIMIT=160]-->
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 9ddf7b7..b5d7ddf 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -484,28 +484,13 @@
} break;
case R.string.storage_detail_images: {
- intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(
- DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "images_root"),
- DocumentsContract.Root.MIME_TYPE_ITEM);
- intent.addCategory(Intent.CATEGORY_DEFAULT);
-
+ intent = getIntentForStorage(AUTHORITY_MEDIA, "images_root");
} break;
case R.string.storage_detail_videos: {
- intent = new Intent(Intent.ACTION_VIEW);
- intent.setDataAndType(
- DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "videos_root"),
- DocumentsContract.Root.MIME_TYPE_ITEM);
- intent.addCategory(Intent.CATEGORY_DEFAULT);
-
+ intent = getIntentForStorage(AUTHORITY_MEDIA, "videos_root");
} break;
case R.string.storage_detail_audio: {
- intent = new Intent(DocumentsContract.Root.MIME_TYPE_ITEM);
- intent.setDataAndType(
- DocumentsContract.buildRootUri(AUTHORITY_MEDIA, "audio_root"),
- DocumentsContract.Root.MIME_TYPE_ITEM);
- intent.addCategory(Intent.CATEGORY_DEFAULT);
-
+ intent = getIntentForStorage(AUTHORITY_MEDIA, "audio_root");
} break;
case R.string.storage_detail_system: {
SystemInfoFragment.show(this);
@@ -546,6 +531,16 @@
return super.onPreferenceTreeClick(pref);
}
+ private Intent getIntentForStorage(String authority, String root) {
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.setDataAndType(
+ DocumentsContract.buildRootUri(authority, root),
+ DocumentsContract.Root.MIME_TYPE_ITEM);
+ intent.addCategory(Intent.CATEGORY_DEFAULT);
+
+ return intent;
+ }
+
private final MeasurementReceiver mReceiver = new MeasurementReceiver() {
@Override
public void onDetailsChanged(MeasurementDetails details) {
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index 60378c2..76346ec 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -245,7 +245,7 @@
return version;
}
- public static void clearLocalesIndexed(Context context) {
+ public static void clearCachedIndexed(Context context) {
context.getSharedPreferences(INDEX, 0).edit().clear().commit();
}
@@ -257,8 +257,16 @@
return context.getSharedPreferences(INDEX, 0).getBoolean(locale, false);
}
+ public static boolean isBuildIndexed(Context context, String buildNo) {
+ return context.getSharedPreferences(INDEX, 0).getBoolean(buildNo, false);
+ }
+
+ public static void setBuildIndexed(Context context, String buildNo) {
+ context.getSharedPreferences(INDEX, 0).edit().putBoolean(buildNo, true).commit();
+ }
+
private void dropTables(SQLiteDatabase db) {
- clearLocalesIndexed(mContext);
+ clearCachedIndexed(mContext);
db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_META_INDEX);
db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_PREFS_INDEX);
db.execSQL("DROP TABLE IF EXISTS " + Tables.TABLE_SAVED_QUERIES);
diff --git a/src/com/android/settings/search2/DatabaseIndexingManager.java b/src/com/android/settings/search2/DatabaseIndexingManager.java
index 1e664ff..533884d 100644
--- a/src/com/android/settings/search2/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search2/DatabaseIndexingManager.java
@@ -29,6 +29,7 @@
import android.database.sqlite.SQLiteException;
import android.net.Uri;
import android.os.AsyncTask;
+import android.os.Build;
import android.provider.SearchIndexableData;
import android.provider.SearchIndexableResource;
import android.provider.SearchIndexablesContract;
@@ -170,7 +171,16 @@
final List<ResolveInfo> list =
mContext.getPackageManager().queryIntentContentProviders(intent, 0);
- final boolean isLocaleIndexed = isLocaleIndexed();
+ final String localeStr = Locale.getDefault().toString();
+ final String fingerprint = Build.FINGERPRINT;
+ final boolean isFullIndex = isFullIndex(localeStr, fingerprint);
+
+ // Drop the database when the locale or build has changed. This eliminates rows which are
+ // dynamically inserted in the old language, or deprecated settings.
+ if (isFullIndex) {
+ final SQLiteDatabase db = getWritableDatabase();
+ IndexDatabaseHelper.getInstance(mContext).reconstruct(db);
+ }
for (final ResolveInfo info : list) {
if (!DatabaseIndexingUtils.isWellKnownProvider(info, mContext)) {
@@ -179,22 +189,32 @@
final String authority = info.providerInfo.authority;
final String packageName = info.providerInfo.packageName;
- if (!isLocaleIndexed) {
+ if (isFullIndex) {
addIndexablesFromRemoteProvider(packageName, authority);
}
addNonIndexablesKeysFromRemoteProvider(packageName, authority);
}
- final String localeStr = Locale.getDefault().toString();
- updateDatabase(isLocaleIndexed, localeStr);
+ updateDatabase(isFullIndex, localeStr);
IndexDatabaseHelper.setLocaleIndexed(mContext, localeStr);
+ IndexDatabaseHelper.setBuildIndexed(mContext, fingerprint);
}
+ /**
+ * Perform a full index on an OTA or when the locale has changed
+ *
+ * @param locale is the default for the device
+ * @param fingerprint id for the current build.
+ * @return true when the locale or build has changed since last index.
+ */
@VisibleForTesting
- boolean isLocaleIndexed() {
- final String locale = Locale.getDefault().toString();
- return IndexDatabaseHelper.getInstance(mContext).isLocaleAlreadyIndexed(mContext, locale);
+ boolean isFullIndex(String locale, String fingerprint) {
+ final boolean isLocaleIndexed = IndexDatabaseHelper.getInstance(mContext)
+ .isLocaleAlreadyIndexed(mContext, locale);
+ final boolean isBuildIndexed = IndexDatabaseHelper.getInstance(mContext)
+ .isBuildIndexed(mContext, fingerprint);
+ return !isLocaleIndexed || !isBuildIndexed;
}
/**
@@ -204,11 +224,11 @@
* Then search results are verified to have the correct value of enabled.
* Finally, we record that the locale has been indexed.
*
- * @param isIncrementalUpdate true when the language has already been indexed.
+ * @param needsReindexing true the database needs to be rebuilt.
* @param localeStr the default locale for the device.
*/
@VisibleForTesting
- void updateDatabase(boolean isIncrementalUpdate, String localeStr) {
+ void updateDatabase(boolean needsReindexing, String localeStr) {
mIsAvailable.set(false);
final UpdateData copy;
@@ -236,7 +256,7 @@
// Only check for non-indexable key updates after initial index.
// Enabled state with non-indexable keys is checked when items are first inserted.
- if (isIncrementalUpdate) {
+ if (!needsReindexing) {
updateDataInDatabase(database, nonIndexableKeys);
}
@@ -284,7 +304,7 @@
* @param database The database to validate.
* @param nonIndexableKeys A map between package name and the set of non-indexable keys for it.
*/
- @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+ @VisibleForTesting
void updateDataInDatabase(SQLiteDatabase database,
Map<String, Set<String>> nonIndexableKeys) {
final String whereEnabled = ENABLED + " = 1";
@@ -348,7 +368,6 @@
@VisibleForTesting
boolean addIndexablesFromRemoteProvider(String packageName, String authority) {
try {
-
final Context context = mBaseAuthority.equals(authority) ?
mContext : mContext.createPackageContext(packageName, 0);
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 4380cbe..fe2bbb3 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -106,6 +106,9 @@
public static final int WIFI_PEAP_PHASE2_NONE = 0;
public static final int WIFI_PEAP_PHASE2_MSCHAPV2 = 1;
public static final int WIFI_PEAP_PHASE2_GTC = 2;
+ public static final int WIFI_PEAP_PHASE2_SIM = 3;
+ public static final int WIFI_PEAP_PHASE2_AKA = 4;
+ public static final int WIFI_PEAP_PHASE2_AKA_PRIME = 5;
/* Phase2 methods supported by PEAP are limited */
private final ArrayAdapter<String> mPhase2PeapAdapter;
@@ -176,9 +179,16 @@
final Resources res = mContext.getResources();
mLevels = res.getStringArray(R.array.wifi_signal);
- mPhase2PeapAdapter = new ArrayAdapter<String>(
- mContext, android.R.layout.simple_spinner_item,
- res.getStringArray(R.array.wifi_peap_phase2_entries));
+ if (Utils.isWifiOnly(mContext) || !mContext.getResources().getBoolean(
+ com.android.internal.R.bool.config_eap_sim_based_auth_supported)) {
+ mPhase2PeapAdapter = new ArrayAdapter<String>(
+ mContext, android.R.layout.simple_spinner_item,
+ res.getStringArray(R.array.wifi_peap_phase2_entries));
+ } else {
+ mPhase2PeapAdapter = new ArrayAdapter<String>(
+ mContext, android.R.layout.simple_spinner_item,
+ res.getStringArray(R.array.wifi_peap_phase2_entries_with_sim_auth));
+ }
mPhase2PeapAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
mPhase2FullAdapter = new ArrayAdapter<String>(
@@ -532,6 +542,15 @@
case WIFI_PEAP_PHASE2_GTC:
config.enterpriseConfig.setPhase2Method(Phase2.GTC);
break;
+ case WIFI_PEAP_PHASE2_SIM:
+ config.enterpriseConfig.setPhase2Method(Phase2.SIM);
+ break;
+ case WIFI_PEAP_PHASE2_AKA:
+ config.enterpriseConfig.setPhase2Method(Phase2.AKA);
+ break;
+ case WIFI_PEAP_PHASE2_AKA_PRIME:
+ config.enterpriseConfig.setPhase2Method(Phase2.AKA_PRIME);
+ break;
default:
Log.e(TAG, "Unknown phase2 method" + phase2Method);
break;
@@ -795,6 +814,7 @@
mEapMethodSpinner.setAdapter(spinnerAdapter);
}
mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
+ mPhase2Spinner.setOnItemSelectedListener(this);
mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
mEapCaCertSpinner.setOnItemSelectedListener(this);
mEapDomainView = (TextView) mView.findViewById(R.id.domain);
@@ -836,6 +856,15 @@
case Phase2.GTC:
mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_GTC);
break;
+ case Phase2.SIM:
+ mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_SIM);
+ break;
+ case Phase2.AKA:
+ mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_AKA);
+ break;
+ case Phase2.AKA_PRIME:
+ mPhase2Spinner.setSelection(WIFI_PEAP_PHASE2_AKA_PRIME);
+ break;
default:
Log.e(TAG, "Invalid phase 2 method " + phase2Method);
break;
@@ -874,6 +903,7 @@
mEapIdentityView.setText(enterpriseConfig.getIdentity());
mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());
} else {
+ mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
showEapFieldsByMethod(mEapMethodSpinner.getSelectedItemPosition());
}
} else {
@@ -886,11 +916,11 @@
* identity
* password
* EAP-PEAP valid fields include
- * phase2: MSCHAPV2, GTC
+ * phase2: MSCHAPV2, GTC, SIM, AKA, AKA'
* ca_cert
* identity
* anonymous_identity
- * password
+ * password (not required for SIM, AKA, AKA')
* EAP-TLS valid fields include
* user_cert
* ca_cert
@@ -938,6 +968,7 @@
}
mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
+ showPeapFields();
setUserCertInvisible();
break;
case WIFI_EAP_METHOD_TTLS:
@@ -974,6 +1005,21 @@
}
}
+ private void showPeapFields() {
+ int phase2Method = mPhase2Spinner.getSelectedItemPosition();
+ if (phase2Method == WIFI_PEAP_PHASE2_SIM || phase2Method == WIFI_PEAP_PHASE2_AKA
+ || phase2Method == WIFI_PEAP_PHASE2_AKA_PRIME) {
+ mEapIdentityView.setText("");
+ mView.findViewById(R.id.l_identity).setVisibility(View.GONE);
+ setPasswordInvisible();
+ } else {
+ mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
+ mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
+ mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
+ mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+ }
+ }
+
private void setIdentityInvisible() {
mView.findViewById(R.id.l_identity).setVisibility(View.GONE);
mPhase2Spinner.setSelection(Phase2.NONE);
@@ -1239,6 +1285,9 @@
showSecurityFields();
} else if (parent == mEapMethodSpinner || parent == mEapCaCertSpinner) {
showSecurityFields();
+ } else if (parent == mPhase2Spinner
+ && mEapMethodSpinner.getSelectedItemPosition() == WIFI_EAP_METHOD_PEAP) {
+ showPeapFields();
} else if (parent == mProxySettingsSpinner) {
showProxyFields();
} else {
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
index 327b910..aa4e4f9 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
@@ -30,6 +30,8 @@
import android.database.MatrixCursor;
import android.database.sqlite.SQLiteDatabase;
import android.net.Uri;
+import android.os.Build;
+import android.provider.SearchIndexableData;
import android.provider.SearchIndexableResource;
import android.provider.SearchIndexablesContract;
import android.util.ArrayMap;
@@ -74,7 +76,7 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
- shadows={ShadowRunnableAsyncTask.class})
+ shadows = {ShadowRunnableAsyncTask.class})
public class DatabaseIndexingManagerTest {
private final String localeStr = "en_US";
@@ -122,7 +124,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mManager = spy(new DatabaseIndexingManager(mContext,"com.android.settings"));
+ mManager = spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
mDb = IndexDatabaseHelper.getInstance(mContext).getWritableDatabase();
doReturn(mPackageManager).when(mContext).getPackageManager();
@@ -671,42 +673,95 @@
// Test new public indexing flow
@Test
- @Config(shadows= {
- ShadowDatabaseIndexingUtils.class,
- })
+ @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
public void testPerformIndexing_fullIndex_getsDataFromProviders() {
DummyProvider provider = new DummyProvider();
provider.onCreate();
- ShadowContentResolver.registerProvider(
- AUTHORITY_ONE, provider
- );
+ ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
// Test that Indexables are added for Full indexing
when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
.thenReturn(getDummyResolveInfo());
DatabaseIndexingManager manager =
- spy(new DatabaseIndexingManager(mContext, "com.android.settings"));
- doReturn(false).when(manager).isLocaleIndexed();
+ spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
+ doReturn(true).when(manager).isFullIndex(anyString(), anyString());
manager.performIndexing();
- verify(manager).updateDatabase(false, Locale.getDefault().toString());
-
- Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
- cursor.moveToPosition(0);
-
- // Data Title
- assertThat(cursor.getString(2)).isEqualTo(TITLE_ONE);
+ verify(manager).addIndexablesFromRemoteProvider(PACKAGE_ONE, AUTHORITY_ONE);
+ verify(manager).updateDatabase(true /* isFullIndex */, Locale.getDefault().toString());
}
@Test
- @Config(shadows= {
- ShadowDatabaseIndexingUtils.class,
- })
+ @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
public void testPerformIndexing_incrementalIndex_noDataAdded() {
DummyProvider provider = new DummyProvider();
provider.onCreate();
+ ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
+
+ // Test that Indexables are added for Full indexing
+ when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
+ .thenReturn(getDummyResolveInfo());
+
+ DatabaseIndexingManager manager =
+ spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
+ doReturn(false).when(manager).isFullIndex(anyString(), anyString());
+
+ manager.mDataToProcess.dataToUpdate.clear();
+
+ manager.performIndexing();
+
+ verify(manager, times(0)).addDataToDatabase(any(SQLiteDatabase.class), anyString(),
+ anyList(), anyMap());
+ verify(manager, times(0)).addIndexablesFromRemoteProvider(PACKAGE_ONE, AUTHORITY_ONE);
+ verify(manager).updateDataInDatabase(any(SQLiteDatabase.class), anyMap());
+ }
+
+ @Test
+ @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
+ public void testPerformIndexing_localeChanged_databaseDropped() {
+ DummyProvider provider = new DummyProvider();
+ provider.onCreate();
+ ShadowContentResolver.registerProvider(AUTHORITY_ONE, provider);
+
+ // Test that Indexables are added for Full indexing
+ when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
+ .thenReturn(getDummyResolveInfo());
+
+ // Initialize the Manager
+ DatabaseIndexingManager manager =
+ spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
+ doReturn(true).when(manager).isFullIndex(anyString(), anyString());
+
+ // Insert data point which will be dropped
+ final String oldTitle = "This is French";
+ insertSpecialCase(oldTitle, true, "key");
+
+ // Add a data point to be added by the indexing
+ SearchIndexableRaw raw = new SearchIndexableRaw(mContext);
+ final String newTitle = "This is English";
+ raw.title = newTitle;
+ manager.mDataToProcess.dataToUpdate.add(raw);
+
+ manager.performIndexing();
+
+ // Assert that the New Title is inserted
+ final Cursor newCursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE data_title = '" +
+ newTitle + "'", null);
+ assertThat(newCursor.getCount()).isEqualTo(1);
+
+ // Assert that the Old Title is no longer in the database, since it was dropped
+ final Cursor oldCursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE data_title = '" +
+ oldTitle + "'", null);
+ assertThat(oldCursor.getCount()).isEqualTo(0);
+ }
+
+ @Test
+ @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
+ public void testPerformIndexing_onOta_FullIndex() {
+ DummyProvider provider = new DummyProvider();
+ provider.onCreate();
ShadowContentResolver.registerProvider(
AUTHORITY_ONE, provider
);
@@ -716,19 +771,40 @@
.thenReturn(getDummyResolveInfo());
DatabaseIndexingManager manager =
- spy(new DatabaseIndexingManager(mContext, "com.android.settings"));
- doReturn(true).when(manager).isLocaleIndexed();
+ spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
+ doReturn(true).when(manager).isFullIndex(anyString(), anyString());
manager.performIndexing();
- final Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
+ verify(manager).updateDatabase(true /* isFullIndex */, Locale.getDefault().toString());
+ }
- assertThat(cursor.getCount()).isEqualTo(0);
+ @Test
+ @Config(shadows = {ShadowDatabaseIndexingUtils.class,})
+ public void testPerformIndexing_onOta_buildNumberIsCached() {
+ DummyProvider provider = new DummyProvider();
+ provider.onCreate();
+ ShadowContentResolver.registerProvider(
+ AUTHORITY_ONE, provider
+ );
+
+ // Test that Indexables are added for Full indexing
+ when(mPackageManager.queryIntentContentProviders(any(Intent.class), anyInt()))
+ .thenReturn(getDummyResolveInfo());
+
+ DatabaseIndexingManager manager =
+ spy(new DatabaseIndexingManager(mContext, PACKAGE_ONE));
+ doReturn(true).when(manager).isFullIndex(anyString(), anyString());
+
+ manager.performIndexing();
+
+ assertThat(IndexDatabaseHelper.getInstance(mContext).isBuildIndexed(mContext,
+ Build.FINGERPRINT)).isTrue();
}
@Test
public void testFullUpdatedDatabase_noData_addDataToDatabaseNotCalled() {
- mManager.updateDatabase(false, localeStr);
+ mManager.updateDatabase(true /* isFullIndex */, localeStr);
mManager.mDataToProcess.dataToUpdate.clear();
verify(mManager, times(0)).addDataToDatabase(any(SQLiteDatabase.class), anyString(),
anyList(), anyMap());
@@ -736,13 +812,13 @@
@Test
public void testFullUpdatedDatabase_updatedDataInDatabaseNotCalled() {
- mManager.updateDatabase(false, localeStr);
+ mManager.updateDatabase(true /* isFullIndex */, localeStr);
verify(mManager, times(0)).updateDataInDatabase(any(SQLiteDatabase.class), anyMap());
}
@Test
public void testLocaleUpdated_afterIndexing_localeNotAdded() {
- mManager.updateDatabase(false, localeStr);
+ mManager.updateDatabase(true /* isFullIndex */, localeStr);
assertThat(IndexDatabaseHelper.getInstance(mContext)
.isLocaleAlreadyIndexed(mContext, localeStr)).isFalse();
}
@@ -758,7 +834,7 @@
public void testUpdateDatabase_newEligibleData_addedToDatabase() {
// Test that addDataToDatabase is called when dataToUpdate is non-empty
mManager.mDataToProcess.dataToUpdate.add(getFakeRaw());
- mManager.updateDatabase(false, localeStr);
+ mManager.updateDatabase(true /* isFullIndex */, localeStr);
Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index", null);
cursor.moveToPosition(0);
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 3780d35..ad035bd 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -54,12 +54,6 @@
}
@Test
- public void nightDisplaySettings_isValid() {
- assertSuggestionEquals("Settings$NightDisplaySettingsActivity",
- R.string.night_display_suggestion_title, R.string.night_display_suggestion_summary);
- }
-
- @Test
public void fingerprintSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",
R.string.suggestion_additional_fingerprints,