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 Prévot
98704bc495
Merge "Fix rendering of policy transparency activity." into nyc-dev
2016-06-13 12:37:05 +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
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
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
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
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
Roozbeh Pournader
5eddc4bde9
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
2016-06-09 23:04:22 +00:00
Svetoslav Ganov
1fb5f435cf
Merge \\"Don\\'t send user to permissions screen if none requested\\" into nyc-dev am: 3e5318496e
...
am: 650cc723d1
2016-06-09 22:58:26 +00:00
Svet Ganov
650cc723d1
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
...
am: 3e5318496e
2016-06-09 22:53:40 +00:00
Svet Ganov
0984141943
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
...
am: 3e5318496e
2016-06-09 22:53:07 +00:00
Svetoslav Ganov
3e5318496e
Merge "Don't send user to permissions screen if none requested" into nyc-dev
2016-06-09 22:45:49 +00:00
Yohei Yukawa
91c23ca03f
Fix sentence capitalization of locale names.
...
It turns out that out previous CL [1] is not sufficient to address all
the requests regarding capitalization.
With [1], now InputMethodSubtype#getLocaleDisplayName() returns a locale
name whose capitalization is basically optimized to be used as a list
item. It works well for list UI, but on a UI element that looks like a
sentence text, we still need to capitalize the first character.
This CL takes care of those UI elements in the Settings app. This CL
also addresses a remaining TODO about locale-unaware text formatting by
using about android.icu.text.ListFormatter.
[1]: If105082ce703db7a86738455db7e9fb37f3c6fe8
e489baf96df2837a3a63b626d9023a4a8b322c28
Bug: 29035638
Change-Id: I59f93f0bc067cdd87c6065c972a7da3cde1128f9
2016-06-09 15:01:52 -07:00
Roozbeh Pournader
3697dbeaa3
Use existing localizations for formatting data usage [DO NOT MERGE]
...
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.
Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.
Bug: 28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
2016-06-09 13:25:56 -07:00
Nicolas Prevot
637d24c8b9
Fix rendering of policy transparency activity.
...
Use the dialog's context instead of the activity
context to inflate the view.
BUG:29172155
Change-Id: I0fb32e3d4bfc522a4c8b6d7a6ed55acd01f97446
2016-06-09 20:59:20 +01:00
Svet Ganov
30ee6ab320
Don't send user to permissions screen if none requested
...
bug:29105157
Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
2016-06-09 12:28:10 -07:00
Android Build Merger (Role)
a8272ec495
Merge "Merge \"Moved network settings reset away from Backup & reset.\" into nyc-mr1-dev am: ab595b8a98" into nyc-mr1-dev-plus-aosp
2016-06-08 21:39:55 +00:00
Doris Ling
be2847ec3b
Merge \"Moved network settings reset away from Backup & reset.\" into nyc-mr1-dev
...
am: ab595b8a98
2016-06-08 21:39:46 +00:00
Jason Monk
531f23a7c5
Fix build
...
am: feee247e0c
2016-06-08 21:39:45 +00:00
Doris Ling
ab595b8a98
Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev
2016-06-08 21:35:20 +00:00
Jason Monk
feee247e0c
Fix build
...
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit e3ce6713d3
2016-06-08 21:29:48 +00:00
Jason Monk
aaaa236cec
resolve merge conflicts of 7f7092c to nyc-mr1-dev
...
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
2016-06-08 16:19:35 -04:00
Jason Monk
84f544a2ae
resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp
...
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
2016-06-08 15:28:48 -04:00
Jason Monk
9667149282
Merge \\"Fix data usage format strings\\" into nyc-dev am: cb1972b908
...
am: 2c7e1d844f
2016-06-08 19:26:48 +00:00
Jason Monk
743ceecbe8
Merge \\"Fix disabling of tiles that are not relevant\\" into nyc-dev am: 9c5d3164f5
...
am: 4db5484a9d
2016-06-08 19:26:17 +00:00
Jason Monk
167f6cc87c
Merge \"Remove PreferenceActivity\" into nyc-dev
...
am: 7f7092c705
2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f
Merge \"Fix data usage format strings\" into nyc-dev
...
am: cb1972b908
2016-06-08 19:15:42 +00:00
Jason Monk
4db5484a9d
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
...
am: 9c5d3164f5
2016-06-08 19:15:41 +00:00
Jason Monk
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
Jason Monk
cb1972b908
Merge "Fix data usage format strings" into nyc-dev
2016-06-08 19:11:51 +00:00
Jason Monk
9c5d3164f5
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
2016-06-08 19:10:09 +00:00
Doris Ling
e6f635ff82
Moved network settings reset away from Backup & reset.
...
Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.
Bug: 28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
2016-06-08 11:49:47 -07:00
Felipe Leme
05d8b9da4d
Merge \"Display total storage for Internal shared storage.\" into nyc-mr1-dev
...
am: d4e31320c1
2016-06-08 16:17:18 +00:00
TreeHugger Robot
d4e31320c1
Merge "Display total storage for Internal shared storage." into nyc-mr1-dev
2016-06-08 16:08:11 +00:00
Ricky Wai
acb66824a6
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am: 68c263cf2e
...
am: 263b210c16
2016-06-08 14:54:14 +00:00
Felipe Leme
ff162a3c23
Display total storage for Internal shared storage.
...
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".
This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.
BUG: 24128505
Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1
** Cherrypicked from master - DO NOT MERGE **
2016-06-08 14:49:32 +00:00
Ricky Wai
5f0e81222a
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:49:06 +00:00
