Bill Yi
aba253e6c7
Import translations. DO NOT MERGE
...
Change-Id: I06952539cefb81ca62a8fde4455f1f3e3ba92f67
Auto-generated-cl: translation import
2016-06-14 03:33:30 -07:00
Bill Yi
0f30207710
Import translations. DO NOT MERGE
...
Change-Id: I4dca3edd37931754e3ba3d6152bde6fe235e7b42
Auto-generated-cl: translation import
2016-06-14 03:17:02 -07:00
Bill Yi
7a7f0f2fb8
Import translations. DO NOT MERGE
...
Change-Id: Ia01af8ad2ea779f6d2546cd2f551169b42ab43ea
Auto-generated-cl: translation import
2016-06-14 02:33:20 -07:00
Julia Reynolds
c64453b073
DND header should be translated. am: 5a67d5f6f0 am: 46298697ce
...
am: fdf4255ced
2016-06-14 02:06:40 +00:00
Julia Reynolds
fdf4255ced
DND header should be translated. am: 5a67d5f6f0
...
am: 46298697ce
2016-06-14 02:02:07 +00:00
Julia Reynolds
46298697ce
DND header should be translated.
...
am: 5a67d5f6f0
2016-06-14 01:58:02 +00:00
Julia Reynolds
9850695bfc
DND header should be translated.
...
am: 5a67d5f6f0
2016-06-14 01:57:37 +00:00
Julia Reynolds
5a67d5f6f0
DND header should be translated.
...
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes: 29123731
2016-06-14 01:47:05 +00:00
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
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
TreeHugger Robot
8b8a012913
Merge "Added new setting for gestures." into nyc-mr1-dev
2016-06-13 22:01:45 +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
Michal Karpinski
24fc55bf27
Merge \\\"Remove \\\'You can choose to either trust or remove this certificate\\\' from Check certificate dialog\\\" into nyc-dev am: 86c9894f04 am: 8532049946
...
am: c0832141a0
2016-06-13 17:52:25 +00:00
Michal Karpinski
c0832141a0
Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am: 86c9894f04
...
am: 8532049946
2016-06-13 17:44:09 +00:00
Michal Karpinski
b57c55d42c
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
...
am: 86c9894f04
2016-06-13 17:40:13 +00:00
Michal Karpinski
8532049946
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
...
am: 86c9894f04
2016-06-13 17:40:12 +00:00
Michal Karpinski
5666e5556f
Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog
...
Removing because user might not be able to remove (because the option is disallowed).
Bug: 29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
2016-06-13 16:52:58 +01: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
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
Bill Yi
c66bffa31f
Import translations. DO NOT MERGE
...
Change-Id: I1e7bce31415e722131d6127fc7534669ce527d37
Auto-generated-cl: translation import
2016-06-10 13:49:23 -07: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
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
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
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
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
TreeHugger Robot
b75865d9dd
Merge "Removed unused string (high_power_count)."
2016-06-09 17:20:43 +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
2016-06-08 21:42:37 +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
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
aaaa236cec
resolve merge conflicts of 7f7092c to nyc-mr1-dev
...
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
2016-06-08 16:19:35 -04:00
Jason Monk
4a8b16323b
resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp
...
am: 84f544a2ae
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
2016-06-08 19:30:49 +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
2016-06-08 19:26: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
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
