Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add placeholder preview image for dreams."

Browse Source
This commit is contained in:
Lucas Silva
2022-01-19 15:03:39 +00:00
committed by Android (Google) Code Review
parent c6cc4639d1 4b4bd18f53
commit e490dfa3fe
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/res/res/drawable/default_dream_preview.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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>

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

@@ -2221,6 +2221,7 @@
<java-symbol type="integer" name="config_dreamsBatteryLevelMinimumWhenNotPowered" />
<java-symbol type="integer" name="config_dreamsBatteryLevelDrainCutoff" />
<java-symbol type="string" name="config_dreamsDefaultComponent" />
<java-symbol type="drawable" name="default_dream_preview" />
<java-symbol type="string" name="config_dozeComponent" />
<java-symbol type="string" name="enable_explore_by_touch_warning_title" />
<java-symbol type="string" name="enable_explore_by_touch_warning_message" />

11
packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java
View File

@@ -52,6 +52,7 @@ import java.util.List;
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;
@@ -111,6 +112,8 @@ public class DreamBackend {
.getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnSleepByDefault);
mDreamsActivatedOnDockByDefault = mContext.getResources()
.getBoolean(com.android.internal.R.bool.config_dreamsActivatedOnDockByDefault);
mDreamPreviewDefault = mContext.getResources().getDrawable(
com.android.internal.R.drawable.default_dream_preview);
}
public List<DreamInfo> getDreamInfos() {
@@ -133,11 +136,11 @@ public class DreamBackend {
dreamInfo.isActive = dreamInfo.componentName.equals(activeDream);
final DreamMetadata dreamMetadata = getDreamMetadata(pm, resolveInfo);
if (dreamMetadata != null) {
dreamInfo.settingsComponentName = dreamMetadata.mSettingsActivity;
dreamInfo.previewImage = dreamMetadata.mPreviewImage;
dreamInfo.settingsComponentName = dreamMetadata.mSettingsActivity;
dreamInfo.previewImage = dreamMetadata.mPreviewImage;
if (dreamInfo.previewImage == null) {
dreamInfo.previewImage = mDreamPreviewDefault;
}
dreamInfos.add(dreamInfo);
}
Collections.sort(dreamInfos, mComparator);