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

Commit 07c31f00 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ie6c38a4c,I436609d9 

* changes:
  Makes settings provider queryable by all
  Makes forceQueryable public
parents b7c23860 3d5bb944

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ package android { 
    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceDarkAllowed = 16844172; // 0x101058c

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521

    field public static final int forceQueryable = 16844296; // 0x1010608

    field public static final int forceUriPermissions = 16844191; // 0x101059f

    field public static final int foreground = 16843017; // 0x1010109

    field public static final int foregroundGravity = 16843264; // 0x1010200

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2927,6 +2927,7 @@ 
    <public type="attr" name="enforceStatusBarContrast" id="0x01010604" />

    <public type="attr" name="enforceNavigationBarContrast" id="0x01010605" />

    <public type="attr" name="identifier" id="0x01010606" />

    <public type="attr" name="forceQueryable" id="0x01010608" />



    <!-- @hide @SystemApi -->

    <public type="drawable" name="ic_info" id="0x010800b4" />

packages/SettingsProvider/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
                 android:restoreAnyVersion="true"

                 android:icon="@mipmap/ic_launcher_settings"

                 android:defaultToDeviceProtectedStorage="true"

                 android:forceQueryable="true"

                 android:directBootAware="true">



        <provider android:name="SettingsProvider"