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

Commit c59c9c66 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I2a553ec07c58fb2bbcb494aedfa9d2ae947944f6
parents 0c7c1509 a7fb25ba

core/res/res/values/dimens.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -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>

libs/WindowManager/Shell/res/values/dimen.xml

+0 −5
Original line number Original line Diff line number Diff line
@@ -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>

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -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(