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

Commit 95ac0d49 authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

Merge "Remove config entries for music and gallery role." into qt-dev 

am: e9446c3e

Change-Id: I30ee7f16591f4af5eb9f7d1facef1c7f38c57a2a
parents f98b2b0e e9446c3e

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -254,8 +254,6 @@ package android { 
    field public static final int config_defaultAssistant = 17039393; // 0x1040021

    field public static final int config_defaultBrowser = 17039394; // 0x1040022

    field public static final int config_defaultDialer = 17039395; // 0x1040023

    field public static final int config_defaultGallery = 17039398; // 0x1040026

    field public static final int config_defaultMusic = 17039397; // 0x1040025

    field public static final int config_defaultSms = 17039396; // 0x1040024

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

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

core/res/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -1971,10 +1971,6 @@ 
    <bool name="config_showDefaultEmergency">false</bool>

    <!-- Whether the default home settings should be shown. -->

    <bool name="config_showDefaultHome">true</bool>

    <!-- The name of the package that will hold the music role by default. -->

    <string name="config_defaultMusic" translatable="false">com.android.music</string>

    <!-- The name of the package that will hold the gallery role by default. -->

    <string name="config_defaultGallery" translatable="false">com.android.gallery3d</string>



    <!-- Enable/disable default bluetooth profiles:

        HSP_AG, ObexObjectPush, Audio, NAP -->

core/res/res/values/public.xml

+0 −4
Original line number Diff line number Diff line
@@ -2987,10 +2987,6 @@ 
      <public name="config_defaultDialer" />

      <!-- @hide @SystemApi -->

      <public name="config_defaultSms" />

      <!-- @hide @SystemApi -->

      <public name="config_defaultMusic" />

      <!-- @hide @SystemApi -->

      <public name="config_defaultGallery" />

    </public-group>



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