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

Merge "Consolidate the starting surface icon size to framework" into sc-dev am: a7fb25ba8a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609920

Change-Id: I2a553ec07c58fb2bbcb494aedfa9d2ae947944f6
This commit is contained in:
Wei Sheng Shih
2021-06-02 10:08:06 +00:00
committed by Automerger Merge Worker
parent 0c7c150922 a7fb25ba8a
commit c59c9c6664
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/dimens.xml
View File

@@ -939,4 +939,8 @@
<!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. @removed --> <!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. @removed -->
<dimen name="__removed_system_app_widget_internal_padding">16dp</dimen> <dimen name="__removed_system_app_widget_internal_padding">16dp</dimen>
<!-- The width/height of the icon view on staring surface. -->
<dimen name="starting_surface_icon_size">160dp</dimen>
<!-- The default width/height of the icon on the spec of adaptive icon drawable. -->
<dimen name="starting_surface_default_icon_size">108dp</dimen>
</resources> </resources>

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

@@ -4389,4 +4389,7 @@
<java-symbol type="bool" name="config_supportsMicToggle" /> <java-symbol type="bool" name="config_supportsMicToggle" />
<java-symbol type="bool" name="config_supportsCamToggle" /> <java-symbol type="bool" name="config_supportsCamToggle" />
<java-symbol type="dimen" name="starting_surface_icon_size" />
<java-symbol type="dimen" name="starting_surface_default_icon_size" />
</resources> </resources>

5
libs/WindowManager/Shell/res/values/dimen.xml
View File

@@ -180,11 +180,6 @@
individual_bubble_size + some padding. --> individual_bubble_size + some padding. -->
<dimen name="bubble_stack_user_education_side_inset">72dp</dimen> <dimen name="bubble_stack_user_education_side_inset">72dp</dimen>
<!-- The width/height of the icon view on staring surface. -->
<dimen name="starting_surface_icon_size">160dp</dimen>
<!-- The default width/height of the icon on the spec of adaptive icon drawable. -->
<dimen name="default_icon_size">108dp</dimen>
<!-- The width/height of the size compat restart button. --> <!-- The width/height of the size compat restart button. -->
<dimen name="size_compat_button_size">48dp</dimen> <dimen name="size_compat_button_size">48dp</dimen>

4
libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenContentDrawer.java
View File

@@ -124,9 +124,9 @@ public class SplashscreenContentDrawer {
private void updateDensity() { private void updateDensity() {
mIconSize = mContext.getResources().getDimensionPixelSize( mIconSize = mContext.getResources().getDimensionPixelSize(
com.android.wm.shell.R.dimen.starting_surface_icon_size); com.android.internal.R.dimen.starting_surface_icon_size);
mDefaultIconSize = mContext.getResources().getDimensionPixelSize( mDefaultIconSize = mContext.getResources().getDimensionPixelSize(
com.android.wm.shell.R.dimen.default_icon_size); com.android.internal.R.dimen.starting_surface_default_icon_size);
mBrandingImageWidth = mContext.getResources().getDimensionPixelSize( mBrandingImageWidth = mContext.getResources().getDimensionPixelSize(
com.android.wm.shell.R.dimen.starting_surface_brand_image_width); com.android.wm.shell.R.dimen.starting_surface_brand_image_width);
mBrandingImageHeight = mContext.getResources().getDimensionPixelSize( mBrandingImageHeight = mContext.getResources().getDimensionPixelSize(