OSDN Git Service
Daniel Nishi [Mon, 13 Jun 2016 22:28:38 +0000 (22:28 +0000)]
Merge \"Use Settings.Secure for days to retain.\" into nyc-mr1-dev
am:
584320adb8
Change-Id: Ifd3f1542b9feb2747a54f380ff7047868e563251
Daniel Nishi [Mon, 13 Jun 2016 21:18:28 +0000 (21:18 +0000)]
Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev
宋凯伦 [Mon, 13 Jun 2016 20:10:42 +0000 (20:10 +0000)]
resolve merge conflicts of
b34cf86 to nyc-dev-plus-aosp
am:
89b8babe6a
Change-Id: I5918f6a061ab0d5f3d81b99174d5517cd44e389c
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"
Daniel Nishi [Fri, 10 Jun 2016 20:56:16 +0000 (13:56 -0700)]
Use Settings.Secure for days to retain.
Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.
Bug:
28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e
Android Build Merger (Role) [Mon, 13 Jun 2016 17:44:32 +0000 (17:44 +0000)]
Merge "Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am:
86c9894f04 am:
b57c55d42c" into nyc-mr1-dev-plus-aosp
Michal Karpinski [Mon, 13 Jun 2016 17:44:24 +0000 (17:44 +0000)]
Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am:
86c9894f04
am:
b57c55d42c
Change-Id: If4c300dab4de45c86a7b4719b64cb32937e125b2
Michal Karpinski [Mon, 13 Jun 2016 17:44:09 +0000 (17:44 +0000)]
Merge \\"Remove \\'You can choose to either trust or remove this certificate\\' from Check certificate dialog\\" into nyc-dev am:
86c9894f04
am:
8532049946
Change-Id: I46c26216d66aa9478d4c8d71cbe7baf4a47de50e
Michal Karpinski [Mon, 13 Jun 2016 17:40:13 +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: I7d2252a50b54c765e2c2a9837ca181861a7bae35
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
Android Build Merger (Role) [Mon, 13 Jun 2016 16:19:21 +0000 (16:19 +0000)]
Merge "Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am:
cab4f9dc39 am:
442498681d" into nyc-mr1-dev-plus-aosp
Robin Lee [Mon, 13 Jun 2016 16:19:13 +0000 (16:19 +0000)]
Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am:
cab4f9dc39
am:
442498681d
Change-Id: I01069ad48a0ccd310b9e29fe11b5420f5057af04
Robin Lee [Mon, 13 Jun 2016 16:19:10 +0000 (16:19 +0000)]
Merge \\"Respect DISALLOW_CONFIG_VPN for disconnect dialog\\" into nyc-dev am:
cab4f9dc39
am:
c7f0f2338a
Change-Id: Ic885afb2eeda787f6a1f65da58db62f8485e285c
Robin Lee [Mon, 13 Jun 2016 16:15:20 +0000 (16:15 +0000)]
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am:
cab4f9dc39
Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49
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
Android Build Merger (Role) [Mon, 13 Jun 2016 12:54:54 +0000 (12:54 +0000)]
Merge "Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am:
98704bc495 am:
1ba2cbbfc2" into nyc-mr1-dev-plus-aosp
Nicolas Prévot [Mon, 13 Jun 2016 12:54:43 +0000 (12:54 +0000)]
Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am:
98704bc495
am:
1ba2cbbfc2
Change-Id: I2d991bac8336f9d6c017446aeaeffcde1a7960a5
Nicolas Prévot [Mon, 13 Jun 2016 12:54:36 +0000 (12:54 +0000)]
Merge \\"Fix rendering of policy transparency activity.\\" into nyc-dev am:
98704bc495
am:
341b21d2f8
Change-Id: I9c7edec1124d042d045e7dbed77f75c6ec787b6b
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 Prevot [Mon, 13 Jun 2016 12:50:11 +0000 (12:50 +0000)]
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am:
98704bc495
Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14
Nicolas Prévot [Mon, 13 Jun 2016 12:37:05 +0000 (12:37 +0000)]
Merge "Fix rendering of policy transparency activity." into nyc-dev
Mark Salyzyn [Sat, 11 Jun 2016 05:18:20 +0000 (05:18 +0000)]
resolve merge conflicts of
9e28f9a to nyc-dev-plus-aosp
am:
f8c135a986
Change-Id: Ie1a71f0f029e5ca156eee2c15dc4670a724cc69c
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:47:45 +0000 (04:47 +0000)]
Import translations. DO NOT MERGE am:
c66bffa31f -s ours
am:
099609af97 -s ours
Change-Id: I61b5e43c6c626fcc18460d658384ff694b718bb3
Bill Yi [Sat, 11 Jun 2016 04:44:01 +0000 (04:44 +0000)]
Import translations. DO NOT MERGE am:
c66bffa31f -s ours
am:
b99a48f779 -s ours
Change-Id: Id5fc43bba4265fa74fe298c7efa898d526438484
Bill Yi [Sat, 11 Jun 2016 04:40:07 +0000 (04:40 +0000)]
Import translations. DO NOT MERGE
am:
c66bffa31f -s ours
Change-Id: I8396507cd5e07b07539beef48ba50a175455478a
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
Meng Wang [Fri, 10 Jun 2016 16:42:25 +0000 (16:42 +0000)]
Merge \"Wi-Fi Calling settings UI update\" into nyc-mr1-dev
am:
7648de1ec6
Change-Id: I894646fbea517965d61a49f536c7a3d4d2ca27a6
Meng Wang [Fri, 10 Jun 2016 16:36:46 +0000 (16:36 +0000)]
Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev
Jason Monk [Fri, 10 Jun 2016 15:14:33 +0000 (15:14 +0000)]
Merge \\"Fix crash in finish from onCreate.\\" into nyc-dev am:
1a1f6b0b1b
am:
3078e76284
Change-Id: I8f58b14d3011209fc0d02c14a44476f13af4338c
Jason Monk [Fri, 10 Jun 2016 15:14:09 +0000 (15:14 +0000)]
Merge \\"Fix crash in finish from onCreate.\\" into nyc-dev am:
1a1f6b0b1b
am:
0fa8dc1b55
Change-Id: I3b89d3ea39ea415645aaff57471aa4e0fd439ff3
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
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: Ibd2e867077c2906310dd3b37afe1b9c1ab02de72
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 [Fri, 10 Jun 2016 00:02:58 +0000 (00:02 +0000)]
Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am:
294b1586ed
am:
74358619a0
Change-Id: I72b0e49afcbac5aa44609df9b25318aacc89bdc5
Yohei Yukawa [Fri, 10 Jun 2016 00:02:38 +0000 (00:02 +0000)]
Merge \\"Fix sentence capitalization of locale names.\\" into nyc-dev am:
294b1586ed
am:
2d1d002eea
Change-Id: Ia25f22558a97a3ba961b877403ce931fc13e6db0
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:57:58 +0000 (23:57 +0000)]
Merge \"Fix sentence capitalization of locale names.\" into nyc-dev
am:
294b1586ed
Change-Id: I66b2876c923eed55804e14edc9f73ad619157336
Yohei Yukawa [Thu, 9 Jun 2016 23:47:31 +0000 (23:47 +0000)]
Merge "Fix sentence capitalization of locale names." into nyc-dev
Android Build Merger (Role) [Thu, 9 Jun 2016 23:09:52 +0000 (23:09 +0000)]
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
Roozbeh Pournader [Thu, 9 Jun 2016 23:09:45 +0000 (23:09 +0000)]
Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am:
5eddc4bde9
am:
241f8e6e9c
Change-Id: Ide8afd402be0454b080ea91766f95c6ecf4c7570
Roozbeh Pournader [Thu, 9 Jun 2016 23:09:30 +0000 (23:09 +0000)]
Merge \\"Use existing localizations for formatting data usage [DO NOT MERGE]\\" into nyc-dev am:
5eddc4bde9
am:
0e3b675446
Change-Id: I4058ac8826ca1ce6c903d862e3246b86e6071113
Roozbeh Pournader [Thu, 9 Jun 2016 23:07:09 +0000 (23:07 +0000)]
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am:
5eddc4bde9
Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7
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
Svetoslav Ganov [Thu, 9 Jun 2016 23:02:04 +0000 (23:02 +0000)]
Merge \\"Don\\'t send user to permissions screen if none requested\\" into nyc-dev am:
3e5318496e
am:
0984141943
Change-Id: Iaf17b055c1efdd18eaf44f6dbee188aa8eecfe89
Svetoslav Ganov [Thu, 9 Jun 2016 22:58:26 +0000 (22:58 +0000)]
Merge \\"Don\\'t send user to permissions screen if none requested\\" into nyc-dev am:
3e5318496e
am:
650cc723d1
Change-Id: I7c2309f8ccc006cf0b37e5dce6bb75bef927b747
Svet Ganov [Thu, 9 Jun 2016 22:53:40 +0000 (22:53 +0000)]
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
am:
3e5318496e
Change-Id: I9f04ac2bda5816997e86aa6aee683df3bbfcb74d
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:23:05 +0000 (20:23 +0000)]
Merge \\\"Settings: add logpersist selection (strings)\\\" am:
99afd4a87d am:
540ebc39ac -s ours
am:
1f9e0cce2b
Change-Id: I146e9e96a7c076528cf7d1da419ff79e2cba9ef6
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
Svet Ganov [Thu, 9 Jun 2016 05:32:07 +0000 (22:32 -0700)]
Don't send user to permissions screen if none requested
bug:
29105157
Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
Bill Yi [Thu, 9 Jun 2016 14:12:01 +0000 (14:12 +0000)]
Import translations. DO NOT MERGE am:
b43b49c643 -s ours
am:
483ca13e0b -s ours
Change-Id: I37ab0d635c2d40d7ed0cb488d5365030d3ff5a26
Bill Yi [Thu, 9 Jun 2016 14:11:57 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
de2559e136 -s ours
Change-Id: I192c5d7d64d9a3941489b230fd4ea7bb2cc46a9f
Bill Yi [Thu, 9 Jun 2016 14:03:33 +0000 (14:03 +0000)]
Import translations. DO NOT MERGE am:
b43b49c643 -s ours
am:
9190e13af2 -s ours
Change-Id: Ie62ae11869123b06d62021565fc75ad0613d31b3
Bill Yi [Thu, 9 Jun 2016 14:00:04 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
b43b49c643 -s ours
Change-Id: Ia865b8f152d756c2180b15a2a9de0a667817ab62
Bill Yi [Thu, 9 Jun 2016 14:00:04 +0000 (14:00 +0000)]
Import translations. DO NOT MERGE
am:
b43b49c643 -s ours
Change-Id: Ibb7f8a46f201ab267cbb1833608d10b4512babf2
Bill Yi [Thu, 9 Jun 2016 05:54:47 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80bce4c08874414f732d26ada50825c7b8140322
Auto-generated-cl: translation import
Bill Yi [Thu, 9 Jun 2016 05:38:29 +0000 (22:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7b3039eadee367f4839682567022826320d208e0
Auto-generated-cl: translation import
Android Build Merger (Role) [Wed, 8 Jun 2016 21:39:55 +0000 (21:39 +0000)]
Merge "Merge \"Moved network settings reset away from Backup & reset.\" into nyc-mr1-dev am:
ab595b8a98" into nyc-mr1-dev-plus-aosp
Doris Ling [Wed, 8 Jun 2016 21:39:46 +0000 (21:39 +0000)]
Merge \"Moved network settings reset away from Backup & reset.\" into nyc-mr1-dev
am:
ab595b8a98
Change-Id: I96a3150e617322e3e39e82d578b20d8d2f558554
Jason Monk [Wed, 8 Jun 2016 21:39:45 +0000 (21:39 +0000)]
Fix build
am:
feee247e0c
Change-Id: Id39d7798827dade57e89da9cfa2e387f4b37c29c
Doris Ling [Wed, 8 Jun 2016 21:35:19 +0000 (21:35 +0000)]
Merge "Moved network settings reset away from Backup & reset." into nyc-mr1-dev
Jason Monk [Wed, 8 Jun 2016 20:09:03 +0000 (16:09 -0400)]
Fix build
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit
e3ce6713d30e1fef2b081211af91d223c4c29692)
Jason Monk [Wed, 8 Jun 2016 20:22:18 +0000 (20:22 +0000)]
resolve merge conflicts of
7f7092c to nyc-mr1-dev
am:
aaaa236cec
Change-Id: Ib4ee0ed91ac5951f67698ddc459bc0031eed3160
Jason Monk [Wed, 8 Jun 2016 20:19:35 +0000 (16:19 -0400)]
resolve merge conflicts of
7f7092c to nyc-mr1-dev
Change-Id: I27b058bd0cbbc2e253337cc56a1a032df96046de
Jason Monk [Wed, 8 Jun 2016 19:28:48 +0000 (15:28 -0400)]
resolve merge conflicts of
167f6cc to nyc-mr1-dev-plus-aosp
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
Jason Monk [Wed, 8 Jun 2016 19:26:48 +0000 (19:26 +0000)]
Merge \\"Fix data usage format strings\\" into nyc-dev am:
cb1972b908
am:
2c7e1d844f
Change-Id: I7240bac72b08c251bf90c433d4febe5e8f725f4b
Jason Monk [Wed, 8 Jun 2016 19:26:17 +0000 (19:26 +0000)]
Merge \\"Fix disabling of tiles that are not relevant\\" into nyc-dev am:
9c5d3164f5
am:
4db5484a9d
Change-Id: I1fc083fbb9057a610acc52f5453fd9a3e7c2607f
Jason Monk [Wed, 8 Jun 2016 19:15:42 +0000 (19:15 +0000)]
Merge \"Remove PreferenceActivity\" into nyc-dev
am:
7f7092c705
Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
Jason Monk [Wed, 8 Jun 2016 19:15:42 +0000 (19:15 +0000)]
Merge \"Fix data usage format strings\" into nyc-dev
am:
cb1972b908
Change-Id: I42ae51bb815f24b026ff0c25759634b23d13355c
Jason Monk [Wed, 8 Jun 2016 19:15:41 +0000 (19:15 +0000)]
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
am:
9c5d3164f5
Change-Id: I778f8f766ace689b1bd4174000daaafb13253516
Jason Monk [Wed, 8 Jun 2016 19:13:05 +0000 (19:13 +0000)]
Merge "Remove PreferenceActivity" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:11:51 +0000 (19:11 +0000)]
Merge "Fix data usage format strings" into nyc-dev
Jason Monk [Wed, 8 Jun 2016 19:10:08 +0000 (19:10 +0000)]
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
Doris Ling [Wed, 8 Jun 2016 00:56:00 +0000 (17:56 -0700)]
Moved network settings reset away from Backup & reset.
Moved Settings -> Backup & reset -> Network setting reset to
Settings -> Wireless & networks -> More.
Bug:
28683031
Change-Id: I52385ec862789985ccb8647398950605955569f7
Felipe Leme [Wed, 8 Jun 2016 16:17:18 +0000 (16:17 +0000)]
Merge \"Display total storage for Internal shared storage.\" into nyc-mr1-dev
am:
d4e31320c1
Change-Id: I0a4c996177ecc57352af4b6be244af7b9e09b1d2
TreeHugger Robot [Wed, 8 Jun 2016 16:08:11 +0000 (16:08 +0000)]
Merge "Display total storage for Internal shared storage." into nyc-mr1-dev
Ricky Wai [Wed, 8 Jun 2016 15:00:54 +0000 (15:00 +0000)]
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am:
68c263cf2e
am:
5f0e81222a
Change-Id: I11576bc92d1b3f80780efb4d46d963eea2176de7
Ricky Wai [Wed, 8 Jun 2016 14:54:14 +0000 (14:54 +0000)]
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am:
68c263cf2e
am:
263b210c16
Change-Id: I9e606761dc2c3e88832aeac2e8ddd65f0c7677f7
Felipe Leme [Wed, 11 May 2016 20:58:41 +0000 (13:58 -0700)]
Display total storage for Internal shared storage.
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".
This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.
BUG:
24128505
Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1
** Cherrypicked from master - DO NOT MERGE **
Ricky Wai [Wed, 8 Jun 2016 14:49:06 +0000 (14:49 +0000)]
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
am:
68c263cf2e
Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2
OSDN Git Service
