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

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

Merge "Factor out HelpUtils into @SystemAPI lib"

parents 933485cd 51c6c4c2

api/system-current.txt

+13 −0
Original line number Diff line number Diff line
@@ -213,11 +213,24 @@ package android { 
    field public static final int userRestriction = 16844164; // 0x1010584

  }



  public static final class R.bool {

    field public static final int config_sendPackageName = 17891328; // 0x1110000

  }



  public static final class R.raw {

    field public static final int loaderror = 17825792; // 0x1100000

    field public static final int nodomain = 17825793; // 0x1100001

  }



  public static final class R.string {

    field public static final int config_feedback_intent_extra_key = 17039391; // 0x104001f

    field public static final int config_feedback_intent_name_key = 17039392; // 0x1040020

    field public static final int config_help_intent_extra_key = 17039389; // 0x104001d

    field public static final int config_help_intent_name_key = 17039390; // 0x104001e

    field public static final int config_help_package_name_key = 17039387; // 0x104001b

    field public static final int config_help_package_name_value = 17039388; // 0x104001c

  }



  public static final class R.style {

    field public static final int Theme_Leanback_FormWizard = 16974544; // 0x10302d0

  }

core/res/res/values/config.xml

+6 −6
Original line number Diff line number Diff line
@@ -3363,22 +3363,22 @@ 
    <bool name="config_sendPackageName">false</bool>



    <!-- Name for the set of keys associating package names -->

    <string name="config_helpPackageNameKey" translatable="false"></string>

    <string name="config_help_package_name_key" translatable="false"></string>



    <!-- Name for the set of values of package names -->

    <string name="config_helpPackageNameValue" translatable="false"></string>

    <string name="config_help_package_name_value" translatable="false"></string>



    <!-- Intent key for the package name keys -->

    <string name="config_helpIntentExtraKey" translatable="false"></string>

    <string name="config_help_intent_extra_key" translatable="false"></string>



    <!-- Intent key for package name values -->

    <string name="config_helpIntentNameKey" translatable="false"></string>

    <string name="config_help_intent_name_key" translatable="false"></string>



    <!-- Intent key for the package name keys -->

    <string name="config_feedbackIntentExtraKey" translatable="false"></string>

    <string name="config_feedback_intent_extra_key" translatable="false"></string>



    <!-- Intent key for package name values -->

    <string name="config_feedbackIntentNameKey" translatable="false"></string>

    <string name="config_feedback_intent_name_key" translatable="false"></string>



    <!-- The apps that need to be hidden when they are disabled -->

    <string-array name="config_hideWhenDisabled_packageNames"></string-array>

core/res/res/values/public.xml

+17 −0
Original line number Diff line number Diff line
@@ -2918,6 +2918,23 @@ 
    </public-group>



    <public-group type="string" first-id="0x0104001b">

        <!-- @hide @SystemApi -->

        <public name="config_help_package_name_key" />

        <!-- @hide @SystemApi -->

        <public name="config_help_package_name_value" />

        <!-- @hide @SystemApi -->

        <public name="config_help_intent_extra_key" />

        <!-- @hide @SystemApi -->

        <public name="config_help_intent_name_key" />

        <!-- @hide @SystemApi -->

        <public name="config_feedback_intent_extra_key" />

        <!-- @hide @SystemApi -->

        <public name="config_feedback_intent_name_key" />

    </public-group>



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

        <!-- @hide @SystemApi -->

        <public name="config_sendPackageName" />

    </public-group>



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

core/res/res/values/symbols.xml

+6 −6
Original line number Diff line number Diff line
@@ -3253,12 +3253,12 @@ 
  <java-symbol type="integer" name="default_data_warning_level_mb" />

  <java-symbol type="bool" name="config_useVideoPauseWorkaround" />

  <java-symbol type="bool" name="config_sendPackageName" />

  <java-symbol type="string" name="config_helpPackageNameKey" />

  <java-symbol type="string" name="config_helpPackageNameValue" />

  <java-symbol type="string" name="config_helpIntentExtraKey" />

  <java-symbol type="string" name="config_helpIntentNameKey" />

  <java-symbol type="string" name="config_feedbackIntentExtraKey" />

  <java-symbol type="string" name="config_feedbackIntentNameKey" />

  <java-symbol type="string" name="config_help_package_name_key" />

  <java-symbol type="string" name="config_help_package_name_value" />

  <java-symbol type="string" name="config_help_intent_extra_key" />

  <java-symbol type="string" name="config_help_intent_name_key" />

  <java-symbol type="string" name="config_feedback_intent_extra_key" />

  <java-symbol type="string" name="config_feedback_intent_name_key" />



  <java-symbol type="array" name="config_hideWhenDisabled_packageNames" />

packages/SettingsLib/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ android_library { 
        "androidx.lifecycle_lifecycle-runtime",

    ],



    static_libs: [

        "SettingsLibHelpUtils",

    ],



    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES

    // LOCAL_SHARED_JAVA_LIBRARIES := androidx.lifecycle_lifecycle-common