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
2016-06-09 14:13:13 +00:00
Bill Yi
5b106cfe5a
Import translations. DO NOT MERGE am: de2559e136 -s ours
...
am: 729c87e874
2016-06-09 14:13:12 +00:00
Bill Yi
a58c30a2f3
Import translations. DO NOT MERGE am: b43b49c643 -s ours
...
am: 483ca13e0b
2016-06-09 14:12:01 +00:00
Bill Yi
729c87e874
Import translations. DO NOT MERGE
...
am: de2559e136
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
2016-06-09 14:10:00 +00:00
Bill Yi
6537a961dd
Import translations. DO NOT MERGE am: b43b49c643 -s ours
...
am: 9190e13af2
2016-06-09 14:03:33 +00:00
Bill Yi
483ca13e0b
Import translations. DO NOT MERGE
...
am: b43b49c643
2016-06-09 14:00:04 +00:00
Bill Yi
9190e13af2
Import translations. DO NOT MERGE
...
am: b43b49c643
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
2016-06-08 21:42:37 +00:00
Jason Monk
eabc5d297c
Fix build am: feee247e0c
...
am: 531f23a7c5
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
2016-06-08 21:39:46 +00:00
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
