Commit Graph

29103 Commits

Author SHA1 Message Date
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

Change-Id: I091c7a1173b468c9887d247efa517696cbd50da2
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

Change-Id: I40ee4bef616c6dbff872f5bb106b3195a9e5be07
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  -s ours

Change-Id: Id763298ebd3a9068a1a7e5ad5084749a41fd57b3
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  -s ours

Change-Id: I1849b8d83c40fce7a976d72ebcba1a85ed52c535
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  -s ours

Change-Id: Ie22147e143bbe55942bb2a69277b83bad3cc2ba7
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  -s ours

Change-Id: I3a461596a23d7d7de0960db5e0827f917a2d0e65
2016-06-08 13:42:46 +00:00
Baligh Uddin
6a9133f5b5 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 09cedc44b4  -s ours

Change-Id: I1af6c2584397a29d5128eea7cdcfb8d8c9c8e0a7
2016-06-08 13:36:23 +00:00
Baligh Uddin
edb4c9c153 Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 09cedc44b4  -s ours

Change-Id: I33f0f1c5bb67c375eac16b2619934c55dcabb504
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

Change-Id: Ib83026588c45c80f06951639865d0a04421f990c
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

Change-Id: I850ad5971e802d876bf38ca9a5d4ab752399cdbb
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

Change-Id: Id028fa650c62da4ce71bde9282ae8219997579b0
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

Change-Id: I055b5b61daf626c05dbac11c59da3453cc08d43e
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

Change-Id: Idf719bc91baba5fe18c044183794da4a74251bdd
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

Change-Id: Ib227856dd007197a22b8ef2f27881dddd992b3b8
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
Ian Rogers
d7b28f70b0 Merge "Fix sort orders on longs." 2016-06-07 15:49:50 +00:00
Ian Rogers
03936cea60 Fix sort orders on longs.
The int conversion narrows a long possibly inverting its sign. This may
lead to broken comparator sort orders.
Caught by Error Prone.
Bug: 27723540

Change-Id: I53d70c25a22cdcfc496443395b170f586d259fa7
2016-06-07 00:02:42 -07:00
Bill Yi
6304854536 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ca24281df8 -s ours
am: bf986bb7d0  -s ours

* commit 'bf986bb7d0777d191e14b6019fcb3d86c7405e28':
  Import translations. DO NOT MERGE

Change-Id: Ib008a4de5e4e607df3d553436367f66027570d42
2016-06-07 03:39:37 +00:00
Bill Yi
e0848b3b9a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours am: f12e2ee361 -s ours
am: 1ee6221214  -s ours

* commit '1ee6221214a14665ddb2ed38a2abdd509491d964':

Change-Id: I4ff08b3d33046f3c93b5952db2ff2c66f57051e1
2016-06-07 03:39:36 +00:00
Bill Yi
bf986bb7d0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ca24281df8  -s ours

* commit 'ca24281df88030a6fb3e1c2b3fd104a78c8506b8':
  Import translations. DO NOT MERGE

Change-Id: Ic21cfb870060f52e88d7c224599adfc22561fcfe
2016-06-07 03:39:09 +00:00
Bill Yi
1ee6221214 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours
am: f12e2ee361  -s ours

* commit 'f12e2ee361e4973a858d6b0e31c9b3c7a54045ed':

Change-Id: I3c809004b464b7532610850aeae2299271672e4a
2016-06-07 03:37:14 +00:00
Bill Yi
3e333ee4e3 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours am: e145cca1d0 -s ours
am: c6da591a08  -s ours

* commit 'c6da591a0854d0f5e725bd531ffac2b349c518d2':
  Import translations. DO NOT MERGE

Change-Id: I81f5cfada627d2a1440d504820bca3b2fcdac874
2016-06-07 03:36:35 +00:00
TreeHugger Robot
ca24281df8 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-06-07 03:35:54 +00:00
Bill Yi
c6da591a08 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours
am: e145cca1d0  -s ours

* commit 'e145cca1d0ad7856220b2bcab7a7d6771439b536':
  Import translations. DO NOT MERGE

Change-Id: Ia396c589077bc718ed2ccd366a10efde0bc93ca8
2016-06-07 03:33:59 +00:00
Bill Yi
f12e2ee361 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 48229d7781  -s ours

* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
  Import translations. DO NOT MERGE

Change-Id: I736dc40ed3a5ba94a145779a30ab8e21b1ee601a
2016-06-07 03:31:23 +00:00
Bill Yi
e145cca1d0 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 48229d7781  -s ours

* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
  Import translations. DO NOT MERGE

Change-Id: Ia9398ea959de34c41ecdf48f47bdf433dd25bf65
2016-06-07 03:31:21 +00:00
TreeHugger Robot
48229d7781 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-06-07 03:23:12 +00:00
TreeHugger Robot
d5029246f8 Merge "Import translations. DO NOT MERGE" 2016-06-07 02:30:16 +00:00
Bill Yi
937c29d240 Import translations. DO NOT MERGE
Change-Id: Ife628ac799a79648619b9d52df5ec0da1287281d
Auto-generated-cl: translation import
2016-06-06 19:03:01 -07:00
Bill Yi
d4bd56b2a7 Import translations. DO NOT MERGE
Change-Id: I1f567719e29fcdea3acf79df2b310301f948befb
Auto-generated-cl: translation import
2016-06-06 18:48:05 -07:00
Bill Yi
fad556056d Import translations. DO NOT MERGE
Change-Id: I8cb13150fc08e94cd42c7426695b694ec5eda94f
Auto-generated-cl: translation import
2016-06-06 18:06:54 -07:00
Meng Wang
0dc4311333 Wi-Fi Calling settings UI update
Bug: 28404126
Change-Id: Id9c44c0b97d2ef81502a65e9238e47656068db50
2016-06-06 16:49:02 -07:00
Robin Lee
527acd7b01 Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c am: e8fce6d433
am: a47ec95e73

* commit 'a47ec95e73741a86d64340654b7a920c46b5f441':

Change-Id: Ie708472a950d86631905a03da174d389aaec73ac
2016-06-06 21:24:40 +00:00
Robin Lee
a47ec95e73 Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c
am: e8fce6d433

* commit 'e8fce6d4332e3ee4000d9efb548f5de3bbadb4a8':

Change-Id: I4ce9abb873d9480d1d83f29d39b03f0d8447a710
2016-06-06 21:22:07 +00:00
Robin Lee
971a19b7d3 Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c am: cff703e68a
am: dbf70ca4ab

* commit 'dbf70ca4abc559588c0be94032e7ad3708ca5e9c':
  Restrict Settings always-on to NYC+

Change-Id: I692e8fc589d8ff2d474d9a22fd27500f6f207cd1
2016-06-06 21:14:59 +00:00
Robin Lee
dbf70ca4ab Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c
am: cff703e68a

* commit 'cff703e68a156593412b906f7845c66906f23149':
  Restrict Settings always-on to NYC+

Change-Id: Ic60a75f6694dcb51c7d3ed398bf644b7ed1108b6
2016-06-06 21:12:27 +00:00
Robin Lee
e8fce6d433 Merge "Restrict Settings always-on to NYC+" into nyc-dev
am: 8f2c17e12c

* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
  Restrict Settings always-on to NYC+

Change-Id: Ic79b72b61a763ab7746c1fa07e705e5e2e410bbf
2016-06-06 21:09:30 +00:00
Robin Lee
cff703e68a Merge "Restrict Settings always-on to NYC+" into nyc-dev
am: 8f2c17e12c

* commit '8f2c17e12c7cd7c293257c74ac32ab435f58eefe':
  Restrict Settings always-on to NYC+

Change-Id: Icdd13f90ce7c38b8d3fdc4f5b5247f97f6a21127
2016-06-06 21:09:29 +00:00
Robin Lee
8f2c17e12c Merge "Restrict Settings always-on to NYC+" into nyc-dev 2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c Fix data usage format strings
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1 Restrict Settings always-on to NYC+
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Bill Yi
d404ee401a Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed -s ours am: e2b9a2bd87 -s ours
am: ce51385f29  -s ours

* commit 'ce51385f29bd1bf2316de0bac2feeb9cc798c91e':

Change-Id: I70c600bafdda7d1fc0e7d17283026c80a8edd406
2016-06-04 00:24:24 +00:00