Commit Graph

30282 Commits

Author SHA1 Message Date
Yohei Yukawa
a34a2b955b Merge \\\"Fix sentence capitalization of locale names.\\\" into nyc-dev am: 294b1586ed am: 2d1d002eea
am: effed5adc0

Change-Id: I712cd50fe4e47120477edaa85696a1fa4cce9627
2016-06-10 00:28:26 +00:00
Yohei Yukawa
e82ff5251e Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am: 294b1586ed
am: 74358619a0

Change-Id: I72b0e49afcbac5aa44609df9b25318aacc89bdc5
2016-06-10 00:02:58 +00:00
Yohei Yukawa
effed5adc0 Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am: 294b1586ed
am: 2d1d002eea

Change-Id: Ia25f22558a97a3ba961b877403ce931fc13e6db0
2016-06-10 00:02:38 +00:00
Yohei Yukawa
74358619a0 Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am: 294b1586ed

Change-Id: Id61473c100565d9d795bf314ccff6723bdd0c64c
2016-06-09 23:57:58 +00:00
Yohei Yukawa
2d1d002eea Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am: 294b1586ed

Change-Id: I66b2876c923eed55804e14edc9f73ad619157336
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
55e6e16e48 Merge \"Merge \\\"Use existing localizations for formatting data usage [DO NOT MERGE]\\\" into nyc-dev am: 5eddc4bde9 am: 241f8e6e9c\" into nyc-mr1-dev-plus-aosp
am: c553faaa00  -s ours

Change-Id: I039044e7feb83b709e8d5f6a75302ed640500d70
2016-06-09 23:15:46 +00:00
Roozbeh Pournader
833444d7d2 Merge \\\"Use existing localizations for formatting data usage [DO NOT MERGE]\\\" into nyc-dev am: 5eddc4bde9 am: 0e3b675446
am: ab69ab599e  -s ours

Change-Id: Ib9c13f24cec05c839ec1e3ed646881f5769f21bb
2016-06-09 23:15:45 +00:00
Android Build Merger (Role)
c553faaa00 Merge "Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am: 5eddc4bde9 am: 241f8e6e9c" into nyc-mr1-dev-plus-aosp 2016-06-09 23:09:52 +00:00
Roozbeh Pournader
4ee474a0b4 Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am: 5eddc4bde9
am: 241f8e6e9c

Change-Id: Ide8afd402be0454b080ea91766f95c6ecf4c7570
2016-06-09 23:09:45 +00:00
Roozbeh Pournader
ab69ab599e Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am: 5eddc4bde9
am: 0e3b675446

Change-Id: I4058ac8826ca1ce6c903d862e3246b86e6071113
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

Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7
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

Change-Id: If18910dba402d98ffc115af8c87b836fca50ec0f
2016-06-09 23:06:55 +00:00
Svet Ganov
3ef56bd3f9 Merge \\\"Don\\\'t send user to permissions screen if none requested\\\" into nyc-dev am: 3e5318496e am: 0984141943
am: f977f45ac0

Change-Id: I8268edc56031be3c04df10965d121ad6b79afede
2016-06-09 23:05:21 +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

Change-Id: I53ff5a78a82154b75650e1b00bd389facfb5ca52
2016-06-09 23:05:21 +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
f977f45ac0 Merge \\"Don\\'t send user to permissions screen if none requested\\" into nyc-dev am: 3e5318496e
am: 0984141943

Change-Id: Iaf17b055c1efdd18eaf44f6dbee188aa8eecfe89
2016-06-09 23:02:04 +00:00
Svetoslav Ganov
1fb5f435cf Merge \\"Don\\'t send user to permissions screen if none requested\\" into nyc-dev am: 3e5318496e
am: 650cc723d1

Change-Id: I7c2309f8ccc006cf0b37e5dce6bb75bef927b747
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

Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d
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

Change-Id: I6060ae5a113025b0cfbbd8ff1f58599cb8f4cf7e
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
Richard Ho
815ea04a08 Merge "added layout_width and layout_height" 2016-06-09 21:35:52 +00:00
Richard Ho
1190c03acf added layout_width and layout_height
Bug:29105203
Change-Id: I3cd6fb1ad7ce2daa1fd160e50e7a4b198e4e2ec1
2016-06-09 13:44:15 -07:00
Mark Salyzyn
7c6b5aff8f Merge \\\\"Settings: add logpersist selection (strings)\\\\" am: 99afd4a87d am: 540ebc39ac -s ours am: 1f9e0cce2b
am: 7bc9c6d7c4

Change-Id: Icf3b5645961c5902532428d9c98c7eca8b03660e
2016-06-09 20:29:18 +00: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
7bc9c6d7c4 Merge \\\"Settings: add logpersist selection (strings)\\\" am: 99afd4a87d am: 540ebc39ac -s ours
am: 1f9e0cce2b

Change-Id: I146e9e96a7c076528cf7d1da419ff79e2cba9ef6
2016-06-09 20:23:05 +00:00
Mark Salyzyn
1f9e0cce2b Merge \\"Settings: add logpersist selection (strings)\\" am: 99afd4a87d
am: 540ebc39ac  -s ours

Change-Id: I00cbd8cbbb926afccd664239c6064747c96c0142
2016-06-09 20:18:14 +00: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
Mark Salyzyn
540ebc39ac Merge \"Settings: add logpersist selection (strings)\"
am: 99afd4a87d

Change-Id: I45d09fc05d11ce1dac413896706b4a7e4e11a8ba
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
TreeHugger Robot
b75865d9dd Merge "Removed unused string (high_power_count)." 2016-06-09 17:20:43 +00:00
Bill Yi
a370e47e6a Import translations. DO NOT MERGE am: b43b49c643 -s ours am: 483ca13e0b -s ours
am: a58c30a2f3  -s ours

Change-Id: I71f3d5f220c98723f2b3e54c14c32cc04ee7e22e
2016-06-09 14:13:13 +00:00
Bill Yi
5b106cfe5a Import translations. DO NOT MERGE am: de2559e136 -s ours
am: 729c87e874  -s ours

Change-Id: If14372850bfdef1ba08f7991376e496d3546f0b4
2016-06-09 14:13:12 +00:00
Bill Yi
a58c30a2f3 Import translations. DO NOT MERGE am: b43b49c643 -s ours
am: 483ca13e0b  -s ours

Change-Id: I37ab0d635c2d40d7ed0cb488d5365030d3ff5a26
2016-06-09 14:12:01 +00:00
Bill Yi
729c87e874 Import translations. DO NOT MERGE
am: de2559e136  -s ours

Change-Id: I192c5d7d64d9a3941489b230fd4ea7bb2cc46a9f
2016-06-09 14:11:57 +00:00
Bill Yi
dcfe91f153 Import translations. DO NOT MERGE am: b43b49c643 -s ours am: 9190e13af2 -s ours
am: 6537a961dd  -s ours

Change-Id: I18ba1b1d6dc7fe09dbb72136f63880245ac04e93
2016-06-09 14:10:00 +00:00
Bill Yi
6537a961dd Import translations. DO NOT MERGE am: b43b49c643 -s ours
am: 9190e13af2  -s ours

Change-Id: Ie62ae11869123b06d62021565fc75ad0613d31b3
2016-06-09 14:03:33 +00:00
Bill Yi
483ca13e0b Import translations. DO NOT MERGE
am: b43b49c643  -s ours

Change-Id: Ia865b8f152d756c2180b15a2a9de0a667817ab62
2016-06-09 14:00:04 +00:00
Bill Yi
9190e13af2 Import translations. DO NOT MERGE
am: b43b49c643  -s ours

Change-Id: Ibb7f8a46f201ab267cbb1833608d10b4512babf2
2016-06-09 14:00:04 +00:00
Bill Yi
de2559e136 Import translations. DO NOT MERGE
Change-Id: I80bce4c08874414f732d26ada50825c7b8140322
Auto-generated-cl: translation import
2016-06-08 22:54:47 -07: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
Bill Yi
587fe4a835 Import translations. DO NOT MERGE
Change-Id: Ic12423aded2572a399f473d40196f9d1883693ab
Auto-generated-cl: translation import
2016-06-08 21:53:51 -07:00
Felipe Leme
a889cf761c Removed unused string (high_power_count).
Change-Id: I3ababf4fd0c7f4ae9c9a64a3cf05d5a9db291cba
Fixes: 29220742
2016-06-08 16:50:51 -07:00
Doris Ling
49f9e9828d Merge \"Merge \\"Moved network settings reset away from Backup & reset.\\" into nyc-mr1-dev am: ab595b8a98\" into nyc-mr1-dev-plus-aosp
am: a8272ec495

Change-Id: I338d909e0fc8c48265b0d0ff60a72e803363ff81
2016-06-08 21:42:37 +00:00
Jason Monk
eabc5d297c Fix build am: feee247e0c
am: 531f23a7c5

Change-Id: Id67f33bea6580fbd178f402224c2080e478e6c4b
2016-06-08 21:42:36 +00: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

Change-Id: I96a3150e617322e3e39e82d578b20d8d2f558554
2016-06-08 21:39:46 +00:00