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
294b1586ed
Merge "Fix sentence capitalization of locale names." into nyc-dev
2016-06-09 23:47:31 +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
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
Mark Salyzyn
1f9e0cce2b
Merge \\"Settings: add logpersist selection (strings)\\" am: 99afd4a87d
...
am: 540ebc39ac
2016-06-09 20:18:14 +00:00
Mark Salyzyn
540ebc39ac
Merge \"Settings: add logpersist selection (strings)\"
...
am: 99afd4a87d
2016-06-09 19:46:46 +00:00
Mark Salyzyn
99afd4a87d
Merge "Settings: add logpersist selection (strings)"
2016-06-09 19:38:32 +00:00
Mark Salyzyn
954ed57091
Settings: add logpersist selection (strings)
...
Strings for selecting between Off, All and All minus radio to
store logs persistently on the local eMMC device. Strings for
warning button when erasing logpersist data.
Bug: 28936216
Change-Id: I3aaa59a6ebbe1a695490b4a72cad2c807c048985
2016-06-09 19:37:34 +00: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
Bill Yi
9190e13af2
Import translations. DO NOT MERGE
...
am: b43b49c643
2016-06-09 14:00:04 +00:00
Bill Yi
b43b49c643
Import translations. DO NOT MERGE
...
Change-Id: I7b3039eadee367f4839682567022826320d208e0
Auto-generated-cl: translation import
2016-06-08 22:38:29 -07:00
Jason Monk
feee247e0c
Fix build
...
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit e3ce6713d3
2016-06-08 21:29:48 +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
Ricky Wai
263b210c16
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:47:43 +00:00
Ricky Wai
68c263cf2e
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
2016-06-08 14:34:02 +00:00
Jason Monk
b7e4380cd2
Remove PreferenceActivity
...
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Baligh Uddin
edb4c9c153
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 09cedc44b4
2016-06-08 13:36:05 +00:00
Ricky Wai
7250016447
Make work challenge settings work even work profile is not enabled yet
...
Bug: 29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
2016-06-08 13:33:57 +00:00
Baligh Uddin
09cedc44b4
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:09:21 +00:00
Baligh Uddin
013581c95e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c
2016-06-07 21:21:26 -07:00
Jim Miller
6233c1d0bc
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:35 +00:00
TreeHugger Robot
f8c64089b1
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38
Move legacy full disk encryption code to Settings.
...
Fixes bug 27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02
Fix disabling of tiles that are not relevant
...
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
Bill Yi
f12e2ee361
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 48229d7781
2016-06-07 03:31:23 +00:00
TreeHugger Robot
48229d7781
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-07 03:23:12 +00:00
Bill Yi
d4bd56b2a7
Import translations. DO NOT MERGE
...
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
2016-06-06 18:48:05 -07:00
Robin Lee
cff703e68a
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
2016-06-06 21:09:29 +00:00
Robin Lee
8f2c17e12c
Merge "Restrict Settings always-on to NYC+" into nyc-dev
2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c
Fix data usage format strings
...
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1
Restrict Settings always-on to NYC+
...
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Bill Yi
e2b9a2bd87
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: edafefc1ed
2016-06-03 21:08:44 +00:00
Jason Monk
2cd2074f7f
Merge "Fix accidental non-translatable string" into nyc-dev
...
am: 8c5dccc6bf
2016-06-03 21:06:10 +00:00
TreeHugger Robot
edafefc1ed
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 19:22:57 +00:00
Jason Monk
8c5dccc6bf
Merge "Fix accidental non-translatable string" into nyc-dev
2016-06-03 19:12:09 +00:00
Jason Monk
18b603f84f
Fix accidental non-translatable string
...
Bug: 29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
2016-06-03 15:06:56 -04:00
Sanket Agarwal
083ba3cc2a
Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92
...
am: e1fa67c165
2016-06-03 18:01:45 +00:00
Sanket Agarwal
e1fa67c165
Merge "Handle return value when Bluetooth is enabled"
...
am: cc889f6b92
2016-06-03 17:51:28 +00:00
Treehugger Robot
cc889f6b92
Merge "Handle return value when Bluetooth is enabled"
2016-06-03 17:42:38 +00:00
Sudheer Shanka
7469d799a8
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
...
am: a433fd2429
2016-06-03 17:13:09 +00:00
Bill Yi
73642fd30c
Import translations. DO NOT MERGE
...
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
2016-06-03 10:09:43 -07:00
