Roozbeh Pournader
a7cb91821a
Merge "Make strings for data usage easier to localize"
2016-06-14 00:38:58 +00:00
Doris Ling
827acb4987
Merge \\"Added new setting for gestures.\\" into nyc-mr1-dev am: 8b8a012913
...
am: 71e6b9a4d9
2016-06-13 23:17:22 +00:00
Daniel Nishi
36d06f6710
Merge \\"Use Settings.Secure for days to retain.\\" into nyc-mr1-dev am: 584320adb8
...
am: 08ba377569
2016-06-13 22:48:56 +00:00
Roozbeh Pournader
0761a4bf06
Make strings for data usage easier to localize
...
The strings were complex to localize, especially since they used
formatting that needed to be carefully reconstructed for cases where
the amount of data appears in the middle of a string. Also, we
already had a localization for file sizes, which we should avoid
redoing, to minimize discrepancies.
Finally, we are now bidi wrapping the usage amount, as it may break
in the RTL locales otherwise, since the RTL locales may be using
Latin abbreviations for gigabyte etc that are LTR.
Since formatting needs to be applied to everything except the number
of units in the amount of data used, and markup should be avoided
since it will confuse bidi wrapping, the code carefully constructs
CharSequence templates that are then decorated with spans after
getting filled in.
Bug: 28747101
Change-Id: I18756b4de99eb551a51fe5e74d1c9cf505551f08
2016-06-13 15:34:00 -07:00
Doris Ling
71e6b9a4d9
Merge \"Added new setting for gestures.\" into nyc-mr1-dev
...
am: 8b8a012913
2016-06-13 22:29:14 +00:00
Daniel Nishi
08ba377569
Merge \"Use Settings.Secure for days to retain.\" into nyc-mr1-dev
...
am: 584320adb8
2016-06-13 22:28:38 +00:00
TreeHugger Robot
8b8a012913
Merge "Added new setting for gestures." into nyc-mr1-dev
2016-06-13 22:01:45 +00:00
Daniel Nishi
584320adb8
Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev
2016-06-13 21:18:29 +00:00
Robert Greenwalt
1bd411f64a
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp am: 89b8babe6a
...
am: 69118dc9b1
2016-06-13 20:14:29 +00:00
Doris Ling
9136523a43
Added new setting for gestures.
...
Added a new entry to the top level Settings' Device section to
enable/disable gestures.
Bug: 28565958
Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
2016-06-13 13:13:21 -07:00
宋凯伦
69118dc9b1
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
...
am: 89b8babe6a
2016-06-13 20:10:42 +00:00
Robert Greenwalt
89b8babe6a
resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp
...
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
2016-06-13 13:01:36 -07:00
Robert Greenwalt
03393c4109
Merge "Fix the memory leak in TetherSettings"
2016-06-13 18:35:32 +00:00
Daniel Nishi
776c9eca39
Use Settings.Secure for days to retain.
...
Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.
Bug: 28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e
2016-06-13 10:47:23 -07:00
Jason Monk
f01d1d5dcb
Make linkify handle emptys urls better DO NOT MERGE
...
Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes: 29045818
2016-06-13 13:08:32 -04:00
Julia Reynolds
cdd1a26465
Prevent users from blocking system notifications.
...
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes: 29191134
2016-06-13 12:49:45 -04:00
Robin Lee
a649206c19
Merge \\\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\\" into nyc-dev am: cab4f9dc39 am: c7f0f2338a
...
am: b5b2fd5204
2016-06-13 16:23:01 +00:00
Robin Lee
b5b2fd5204
Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am: cab4f9dc39
...
am: c7f0f2338a
2016-06-13 16:19:10 +00:00
Robin Lee
442498681d
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
...
am: cab4f9dc39
2016-06-13 16:15:20 +00:00
Robin Lee
c7f0f2338a
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
...
am: cab4f9dc39
2016-06-13 16:15:19 +00:00
Robin Lee
cab4f9dc39
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
2016-06-13 16:03:54 +00:00
Robin Lee
49be1c1b06
Respect DISALLOW_CONFIG_VPN for disconnect dialog
...
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix: 29265163
2016-06-13 15:08:32 +00:00
Nicolas Prevot
7f8c6354ac
Merge \\\"Fix rendering of policy transparency activity.\\\" into nyc-dev am: 98704bc495 am: 341b21d2f8
...
am: 21693422b4
2016-06-13 12:58:28 +00:00
Nicolas Prévot
21693422b4
Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am: 98704bc495
...
am: 341b21d2f8
2016-06-13 12:54:36 +00:00
Nicolas Prevot
341b21d2f8
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
...
am: 98704bc495
2016-06-13 12:50:16 +00:00
Nicolas Prevot
1ba2cbbfc2
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
...
am: 98704bc495
2016-06-13 12:50:11 +00:00
Nicolas Prévot
98704bc495
Merge "Fix rendering of policy transparency activity." into nyc-dev
2016-06-13 12:37:05 +00:00
Ruchi Kandoi
5c1a19c573
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp am: f8c135a986
...
am: 2fda09ad85
2016-06-11 05:22:06 +00:00
Mark Salyzyn
2fda09ad85
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
am: f8c135a986
2016-06-11 05:18:20 +00:00
Ruchi Kandoi
f8c135a986
resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp
...
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
2016-06-10 22:04:52 -07:00
Anna Galusza
db0dbef52b
Remove "Help & feedback" from toggle screen for accessibility services to
...
prevent confusion when users are trying to submit feedback for a specific
accessibility service (accessibility services can place their own "Help &
feedabck" in their apks and route it appropriately).
Bug: 29278252
Change-Id: Ie6f0d92a9ded82eaf3a0ac1122861f26639bc58a
2016-06-10 23:40:11 +00:00
Mark Salyzyn
03af2286ee
Settings: add logpersist selection (actions)
...
- Only add logpersist menu if debuggable.
- Only enable logpersist menu if Logging is On.
- Add selection for Off, All and All minus radio.
- Pop up warning box that persistent storage is to be cleared when
selecting Off (but not if turned off by Logging Size Off or
Disabling Debugger Options).
Bug: 28936216
Change-Id: Ic0a58abdcd6ca41069efb818d1dcef4e3927d2de
2016-06-10 21:44:32 +00:00
Meng Wang
95dd0323a6
Merge \\"Wi-Fi Calling settings UI update\\" into nyc-mr1-dev am: 7648de1ec6
...
am: 9b345526b7
2016-06-10 16:44:28 +00:00
Meng Wang
9b345526b7
Merge \"Wi-Fi Calling settings UI update\" into nyc-mr1-dev
...
am: 7648de1ec6
2016-06-10 16:42:25 +00:00
Meng Wang
7648de1ec6
Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev
2016-06-10 16:36:46 +00:00
Jason Monk
2f40b22d41
Merge \\\"Fix crash in finish from onCreate.\\\" into nyc-dev am: 1a1f6b0b1b am: 0fa8dc1b55
...
am: 4d86173586
2016-06-10 15:17:20 +00:00
Jason Monk
4d86173586
Merge \\"Fix crash in finish from onCreate.\\" into nyc-dev am: 1a1f6b0b1b
...
am: 0fa8dc1b55
2016-06-10 15:14:09 +00:00
Jason Monk
3078e76284
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
...
am: 1a1f6b0b1b
2016-06-10 15:11:24 +00:00
Jason Monk
0fa8dc1b55
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
...
am: 1a1f6b0b1b
2016-06-10 15:11:24 +00:00
TreeHugger Robot
1a1f6b0b1b
Merge "Fix crash in finish from onCreate." into nyc-dev
2016-06-10 15:06:34 +00:00
Jason Monk
656bc6004f
Fix crash in finish from onCreate.
...
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes: 29245324
2016-06-10 09:49:12 -04:00
Yohei Yukawa
a34a2b955b
Merge \\\"Fix sentence capitalization of locale names.\\\" into nyc-dev am: 294b1586ed am: 2d1d002eea
...
am: effed5adc0
2016-06-10 00:28:26 +00:00
Yohei Yukawa
effed5adc0
Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am: 294b1586ed
...
am: 2d1d002eea
2016-06-10 00:02:38 +00:00
Yohei Yukawa
74358619a0
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
...
am: 294b1586ed
2016-06-09 23:57:58 +00:00
Yohei Yukawa
2d1d002eea
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
...
am: 294b1586ed
2016-06-09 23:57:58 +00:00
Yohei Yukawa
294b1586ed
Merge "Fix sentence capitalization of locale names." into nyc-dev
2016-06-09 23:47:31 +00:00
Roozbeh Pournader
ab69ab599e
Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am: 5eddc4bde9
...
am: 0e3b675446
2016-06-09 23:09:30 +00:00
Roozbeh Pournader
0e3b675446
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
...
am: 5eddc4bde9
2016-06-09 23:07:09 +00:00
Roozbeh Pournader
241f8e6e9c
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
...
am: 5eddc4bde9
2016-06-09 23:06:55 +00:00
Svet Ganov
9de3e13f50
Merge \\\"Don\\\'t send user to permissions screen if none requested\\\" into nyc-dev am: 3e5318496e am: 650cc723d1
...
am: 1fb5f435cf
2016-06-09 23:05:21 +00:00
