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

Commit 99126195 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Make config_assistantOnTopOfDream a TestApi" into rvc-dev am: 60d5549e 

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

Change-Id: Ia2bcaf8dad86cc4f35211ba88e922a14af4c3ccb
parents 1b85a987 60d5549e

api/test-current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ package android { 
  }

  }





  public static final class R.bool {

  public static final class R.bool {

    field public static final int config_assistantOnTopOfDream = 17891333; // 0x1110005

    field public static final int config_perDisplayFocusEnabled = 17891332; // 0x1110004

    field public static final int config_perDisplayFocusEnabled = 17891332; // 0x1110004

  }

  }

core/res/res/values/public.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -3022,6 +3022,8 @@ 
    <public type="id" name="accessibilitySystemActionTakeScreenshot" id="0x01020053" />

    <public type="id" name="accessibilitySystemActionTakeScreenshot" id="0x01020053" />

    <public type="id" name="accessibilityActionImeEnter" id="0x01020054" />

    <public type="id" name="accessibilityActionImeEnter" id="0x01020054" />





    <!-- @hide @TestApi -->

    <public type="bool" name="config_assistantOnTopOfDream" id="0x01110005" />

  <!-- ===============================================================

  <!-- ===============================================================

       Resources added in version S of the platform

       Resources added in version S of the platform
@@ -3054,7 +3056,7 @@ 
    <!-- dimension definitions go here -->

    <!-- dimension definitions go here -->

  </public-group>

  </public-group>





  <public-group type="bool" first-id="0x01110005">

  <public-group type="bool" first-id="0x01110006">

    <!-- boolean definitions go here -->

    <!-- boolean definitions go here -->

  </public-group>

  </public-group>