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
Jason Monk
531f23a7c5
Fix build
...
am: feee247e0c
Change-Id: Id39d7798827dade57e89da9cfa2e387f4b37c29c
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
3a71e70576
resolve merge conflicts of 7f7092c
to nyc-mr1-dev am: aaaa236cec
...
am: 472b7912d2
Change-Id: I13e387652d057da84d34c89b5387fcda486c13c5
2016-06-08 20:25:00 +00:00
Jason Monk
472b7912d2
resolve merge conflicts of 7f7092c
to nyc-mr1-dev
...
am: aaaa236cec
Change-Id: Ib4ee0ed91ac5951f67698ddc459bc0031eed3160
2016-06-08 20:22:18 +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
e3ce6713d3
Fix build
...
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
2016-06-08 16:09:03 -04:00
Jason Monk
4a8b16323b
resolve merge conflicts of 167f6cc
to nyc-mr1-dev-plus-aosp
...
am: 84f544a2ae
Change-Id: I73d7ff76eae3871659063eb58d4efc849f261ac8
2016-06-08 19:34:31 +00:00
Jason Monk
bc75397385
Merge \\\"Fix data usage format strings\\\" into nyc-dev am: cb1972b908
am: 2c7e1d844f
...
am: 9667149282
Change-Id: I2dd2cc37911a466fd92811c37e334d6ef106f440
2016-06-08 19:30:49 +00:00
Jason Monk
5ff4935041
Merge \\\"Fix disabling of tiles that are not relevant\\\" into nyc-dev am: 9c5d3164f5
am: 4db5484a9d
...
am: 743ceecbe8
Change-Id: I0e47826f8d48c67a736e1bf6acfb2ee20f0333d5
2016-06-08 19:29:44 +00: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
Change-Id: I7240bac72b08c251bf90c433d4febe5e8f725f4b
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
Change-Id: I1fc083fbb9057a610acc52f5453fd9a3e7c2607f
2016-06-08 19:26:17 +00:00
Jason Monk
167f6cc87c
Merge \"Remove PreferenceActivity\" into nyc-dev
...
am: 7f7092c705
Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f
Merge \"Fix data usage format strings\" into nyc-dev
...
am: cb1972b908
Change-Id: I42ae51bb815f24b026ff0c25759634b23d13355c
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
Change-Id: I778f8f766ace689b1bd4174000daaafb13253516
2016-06-08 19:15:41 +00:00