diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-12-11 14:14:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-11 14:14:54 -0800 |
| commit | eaae7d976a5629e064af06f0e2c10f97f1a8c462 (patch) | |
| tree | cfd2159215f2f7caad10bb7c281c7339c136a58c /core | |
| parent | 5def50da0de624abeafafe71dc72b4baf423b985 (diff) | |
| parent | 84e2756c0f3794c6efe5568a9d09101ba689fb39 (diff) | |
| download | frameworks_base-eaae7d976a5629e064af06f0e2c10f97f1a8c462.zip frameworks_base-eaae7d976a5629e064af06f0e2c10f97f1a8c462.tar.gz frameworks_base-eaae7d976a5629e064af06f0e2c10f97f1a8c462.tar.bz2 | |
Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index dc089bd..4dbc4b4 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4296,6 +4296,13 @@ public final class Settings { public static final String POWER_SOUNDS_ENABLED = "power_sounds_enabled"; /** + * URI for the "wireless charging started" sound. + * @hide + */ + public static final String WIRELESS_CHARGING_STARTED_SOUND = + "wireless_charging_started_sound"; + + /** * Whether we keep the device on while the device is plugged in. * Supported values are: * <ul> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 77b91af..0f9d57e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1818,5 +1818,4 @@ <!-- From PinyinIME(!!!) --> <java-symbol type="string" name="inputMethod" /> - </resources> |