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

Commit d33451c8 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge changes from topic \'api_review\' into nyc-dev am: a0676c92 am: a6c9a892 

am: d9c4c765

* commit 'd9c4c765':
  Api review: Settings.
  Reduce spacing.

Change-Id: I781cda64e8ecfd64ba236f8b8401f2f20a7df5d1
parents 6b6f2b9d d9c4c765

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -32556,7 +32556,6 @@ package android.provider { 
    field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";

    field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";

    field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";

    field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";

    field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility";

    field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -35279,7 +35279,6 @@ package android.provider { 
    field public static final deprecated java.lang.String DEVICE_PROVISIONED = "device_provisioned";

    field public static final java.lang.String ENABLED_ACCESSIBILITY_SERVICES = "enabled_accessibility_services";

    field public static final java.lang.String ENABLED_INPUT_METHODS = "enabled_input_methods";

    field public static final java.lang.String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES = "enabled_notification_policy_access_packages";

    field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";

    field public static final java.lang.String INPUT_METHOD_SELECTOR_VISIBILITY = "input_method_selector_visibility";

    field public static final java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";

core/java/android/provider/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -5867,7 +5867,10 @@ public final class Settings { 
        /**

         * Names of the packages that the current user has explicitly allowed to

         * manage notification policy configuration, separated by ':'.

         *

         * @hide

         */

        @TestApi

        public static final String ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES =

                "enabled_notification_policy_access_packages";

packages/SystemUI/res/layout/notification_guts.xml

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
        <RadioButton

                android:id="@+id/silent_importance"

                android:layout_width="wrap_content"

                android:layout_height="48dp"

                android:layout_height="40dp"

                android:paddingStart="32dp"

                android:text="@string/show_silently"

                style="@style/TextAppearance.NotificationGuts.Radio"
@@ -77,7 +77,7 @@ 
        <RadioButton

                android:id="@+id/block_importance"

                android:layout_width="wrap_content"

                android:layout_height="48dp"

                android:layout_height="40dp"

                android:paddingStart="32dp"

                android:text="@string/block"

                style="@style/TextAppearance.NotificationGuts.Radio"
@@ -85,7 +85,7 @@ 
        <RadioButton

                android:id="@+id/reset_importance"

                android:layout_width="wrap_content"

                android:layout_height="48dp"

                android:layout_height="40dp"

                android:paddingStart="32dp"

                style="@style/TextAppearance.NotificationGuts.Radio"

                android:buttonTint="@color/notification_guts_buttons" />