OSDN Git Service
Felipe Leme [Fri, 24 Jun 2016 01:15:45 +0000 (01:15 +0000)]
Don\'t toggle Data Saver again until it receives a callback.
am:
484caa3035
Change-Id: Ib4b48a02015b81791d5bb77242968ca7c66b0621
Felipe Leme [Thu, 23 Jun 2016 22:18:11 +0000 (15:18 -0700)]
Don't toggle Data Saver again until it receives a callback.
BUG:
29253107
Change-Id: I4371f947086a45be6709d2a560d27d1f5f0e79c4
Jason Monk [Wed, 22 Jun 2016 19:50:01 +0000 (19:50 +0000)]
Merge \"Workaround to avoid crash in user photo selection\" into nyc-dev
am:
8f75abf92f
Change-Id: Ic0378c50fdc7661e76eed36acc9e935351998f04
Jason Monk [Wed, 22 Jun 2016 19:45:07 +0000 (19:45 +0000)]
Merge "Workaround to avoid crash in user photo selection" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 19:09:27 +0000 (19:09 +0000)]
Merge \"Protect against crash in font size\" into nyc-dev
am:
4b336099f1
Change-Id: Ida2f0e275cea74516616374b858816f162f76dd3
Jason Monk [Wed, 22 Jun 2016 19:04:16 +0000 (19:04 +0000)]
Merge "Protect against crash in font size" into nyc-dev
Jason Monk [Wed, 22 Jun 2016 18:46:56 +0000 (14:46 -0400)]
Workaround to avoid crash in user photo selection
Bug:
29556966
Change-Id: I0715dee2a4cef2252b4ed1cc4d242b8b3d0ab45c
Jason Monk [Wed, 22 Jun 2016 17:10:25 +0000 (13:10 -0400)]
Protect against crash in font size
Change-Id: Ib3578e0e82388a4f6aa3eeade0d990fc107b9c14
Fixes:
29438848
Jason Monk [Wed, 22 Jun 2016 15:36:36 +0000 (15:36 +0000)]
Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am:
dbb5a0b918
Change-Id: Ia9f2e65710a94f314f8bb2b8ec875088c9ccc59f
Jason Monk [Wed, 22 Jun 2016 15:22:10 +0000 (15:22 +0000)]
Merge "Fix tethering re-enable after edit." into nyc-dev
Jason Monk [Wed, 22 Jun 2016 13:32:23 +0000 (13:32 +0000)]
Merge \"Update battery content descriptions with labels\" into nyc-dev
am:
2a6b3d4db1
Change-Id: I0e81816f4eb2e99b10d4cbb46d97f0a370159a6c
Jason Monk [Wed, 22 Jun 2016 13:22:45 +0000 (13:22 +0000)]
Merge "Update battery content descriptions with labels" into nyc-dev
Dan Sandler [Tue, 21 Jun 2016 18:18:21 +0000 (18:18 +0000)]
Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev
am:
87fcf9e95f
Change-Id: I94d18998914552d21099b12b22471ea93857cf52
Daniel Sandler [Tue, 21 Jun 2016 18:11:11 +0000 (18:11 +0000)]
Merge "Show "0" instead of "0 B" in storage settings." into nyc-dev
Jason Monk [Tue, 21 Jun 2016 18:04:39 +0000 (14:04 -0400)]
Fix tethering re-enable after edit.
Sometimes the tether state change comes in late (or seemingly not
at all). Also listen for wifi ap state changes as a fallback for
this case.
Change-Id: I6677c4277453be881967a3cf2234de11cd0237b8
Fixes:
28851179
Jason Monk [Tue, 21 Jun 2016 17:36:57 +0000 (13:36 -0400)]
Update battery content descriptions with labels
Change-Id: I0ad4ca753f8f5e1a01e2e21181526ddb921d487a
Fixes:
28301362
Bill Yi [Tue, 21 Jun 2016 16:56:45 +0000 (16:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f315e2e6f0 -s ours
Change-Id: I2b7c6b292d8197f588fca6dc8c05a329e58d6733
TreeHugger Robot [Tue, 21 Jun 2016 16:53:25 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:52:33 +0000 (15:52 +0000)]
Fix non-app non-user preferences in Settings > Data usage
am:
afea1cae25
Change-Id: I09905ec152a16e12436927bd514fb6cbe5afb59a
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 11:57:30 +0000 (12:57 +0100)]
Fix non-app non-user preferences in Settings > Data usage
Bug:
29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
Bill Yi [Tue, 21 Jun 2016 11:28:46 +0000 (04:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfc06a928c222879aceec01c3aaf35f2cf78561
Auto-generated-cl: translation import
Dan Sandler [Tue, 21 Jun 2016 03:53:34 +0000 (23:53 -0400)]
Show "0" instead of "0 B" in storage settings.
Two benefits:
- "0 B" might be a little confusing for sighted users
- "zero bee" is definitely confusing for TalkBack users
Nonzero storage items will still read as "640 KB" which
should be enough for anyone.
Change-Id: I5c89f7c6382ca14fb91d7d1dd145977f855618ae
Fixes:
27973778
Julia Reynolds [Mon, 20 Jun 2016 18:58:07 +0000 (18:58 +0000)]
Merge \"Fix NPE printing notification actions.\" into nyc-dev
am:
43b04bcc7d
Change-Id: I2763437122129654485c80b7652729526042321a
Julia Reynolds [Mon, 20 Jun 2016 18:43:04 +0000 (18:43 +0000)]
Merge "Fix NPE printing notification actions." into nyc-dev
Jason Monk [Mon, 20 Jun 2016 17:26:42 +0000 (17:26 +0000)]
Fix focusability of battery history chart
am:
9c6ab88bd7
Change-Id: I11bace8b2417900056b4220e65c4e394adceb669
Jason Monk [Mon, 20 Jun 2016 15:04:43 +0000 (11:04 -0400)]
Fix focusability of battery history chart
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes:
29453492
Julia Reynolds [Mon, 20 Jun 2016 14:23:44 +0000 (10:23 -0400)]
Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes:
29017025
Jason Monk [Fri, 17 Jun 2016 17:44:25 +0000 (17:44 +0000)]
Merge \"Protect against crash in memory details\" into nyc-dev
am:
c3ec1ab889
Change-Id: I64ec49c820c21971056b342908a1e0c33d394d72
Jason Monk [Fri, 17 Jun 2016 17:44:25 +0000 (17:44 +0000)]
Make sure screen pinning desc is part of view hierarchy
am:
0c2ccba2f9
Change-Id: I20e98baa0be229a72673ef18eccd35bc713f75ad
Jason Monk [Fri, 17 Jun 2016 17:22:03 +0000 (17:22 +0000)]
Merge "Protect against crash in memory details" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 14:12:37 +0000 (10:12 -0400)]
Protect against crash in memory details
Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes:
29308942
Jason Monk [Fri, 17 Jun 2016 14:05:06 +0000 (10:05 -0400)]
Make sure screen pinning desc is part of view hierarchy
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes:
29243233
Bill Yi [Fri, 17 Jun 2016 04:57:59 +0000 (04:57 +0000)]
Import translations. DO NOT MERGE
am:
5820d03643 -s ours
Change-Id: I112e5d37b0e2bea442ddeb9431864ab06c983f6b
Adrian Roos [Thu, 16 Jun 2016 23:41:25 +0000 (23:41 +0000)]
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
am:
333ba2df01
Change-Id: Ib9419acf4b09dd17fd15b53d32ce4616cbec94fa
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 22:11:07 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
29390361
Change-Id: I1c74afef29b0466e699d5b396639484704528120
Yohei Yukawa [Thu, 16 Jun 2016 21:40:53 +0000 (21:40 +0000)]
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
am:
db6f1f2cb5
Change-Id: Ie23d6efbd6c751f6f1cd7701754dbad61375f8bd
Yohei Yukawa [Thu, 16 Jun 2016 21:24:04 +0000 (21:24 +0000)]
Merge "Teach hard keyboard settings about correct user ID" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 20:28:44 +0000 (13:28 -0700)]
Remove RemoteInput on lockscreen setting
Bug:
29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
Bill Yi [Thu, 16 Jun 2016 10:28:56 +0000 (10:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
32b427b137 -s ours
Change-Id: I6785959fc5131f6cde32be0b960b26015fdc74c5
TreeHugger Robot [Thu, 16 Jun 2016 10:25:12 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 08:52:41 +0000 (01:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9909b1c75f95258630ca3b014768b5a7afcd8411
Auto-generated-cl: translation import
Yohei Yukawa [Thu, 16 Jun 2016 07:02:01 +0000 (00:02 -0700)]
Teach hard keyboard settings about correct user ID
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD is a per-user settings.
PhysicalKeyboardFragment needs to use the current user's ID rather than
hard-coded user ID 0.
Bug:
29406181
Change-Id: Ie40f729f3c85e9ce9ad8f957caba338786b119d9
Roozbeh Pournader [Thu, 16 Jun 2016 01:59:22 +0000 (01:59 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message
am:
77893a4c4b
Change-Id: I015d588d17dbd767d528d986d0a784c361889edc
Roozbeh Pournader [Wed, 15 Jun 2016 21:37:30 +0000 (14:37 -0700)]
BidiFormat adapter name for bluetooth_is_visible_message
Previously, adapter names which tend to be LTR and may appear at the
beginning of the string could cause the detected bidi direction of the whole
string (which would be RTL in RTL locales) to get miscalculated as LTR.
With this fix, not only the detected bidi direction would be correct,
but also odd adapter names would not impact the bidi layout of the
whole string.
Bug:
28816891
Change-Id: I1d25edbeeff7e9c013bb6c741e7f706431e721dc
Chris Wren [Wed, 15 Jun 2016 18:17:52 +0000 (18:17 +0000)]
Merge \"log as counters instead of histograms\" into nyc-dev
am:
6913b6118f
Change-Id: I1f63c363b2980682dd61e863d94b71aeca3048b5
TreeHugger Robot [Wed, 15 Jun 2016 18:13:52 +0000 (18:13 +0000)]
Merge "log as counters instead of histograms" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 16:53:55 +0000 (16:53 +0000)]
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am:
b53117f55c
Change-Id: I8214420cb1a2c7f9d462650908c1546adcc3b950
TreeHugger Robot [Wed, 15 Jun 2016 16:48:45 +0000 (16:48 +0000)]
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
Chris Wren [Wed, 15 Jun 2016 15:44:16 +0000 (11:44 -0400)]
log as counters instead of histograms
this will interoperate better with UMA
Bug:
26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
Ricky Wai [Wed, 15 Jun 2016 16:04:41 +0000 (16:04 +0000)]
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am:
42cbbc3052
Change-Id: I736dcaa1c92c0557559719054f0177eb9cf1fc24
Ricky Wai [Wed, 15 Jun 2016 16:02:18 +0000 (16:02 +0000)]
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 15:03:26 +0000 (15:03 +0000)]
Merge \"Make linkify handle emptys urls better DO NOT MERGE\" into nyc-dev
am:
f4ad4434f1
Change-Id: Ic52d42c920c29942dbcca880fa70bdde69cb1960
Jason Monk [Wed, 15 Jun 2016 14:23:18 +0000 (10:23 -0400)]
Fix SimStatus updatePhoneInfos
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.
Also return the right view in onCreateView
Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes:
29335528
Jason Monk [Wed, 15 Jun 2016 14:53:43 +0000 (14:53 +0000)]
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
Julia Reynolds [Tue, 14 Jun 2016 22:30:33 +0000 (22:30 +0000)]
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am:
b2301cb4c2
Change-Id: I43783338afaf01a3c22ab409a3c8836f6a36550f
TreeHugger Robot [Tue, 14 Jun 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Prevent users from blocking system notifications." into nyc-dev
Sanket Padawe [Tue, 14 Jun 2016 18:04:52 +0000 (18:04 +0000)]
Fix bug in Sim Status Settings.
am:
fb87919fde
Change-Id: I696fa92d6ae21a9df386c60287da0ed298f3615d
Sanket Padawe [Tue, 14 Jun 2016 17:12:39 +0000 (10:12 -0700)]
Fix bug in Sim Status Settings.
Bug:
29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
Ricky Wai [Mon, 13 Jun 2016 14:48:27 +0000 (15:48 +0100)]
Remove work fingerprints when primary profile lock is removed
Bug:
29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083
Bill Yi [Tue, 14 Jun 2016 12:09:38 +0000 (12:09 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
7221f5b6b4 -s ours
Change-Id: I2c5809787112d866890e24f35d315c2f944af610
TreeHugger Robot [Tue, 14 Jun 2016 11:47:33 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 10:17:02 +0000 (03:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4dca3edd37931754e3ba3d6152bde6fe235e7b42
Auto-generated-cl: translation import
Julia Reynolds [Tue, 14 Jun 2016 01:58:02 +0000 (01:58 +0000)]
DND header should be translated.
am:
5a67d5f6f0
Change-Id: Ia9ce4e1465fa20a769b7f66e5cb1ae3577525875
Julia Reynolds [Mon, 13 Jun 2016 16:55:20 +0000 (12:55 -0400)]
DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes:
29123731
Robert Greenwalt [Mon, 13 Jun 2016 20:01:36 +0000 (13:01 -0700)]
resolve merge conflicts of
b34cf86 to nyc-dev-plus-aosp
Change-Id: Ie6a95224a62023a2a19054aa95382d24365124f5
宋凯伦 [Mon, 13 Jun 2016 18:46:19 +0000 (18:46 +0000)]
Merge \"Fix the memory leak in TetherSettings\"
am:
03393c4109
Change-Id: Iec6e2b02efe28491c988a530f401350f8ee5b52f
Robert Greenwalt [Mon, 13 Jun 2016 18:35:31 +0000 (18:35 +0000)]
Merge "Fix the memory leak in TetherSettings"
Michal Karpinski [Mon, 13 Jun 2016 17:40:12 +0000 (17:40 +0000)]
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am:
86c9894f04
Change-Id: Iee44fadb2563a162aa097bf101aea2045564277e
TreeHugger Robot [Mon, 13 Jun 2016 17:29:21 +0000 (17:29 +0000)]
Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev
Jason Monk [Mon, 13 Jun 2016 17:08:32 +0000 (13:08 -0400)]
Make linkify handle emptys urls better DO NOT MERGE
Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes:
29045818
Julia Reynolds [Mon, 13 Jun 2016 16:49:45 +0000 (12:49 -0400)]
Prevent users from blocking system notifications.
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes:
29191134
Robin Lee [Mon, 13 Jun 2016 16:15:19 +0000 (16:15 +0000)]
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am:
cab4f9dc39
Change-Id: Ic81454dfe7e6d7d7d0586e2b5eb38770d93e9377
Robin Lee [Mon, 13 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
Michal Karpinski [Mon, 13 Jun 2016 15:52:58 +0000 (16:52 +0100)]
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
Robin Lee [Mon, 13 Jun 2016 13:19:44 +0000 (14:19 +0100)]
Respect DISALLOW_CONFIG_VPN for disconnect dialog
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix:
29265163
Nicolas Prevot [Mon, 13 Jun 2016 12:50:16 +0000 (12:50 +0000)]
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am:
98704bc495
Change-Id: I0b66044361c76629f20d2bb56ebb0779885a5781
Nicolas Prévot [Mon, 13 Jun 2016 12:37:05 +0000 (12:37 +0000)]
Merge "Fix rendering of policy transparency activity." into nyc-dev
Ruchi Kandoi [Sat, 11 Jun 2016 05:04:52 +0000 (22:04 -0700)]
resolve merge conflicts of
9e28f9a to nyc-dev-plus-aosp
Change-Id: If75736f8e36e2a8e13fe9740f89f632ee6bedd49
Bill Yi [Sat, 11 Jun 2016 04:40:07 +0000 (04:40 +0000)]
Import translations. DO NOT MERGE
am:
c66bffa31f -s ours
Change-Id: I6351c67c9f6f4882079b269134f7d61abe07da04
Mark Salyzyn [Fri, 10 Jun 2016 22:50:23 +0000 (22:50 +0000)]
Merge \"Settings: add logpersist selection (actions)\"
am:
3c398ea710
Change-Id: I49312b7af5d153ab37ad60a404db12a200fe5c42
Treehugger Robot [Fri, 10 Jun 2016 22:37:55 +0000 (22:37 +0000)]
Merge "Settings: add logpersist selection (actions)"
Mark Salyzyn [Fri, 3 Jun 2016 17:18:23 +0000 (10:18 -0700)]
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
Bill Yi [Fri, 10 Jun 2016 20:49:23 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1e7bce31415e722131d6127fc7534669ce527d37
Auto-generated-cl: translation import
Jason Monk [Fri, 10 Jun 2016 15:11:24 +0000 (15:11 +0000)]
Merge \"Fix crash in finish from onCreate.\" into nyc-dev
am:
1a1f6b0b1b
Change-Id: I8c4a6902f6fcf0510b2a307ca3fe7e918f9702f9
TreeHugger Robot [Fri, 10 Jun 2016 15:06:34 +0000 (15:06 +0000)]
Merge "Fix crash in finish from onCreate." into nyc-dev
Jason Monk [Fri, 10 Jun 2016 13:49:12 +0000 (09:49 -0400)]
Fix crash in finish from onCreate.
Change-Id: Ia4937fecdc93e30a468b8fefd2f8776186c8e151
Fixes:
29245324
Yohei Yukawa [Thu, 9 Jun 2016 23:57:58 +0000 (23:57 +0000)]
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am:
294b1586ed
Change-Id: Id61473c100565d9d795bf314ccff6723bdd0c64c
Yohei Yukawa [Thu, 9 Jun 2016 23:47:31 +0000 (23:47 +0000)]
Merge "Fix sentence capitalization of locale names." into nyc-dev
Roozbeh Pournader [Thu, 9 Jun 2016 23:06:55 +0000 (23:06 +0000)]
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am:
5eddc4bde9
Change-Id: If18910dba402d98ffc115af8c87b836fca50ec0f
Roozbeh Pournader [Thu, 9 Jun 2016 23:04:21 +0000 (23:04 +0000)]
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
Svet Ganov [Thu, 9 Jun 2016 22:53:07 +0000 (22:53 +0000)]
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am:
3e5318496e
Change-Id: I6060ae5a113025b0cfbbd8ff1f58599cb8f4cf7e
Svetoslav Ganov [Thu, 9 Jun 2016 22:45:49 +0000 (22:45 +0000)]
Merge "Don't send user to permissions screen if none requested" into nyc-dev
Yohei Yukawa [Thu, 9 Jun 2016 22:01:52 +0000 (15:01 -0700)]
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
Roozbeh Pournader [Thu, 9 Jun 2016 04:55:09 +0000 (21:55 -0700)]
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
Mark Salyzyn [Thu, 9 Jun 2016 20:18:14 +0000 (20:18 +0000)]
Merge \\"Settings: add logpersist selection (strings)\\" am:
99afd4a87d
am:
540ebc39ac -s ours
Change-Id: I00cbd8cbbb926afccd664239c6064747c96c0142
Nicolas Prevot [Thu, 9 Jun 2016 10:27:57 +0000 (11:27 +0100)]
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
Mark Salyzyn [Thu, 9 Jun 2016 19:46:46 +0000 (19:46 +0000)]
Merge \"Settings: add logpersist selection (strings)\"
am:
99afd4a87d
Change-Id: I45d09fc05d11ce1dac413896706b4a7e4e11a8ba
Mark Salyzyn [Thu, 9 Jun 2016 19:38:31 +0000 (19:38 +0000)]
Merge "Settings: add logpersist selection (strings)"
Mark Salyzyn [Fri, 3 Jun 2016 21:05:05 +0000 (14:05 -0700)]
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