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

Commit 1008aa55 authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add config for default holders of call redirection and call screening."

parents c673e6fc 21163f4e
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -261,6 +261,8 @@ package android {
  public static final class R.string {
    field public static final int config_defaultAssistant = 17039393; // 0x1040021
    field public static final int config_defaultBrowser = 17039394; // 0x1040022
    field public static final int config_defaultCallRedirection = 17039400; // 0x1040028
    field public static final int config_defaultCallScreening = 17039401; // 0x1040029
    field public static final int config_defaultDialer = 17039395; // 0x1040023
    field public static final int config_defaultSms = 17039396; // 0x1040024
    field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f
+4 −0
Original line number Diff line number Diff line
@@ -1865,6 +1865,10 @@
    <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 call redirection role by default. -->
    <string name="config_defaultCallRedirection" translatable="false"></string>
    <!-- The name of the package that will hold the call screening role by default. -->
    <string name="config_defaultCallScreening" translatable="false"></string>

    <!-- Enable/disable default bluetooth profiles:
        HSP_AG, ObexObjectPush, Audio, NAP -->
+4 −0
Original line number Diff line number Diff line
@@ -3022,6 +3022,10 @@
      <public name="notification_channel_network_alerts" />
      <!-- @hide @SystemApi -->
      <public name="notification_channel_network_available" />
      <!-- @hide @SystemApi -->
      <public name="config_defaultCallRedirection" />
      <!-- @hide @SystemApi -->
      <public name="config_defaultCallScreening" />
    </public-group>

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