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

Commit 5a8d9eae authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

Merge "Improve system gesture listener to handle display cutout"

parents 5640a8d1 b0a061e5

core/res/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ 
    <dimen name="navigation_bar_height_landscape">48dp</dimen>

    <!-- Width of the navigation bar when it is placed vertically on the screen -->

    <dimen name="navigation_bar_width">48dp</dimen>

    <!-- How much we expand the touchable region of the status bar below the notch to catch touches

         that just start below the notch. -->

    <dimen name="display_cutout_touchable_region_size">12dp</dimen>



    <!-- EXPERIMENT BEGIN -->

    <!-- Height of the bottom navigation bar frame; this is different than navigation_bar_height

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1750,6 +1750,7 @@ 
  <java-symbol type="dimen" name="navigation_bar_height_landscape_car_mode" />

  <java-symbol type="dimen" name="navigation_bar_width_car_mode" />

  <java-symbol type="dimen" name="status_bar_height" />

  <java-symbol type="dimen" name="display_cutout_touchable_region_size" />

  <java-symbol type="dimen" name="quick_qs_offset_height" />

  <java-symbol type="dimen" name="quick_qs_total_height" />

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

packages/SystemUI/res/values/dimens.xml

+0 −4
Original line number Diff line number Diff line
@@ -985,10 +985,6 @@ 
    <!-- How much into a DisplayCutout's bounds we can go, on each side -->

    <dimen name="display_cutout_margin_consumption">0px</dimen>



    <!-- How much we expand the touchable region of the status bar below the notch to catch touches

         that just start below the notch. -->

    <dimen name="display_cutout_touchable_region_size">12dp</dimen>



    <!-- Padding below Ongoing App Ops dialog title -->

    <dimen name="ongoing_appops_dialog_sep">16dp</dimen>

    <!--Padding around text items in Ongoing App Ops dialog -->

packages/SystemUI/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class HeadsUpManagerPhone extends HeadsUpManager implements Dumpable, 
        mHeadsUpInset = mStatusBarHeight + resources.getDimensionPixelSize(

                R.dimen.heads_up_status_bar_padding);

        mDisplayCutoutTouchableRegionSize = resources.getDimensionPixelSize(

                R.dimen.display_cutout_touchable_region_size);

                com.android.internal.R.dimen.display_cutout_touchable_region_size);

    }



    @Override

services/core/java/com/android/server/wm/DisplayPolicy.java

+1 −0
Original line number Diff line number Diff line
@@ -2544,6 +2544,7 @@ public class DisplayPolicy { 
     */

    public void onOverlayChangedLw() {

        onConfigurationChanged();

        mSystemGestures.onConfigurationChanged();

    }



    /**