Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29ed5a46 authored by Lucas Silva's avatar Lucas Silva
Browse files

Remove dream placeholder image from settingslib. 

This logic is implemented within the settings UI, since the placeholder
is treated differently than regular preview images.

Test: locally on device
Bug: 213887094
Change-Id: I556f551e2c5659f4fbe951b984dc04cf373e679c
parent c20dbd6c

core/res/res/drawable/default_dream_preview.xml

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 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.

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <solid android:color="@android:color/white"/>

</shape>
 
 No newline at end of file

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2233,7 +2233,6 @@ 
  <java-symbol type="string" name="config_dreamsDefaultComponent" />

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

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

  <java-symbol type="drawable" name="default_dream_preview" />

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

  <java-symbol type="string" name="config_dozeComponent" />

  <java-symbol type="string" name="enable_explore_by_touch_warning_title" />

packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java

+0 −6
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import java.util.stream.Collectors; 
public class DreamBackend {

    private static final String TAG = "DreamBackend";

    private static final boolean DEBUG = false;

    private final Drawable mDreamPreviewDefault;



    public static class DreamInfo {

        public CharSequence caption;
@@ -135,8 +134,6 @@ public class DreamBackend { 
                com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);

        mDreamsActivatedOnDockByDefault = resources.getBoolean(

                com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);

        mDreamPreviewDefault = resources.getDrawable(

                com.android.internal.R.drawable.default_dream_preview);

        mDisabledDreams = Arrays.stream(resources.getStringArray(

                        com.android.internal.R.array.config_disabledDreamComponents))

                .map(ComponentName::unflattenFromString)
@@ -182,9 +179,6 @@ public class DreamBackend { 
                dreamInfo.settingsComponentName = dreamMetadata.settingsActivity;

                dreamInfo.previewImage = dreamMetadata.previewImage;

            }

            if (dreamInfo.previewImage == null) {

                dreamInfo.previewImage = mDreamPreviewDefault;

            }

            dreamInfos.add(dreamInfo);

        }

        dreamInfos.sort(mComparator);