diff options
| author | Jerome Poichet <jpoichet@google.com> | 2014-09-11 10:38:12 -0700 |
|---|---|---|
| committer | Jerome Poichet <jpoichet@google.com> | 2014-09-11 11:59:45 -0700 |
| commit | 550021ec5a2c8d741506c3fe5d1ee85139bc794a (patch) | |
| tree | c9aeedce1ffcd25f76f2b4a91acc9570842c08e6 /packages/SettingsProvider/res/values | |
| parent | e5fe4bc96d096d800d9da48d0a3ff68ee1f94000 (diff) | |
| download | frameworks_base-550021ec5a2c8d741506c3fe5d1ee85139bc794a.zip frameworks_base-550021ec5a2c8d741506c3fe5d1ee85139bc794a.tar.gz frameworks_base-550021ec5a2c8d741506c3fe5d1ee85139bc794a.tar.bz2 | |
Update default device name to MODEL only
b/17428259 | Change device name to default to model name
Change-Id: If9f0a30f2362574d32fc69c0880c01ec7a3edb9f
Diffstat (limited to 'packages/SettingsProvider/res/values')
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index a3bed4f..625dc96 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -193,8 +193,11 @@ <!-- Default for Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED, 1==on --> <integer name="def_heads_up_enabled">1</integer> - <!-- Default for Settings.Global.DEVICE_NAME $1=BRAND $2=MODEL--> - <string name="def_device_name">%1$s %2$s</string> + <!-- Default for Settings.Global.DEVICE_NAME $1=MODEL--> + <string name="def_device_name">%1$s</string> + + <!-- Default for Settings.Global.DEVICE_NAME $1=MANUFACTURER $2=MODEL--> + <string name="def_device_name_old">%1$s %2$s</string> <!-- Default for Settings.Secure.WAKE_GESTURE_ENABLED --> <bool name="def_wake_gesture_enabled">true</bool> |