summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider/Settings.java
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-04-09 15:15:43 -0700
committerJay Shrauner <shrauner@google.com>2015-04-15 14:42:24 -0700
commit1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4 (patch)
tree778c8c7388aaa2d147bc547b5a06ba817a16dc0e /core/java/android/provider/Settings.java
parent383932ad8ee756d01f0a12aeca7adaf4b3e542fa (diff)
downloadframeworks_base-1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4.zip
frameworks_base-1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4.tar.gz
frameworks_base-1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4.tar.bz2
DO NOT MERGE Make Telecom/InCallUI APIs public
Bug:20260870 Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
Diffstat (limited to 'core/java/android/provider/Settings.java')
-rw-r--r--core/java/android/provider/Settings.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 73ce9dc..7819c73 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2395,8 +2395,6 @@ public final class Settings {
* It was about AudioManager's setting and thus affected all the applications which
* relied on the setting, while this is purely about the vibration setting for incoming
* calls.
- *
- * @hide
*/
public static final String VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
@@ -2411,7 +2409,6 @@ public final class Settings {
* DTMF tone type played by the dialer when dialing.
* 0 = Normal
* 1 = Long
- * @hide
*/
public static final String DTMF_TONE_TYPE_WHEN_DIALING = "dtmf_tone_type";
@@ -6422,7 +6419,6 @@ public final class Settings {
/**
* Setting to 1 will hide carrier network settings.
* Default is 0.
- * @hide
*/
public static final String HIDE_CARRIER_NETWORK_SETTINGS =
"hide_carrier_network_settings";