Change TP start logic
Only run on userdebug and allow caller to bypass
styles and revert to WallpaperPicker
Bug: 122524192
Change-Id: Ifaff7fcf4cf8dd57f51d4e3e6e26088150089bdb
diff --git a/res/values/override.xml b/res/values/override.xml
index 54bb551..2de29c4 100644
--- a/res/values/override.xml
+++ b/res/values/override.xml
@@ -24,5 +24,5 @@
<!--Name of metadata in the main launcher Activity which values contains the authority
corresponding to a ContentProvider in launcher to provide available grids and
allow for changing them -->
- <string name="grid_control_metadata_name" translatable="false">"com.android.launcher3.grid.control"</string>
+ <string name="grid_control_metadata_name" translatable="false">com.android.launcher3.grid.control</string>
</resources>
\ No newline at end of file
diff --git a/src/com/android/customization/picker/CustomizationPickerActivity.java b/src/com/android/customization/picker/CustomizationPickerActivity.java
index ec4963f..e0aaa7a 100644
--- a/src/com/android/customization/picker/CustomizationPickerActivity.java
+++ b/src/com/android/customization/picker/CustomizationPickerActivity.java
@@ -16,8 +16,8 @@
package com.android.customization.picker;
import android.content.Intent;
+import android.os.Build;
import android.os.Bundle;
-import android.os.SystemProperties;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
@@ -75,8 +75,7 @@
CategoryFragmentHost, ThemeFragmentHost, GridFragmentHost, ClockFragmentHost {
private static final String TAG = "CustomizationPickerActivity";
- private static final String THEMEPICKER_SYSTEM_PROPERTY =
- "com.android.customization.picker.enable_customization";
+ private static final String WALLPAPER_ONLY_EXTRA = "wallpaper_only";
private WallpaperPickerDelegate mDelegate;
private UserEventLogger mUserEventLogger;
@@ -125,7 +124,10 @@
if (!BuildCompat.isAtLeastQ()) {
return;
}
- if (!Boolean.parseBoolean(SystemProperties.get(THEMEPICKER_SYSTEM_PROPERTY, "false"))) {
+ if (Build.TYPE.equals("user")) {
+ return;
+ }
+ if (getIntent().hasExtra(WALLPAPER_ONLY_EXTRA)) {
return;
}
//Theme