Browse Source

Change default wallpaper name

Reason for this change is the same for why we changed the default wallpaper
component name last year for the P3XL. Google keeps setting LWP's and default
ones via overlay among other things. Instead of recompiling a vendor and having
users flash this 'special' one every time they use DU, we figured this is
best course of action.

Change-Id: Ia12e1b077ae08af3fb97c9504d672c4d103f9042
Signed-off-by: NurKeinNeid <mralexman3000@gmail.com>
ten
Alex 1 year ago
parent
commit
897681544a

+ 1
- 0
config/hiddenapi-greylist-max-o.txt View File

@@ -98212,6 +98212,7 @@ Lcom/android/internal/R$drawable;->decor_maximize_button_dark:I
Lcom/android/internal/R$drawable;->decor_maximize_button_light:I
Lcom/android/internal/R$drawable;->default_lock_wallpaper:I
Lcom/android/internal/R$drawable;->default_wallpaper:I
Lcom/android/internal/R$drawable;->custom_default_wallpaper:I
Lcom/android/internal/R$drawable;->dialog_frame:I
Lcom/android/internal/R$drawable;->dialog_holo_dark_frame:I
Lcom/android/internal/R$drawable;->dialog_holo_light_frame:I

+ 1
- 1
core/java/android/app/WallpaperManager.java View File

@@ -1874,7 +1874,7 @@ public class WallpaperManager {
return null;
} else {
whichProp = PROP_WALLPAPER;
defaultResId = com.android.internal.R.drawable.default_wallpaper;
defaultResId = com.android.internal.R.drawable.custom_default_wallpaper;
}
final String path = SystemProperties.get(whichProp);
if (!TextUtils.isEmpty(path)) {

core/res/res/drawable-nodpi/default_wallpaper.png → core/res/res/drawable-nodpi/custom_default_wallpaper.png View File


core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png → core/res/res/drawable-sw600dp-nodpi/custom_default_wallpaper.png View File


core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png → core/res/res/drawable-sw720dp-nodpi/custom_default_wallpaper.png View File


+ 3
- 0
core/res/res/values/aosip_symbols.xml View File

@@ -159,6 +159,9 @@

<java-symbol type="integer" name="config_screenBrightnessPulse" />

<!-- Custom default wallpaper -->
<java-symbol type="drawable" name="custom_default_wallpaper" />

<java-symbol type="array" name="config_customPermissionsList" />

<!-- Post reset runnable for all clients -->

+ 1
- 1
core/res/res/values/symbols.xml View File

@@ -1319,7 +1319,7 @@
<java-symbol type="array" name="vendor_disallowed_apps_managed_profile" />
<java-symbol type="array" name="vendor_disallowed_apps_managed_device" />

<java-symbol type="drawable" name="default_wallpaper" />
<!--java-symbol type="drawable" name="default_wallpaper" /-->
<java-symbol type="drawable" name="default_lock_wallpaper" />
<java-symbol type="drawable" name="indicator_input_error" />
<java-symbol type="drawable" name="ic_file_copy" />

+ 1
- 1
packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java View File

@@ -1129,7 +1129,7 @@ public class CarStatusBar extends StatusBar implements CarBatteryController.Batt
* Returns the {@link Drawable} that represents the wallpaper that the user has currently set.
*/
private Drawable getDefaultWallpaper() {
return mContext.getDrawable(com.android.internal.R.drawable.default_wallpaper);
return mContext.getDrawable(com.android.internal.R.drawable.custom_default_wallpaper);
}

private void setNotificationViewClipBounds(int height) {

+ 1
- 1
services/core/java/com/android/server/WallpaperUpdateReceiver.java View File

@@ -54,7 +54,7 @@ public class WallpaperUpdateReceiver extends BroadcastReceiver {
Bitmap blank = Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8);
// set a blank wallpaper to force a redraw of default_wallpaper
wallpaperManager.setBitmap(blank);
wallpaperManager.setResource(com.android.internal.R.drawable.default_wallpaper);
wallpaperManager.setResource(com.android.internal.R.drawable.custom_default_wallpaper);
} catch (Exception e) {
Slog.w(TAG, "Failed to customize system wallpaper." + e);
}

+ 1
- 1
services/tests/uiservicestests/src/com/android/server/notification/NotificationShellCmdTest.java View File

@@ -168,7 +168,7 @@ public class NotificationShellCmdTest extends UiServiceTestCase {
public void testBigPicture() throws Exception {
final String aTag = "aTag";
final String aText = "someText";
final String bigPicture = "@android:drawable/default_wallpaper";
final String bigPicture = "@android:drawable/custom_default_wallpaper";
doCmd("notify",
"--style", "bigpicture",
"--picture", bigPicture,

Loading…
Cancel
Save