Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic \'api_review\' into nyc-dev am: a0676c9 am: a6c9a89

Browse Source 
am: d9c4c76

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

Change-Id: I781cda64e8ecfd64ba236f8b8401f2f20a7df5d1
This commit is contained in:
Julia Reynolds
2016-04-26 16:16:09 +00:00
committed by android-build-merger
parent 6b6f2b9de0 d9c4c7650f
commit d33451c837
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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";

1
api/system-current.txt
View File

@@ -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";

3
core/java/android/provider/Settings.java
View File

@@ -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";

6
packages/SystemUI/res/layout/notification_guts.xml
View File

@@ -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" />