Jason Monk
531f23a7c5
Fix build
...
am: feee247e0c
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
2016-06-08 20:25:00 +00:00
Jason Monk
472b7912d2
resolve merge conflicts of 7f7092c to nyc-mr1-dev
...
am: aaaa236cec
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
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
5ff4935041
Merge \\\"Fix disabling of tiles that are not relevant\\\" into nyc-dev am: 9c5d3164f5 am: 4db5484a9d
...
am: 743ceecbe8
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
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
2016-06-08 19:26:17 +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
4db5484a9d
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
...
am: 9c5d3164f5
2016-06-08 19:15:41 +00:00
Jason Monk
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
Jason Monk
cb1972b908
Merge "Fix data usage format strings" into nyc-dev
2016-06-08 19:11:51 +00:00
Jason Monk
9c5d3164f5
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
2016-06-08 19:10:09 +00:00
Doris Ling
e6f635ff82
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
2016-06-08 11:49:47 -07:00
Felipe Leme
84c7b7720a
Merge \\"Display total storage for Internal shared storage.\\" into nyc-mr1-dev am: d4e31320c1
...
am: 05d8b9da4d
2016-06-08 16:22:30 +00:00
Felipe Leme
05d8b9da4d
Merge \"Display total storage for Internal shared storage.\" into nyc-mr1-dev
...
am: d4e31320c1
2016-06-08 16:17:18 +00:00
TreeHugger Robot
d4e31320c1
Merge "Display total storage for Internal shared storage." into nyc-mr1-dev
2016-06-08 16:08:11 +00:00
Ricky Wai
e0b1534cd6
Merge \\\"Make work challenge settings work even work profile is not enabled yet\\\" into nyc-dev am: 68c263cf2e am: 5f0e81222a
...
am: 3717854b81
2016-06-08 15:06:21 +00:00
Ricky Wai
9e5b974259
Merge \\\"Make work challenge settings work even work profile is not enabled yet\\\" into nyc-dev am: 68c263cf2e am: 263b210c16
...
am: acb66824a6
2016-06-08 15:06:21 +00:00
Ricky Wai
3717854b81
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am: 68c263cf2e
...
am: 5f0e81222a
2016-06-08 15:00:54 +00:00
Ricky Wai
acb66824a6
Merge \\"Make work challenge settings work even work profile is not enabled yet\\" into nyc-dev am: 68c263cf2e
...
am: 263b210c16
2016-06-08 14:54:14 +00:00
Felipe Leme
ff162a3c23
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 **
2016-06-08 14:49:32 +00:00
Ricky Wai
5f0e81222a
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:49:06 +00:00
Ricky Wai
263b210c16
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:47:43 +00:00
Ricky Wai
68c263cf2e
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
2016-06-08 14:34:02 +00:00
Baligh Uddin
dabfdc0192
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 09cedc44b4 -s ours am: 6a9133f5b5 -s ours
...
am: 3e3d09eb66
2016-06-08 13:52:54 +00:00
Baligh Uddin
42a9c8b015
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 09cedc44b4 -s ours am: edb4c9c153 -s ours
...
am: e2880537bc
2016-06-08 13:52:53 +00:00
Baligh Uddin
3e3d09eb66
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 09cedc44b4 -s ours
...
am: 6a9133f5b5
2016-06-08 13:49:21 +00:00
Jason Monk
b7e4380cd2
Remove PreferenceActivity
...
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Baligh Uddin
e2880537bc
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 09cedc44b4 -s ours
...
am: edb4c9c153
2016-06-08 13:42:46 +00:00
Baligh Uddin
6a9133f5b5
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 09cedc44b4
2016-06-08 13:36:23 +00:00
Baligh Uddin
edb4c9c153
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
...
am: 09cedc44b4
2016-06-08 13:36:05 +00:00
Ricky Wai
7250016447
Make work challenge settings work even work profile is not enabled yet
...
Bug: 29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
2016-06-08 13:33:57 +00:00
Baligh Uddin
09cedc44b4
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-08 13:09:21 +00:00
Baligh Uddin
013581c95e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 29169863
Change-Id: Ibe6c3ae08e13bc4984932908f9a3ae2ca632b26c
2016-06-07 21:21:26 -07:00
Jim Miller
367795065b
Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: f8c64089b1 am: 6233c1d0bc
...
am: 0257b604e8
2016-06-08 00:50:27 +00:00
Jim Miller
eab4999c45
Merge \\\"Move legacy full disk encryption code to Settings.\\\" into nyc-dev am: f8c64089b1 am: 5b9fab40a0
...
am: d2effc7c01
2016-06-08 00:50:20 +00:00
Jim Miller
0257b604e8
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: f8c64089b1
...
am: 6233c1d0bc
2016-06-08 00:45:39 +00:00
Jim Miller
d2effc7c01
Merge \\"Move legacy full disk encryption code to Settings.\\" into nyc-dev am: f8c64089b1
...
am: 5b9fab40a0
2016-06-08 00:43:55 +00:00
Jim Miller
6233c1d0bc
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:35 +00:00
Jim Miller
5b9fab40a0
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:29 +00:00
TreeHugger Robot
f8c64089b1
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38
Move legacy full disk encryption code to Settings.
...
Fixes bug 27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02
Fix disabling of tiles that are not relevant
...
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
