Commit Graph

1086 Commits

Author SHA1 Message Date
Daniel Nishi
7bb541b6ff Fix a bug where storage settings flickers.
The bug resulted from the fact that turning off loading while loading is
turned off causes the loading finishing animation to flicker. By only
turning it off when it is on, we ensure it works.

Change-Id: Ia31bf3e9aa90726e39b6bc7189d175c38fb51e5a
Fixes: 38045492
Test: Manual
2017-05-12 09:43:00 -07:00
Daniel Nishi
2c00b770eb Merge "Add the badged icon for Movies & TV." into oc-dev am: 9a5bac7d5a
am: a3349519d5

Change-Id: I0024eee4c96f8193d3a8eb94b6199d344c5c6f5d
2017-05-11 00:52:07 +00:00
Daniel Nishi
24077d899f Add the badged icon for Movies & TV.
The work profile was missing the icon.

Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes: 38132211
Test: Settings robotest
2017-05-08 14:13:13 -07:00
Daniel Nishi
708ee39aa7 Merge "Fix Settings crash in Storage settings." into oc-dev am: 816956d249
am: bc628dfdd9

Change-Id: I47b9bd56c6a7bb6f2a640ae067623a4f5395d455
2017-05-08 16:53:21 +00:00
Daniel Nishi
8381755263 Fix Settings crash in Storage settings.
If you tap aggressively before the fragment has fully initialized, it
was possible to NPE. This null-checks to avoid this.

Change-Id: I3488245d230cf1e16b23e34614c8e6b43ea14ff1
Fixes: 37945253
Test: Robotest
2017-05-04 14:12:45 -07:00
Daniel Nishi
c90502627b Merge "Always use GB as the unit in Storage Settings." into oc-dev am: 833927929e
am: f917c0aa24

Change-Id: I632e27fe03241818447998464e1bdbfe96f4c6e5
2017-05-03 18:09:27 +00:00
Daniel Nishi
1ec0f84f43 Merge "Don't overly hide the Files preference." into oc-dev am: 0c58fbd345
am: 169fd4693f

Change-Id: I5328da37f430703540cb067256984ebafbe4ff59
2017-05-03 18:09:00 +00:00
Daniel Nishi
833927929e Merge "Always use GB as the unit in Storage Settings." into oc-dev 2017-05-03 18:00:19 +00:00
Daniel Nishi
0c58fbd345 Merge "Don't overly hide the Files preference." into oc-dev 2017-05-03 17:59:08 +00:00
Daniel Nishi
f7fa542eb6 Don't overly hide the Files preference.
This occurred this because the files preference was initialized during
displayPreference(), but the volume used to initialize it was not being
set until after the displayPreference() call. In this case, the files
preference would hide itself and never come back.

This fixes this by double-checking the Files visibility status whenever
we set the volume.

Change-Id: I0b1a7a9566e9caece39ec58706fbca034ef4c1c2
Fixes: 37790776
Test: Settings robotest
2017-05-02 15:42:55 -07:00
Nathan Harold
01fc5e4ffc Update references to use PhoneConstantConversion
Bug: 33414487
Change-Id: I391671e38406235da48bddf61a70699974367e33
2017-05-02 13:44:27 -07:00
Daniel Nishi
8bcc2e203c Merge "Make the storage free/total sizes consistent." into oc-dev am: b22c11ae28
am: e25371e8bc

Change-Id: I267abe4239c3b6b15a5a9be003f68bcc026c1ea3
2017-05-01 21:55:05 +00:00
Daniel Nishi
b22c11ae28 Merge "Make the storage free/total sizes consistent." into oc-dev 2017-05-01 21:40:23 +00:00
Daniel Nishi
f9a073bb69 Merge "Don't shows Files when storage is adopted." into oc-dev am: 980155fb30
am: 23f6fcf90a

Change-Id: I8449865c72091f6a6752bebc17d14848e17e2776
2017-04-26 17:06:32 +00:00
Daniel Nishi
0f127e98e5 Merge "Don't crash on opening ejecting USB." into oc-dev am: 32f95292bf
am: 3803bb966d

Change-Id: Ie26202f072f11983f2f1883811585f77db40f84d
2017-04-26 17:05:59 +00:00
Daniel Nishi
a16837769c Make the storage free/total sizes consistent.
We were using a different calculation in the top level view compared to
within the Storage settings. Technically, both are correct (one of them
is aware that we're considering cache as free, one does not). This patch
aligns us on the cache as free strategy.

Change-Id: I9ac26683a4d2a30b77a1da534aa2ddd3d4da6657
Fixes: 37175551
Test: Settings robotest
2017-04-26 09:58:58 -07:00
Daniel Nishi
980155fb30 Merge "Don't shows Files when storage is adopted." into oc-dev 2017-04-25 22:30:29 +00:00
Daniel Nishi
32f95292bf Merge "Don't crash on opening ejecting USB." into oc-dev 2017-04-25 22:30:14 +00:00
Daniel Nishi
63a11c56de Always use GB as the unit in Storage Settings.
Bug: 36901322
Test: Settings unit tests

Change-Id: I08c711db6a271522942a01d1adf3e8e5223010f7
2017-04-25 15:23:49 -07:00
Daniel Nishi
1f079fbae4 Don't shows Files when storage is adopted.
One regression from the previous storage view is that the
Files category should not show at all when the storage is adopted.

Fixes: 36786953
Test: Settings robotest

Change-Id: Ice365fabc3bfa66f4c5526ac78bbbfc5e15b7b35
2017-04-24 17:24:51 -07:00
Daniel Nishi
ca32f1d354 Merge "Add EXTRA_FROM_STORAGE to photos gallery intent." into oc-dev am: bad8171d05
am: f3c3cd97ba

Change-Id: I41a99ae57dbd5abd1309f643831aa9d20e62836a
2017-04-21 17:25:35 +00:00
Daniel Nishi
9e107c5682 Add EXTRA_FROM_STORAGE to photos gallery intent.
Change-Id: I050149f558df0de83e7139354ac54176d7ced162
Fixes: 36991234
Test: Settings robotest
2017-04-20 14:46:28 -07:00
Daniel Nishi
4a150e75fd Merge "Gracefully handle null volumes after forgetting." into oc-dev am: d6d6185167
am: 8f68658aef

Change-Id: I1033e51c837c9ed51e424435e8b49cac7eca51dc
2017-04-20 18:54:28 +00:00
Daniel Nishi
d6d6185167 Merge "Gracefully handle null volumes after forgetting." into oc-dev 2017-04-20 17:05:29 +00:00
Daniel Nishi
9c9c2b5871 Merge "Change how we calculate system size." into oc-dev am: 0b75d39312
am: aebda427d8

Change-Id: I7a0efbf7745fe52d9dbefe94ead07be603b6f96e
2017-04-20 00:58:05 +00:00
Daniel Nishi
0cd1f73b21 Change how we calculate system size.
As per storage discussions, the best way to calculate storage for the
System is to just take all known data and subtract it from the used
bytes. There is more to the system than just the /system partition and,
even if we ignore the partitions and use the underlying block device
method of calculating it, we run into the problem of it not adding up to
the actual device size.

Change-Id: I6e1f775ea3f3b8b2cc78d734623934651e2fb7b4
Fixes: 37166310
Test: Robotests
2017-04-19 11:42:34 -07:00
Daniel Nishi
6b37d6341f Gracefully handle null volumes after forgetting.
If a user tells a device to forget a storage volume and then
goes back to the PrivateVolumeForget activity from their Recents, it
attempts to re-initialize itself with a volume that it forgot.

And this makes Settings crash.

By gracefully killing the activity when we try to open
PrivateVolumeForget for a forgotten volume, we avoid this crash.

Change-Id: Ib4e881c10f0c872ce6b268b16a573960230ef99b
Fixes: 34856304
Test: Settings unit test
2017-04-18 14:59:20 -07:00
Daniel Nishi
edafa44c7e Don't crash on opening ejecting USB.
This crash occurs because, even if you finish an Activity during
onCreate, the other lifecycle methods occur. In this case,
onActivityCreated assumes that onCreate ran properly.

By exiting early from onActivityCreated, we can ensure the activity
is finished properly.

Change-Id: Ia354341bf82d295c7dd042668fb11d588ddfebc0
Fixes: 37334861
Test: Instrumentation test
2017-04-18 12:19:36 -07:00
Jeff Sharkey
5d9ccedc59 Merge "Follow storage API polishing." into oc-dev am: e398a84199
am: 4ecbc32b48

Change-Id: Ie47474e46fa6ebfffdddad04ab8c99b332c4f8cc
2017-04-17 23:58:17 +00:00
Daniel Nishi
9db2a27a37 Merge "Update the old Storage view to look better." into oc-dev am: 427f976ff4
am: c99803bba4

Change-Id: Ibe8619a285effba38e89e2fada0887c57be54108
2017-04-17 22:50:07 +00:00
Daniel Nishi
79eb7e4848 Merge "Fix a bug where options menu was not showing." into oc-dev am: 4f2f6bcad9
am: e69e9d74c5

Change-Id: Ica70e9cc82bdb8eb745583a3558f6fbb1f7c1b18
2017-04-17 22:49:45 +00:00
Jeff Sharkey
e398a84199 Merge "Follow storage API polishing." into oc-dev 2017-04-17 22:26:44 +00:00
Daniel Nishi
427f976ff4 Merge "Update the old Storage view to look better." into oc-dev 2017-04-17 22:26:11 +00:00
Daniel Nishi
4f2f6bcad9 Merge "Fix a bug where options menu was not showing." into oc-dev 2017-04-17 22:25:53 +00:00
Jeff Sharkey
b80f1ddaf0 Follow storage API polishing.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 37325923, 35812899, 35806020
Change-Id: I4965b7391018354157f0683a643a14c5e9cd338d
2017-04-17 14:29:15 -06:00
Daniel Nishi
e6740f740e Fix a bug where options menu was not showing.
There were two issues that stopped the options menu from
showing properly. First, the SettingsPreferenceFragment did
not call its super class, causing the Lifecycle methods to
never be called. Second, the options menu was not being
invalidated which also stopped the Lifecycle methods from
being called.

Change-Id: I29f2fc105c7ecae7adaccb2e4643e48646398d8d
Fixes: 37255835
Test: Robotest
2017-04-14 14:25:37 -07:00
Daniel Nishi
5b627f9ae5 Update the old Storage view to look better.
This removes the Manage Storage button and moves the titles of
the preferences to match the new progress bar location.

Bug: 2108251
Test: Manual
Change-Id: I1dce610050e44abd4665537e42a752bf34e94384
2017-04-13 16:49:15 -07:00
Daniel Nishi
95261b9239 Fix storage settings crash.
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.

Change-Id: I1b96b0697f4041be356260d6c675593affc1cb69
Merged-In: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes: 36793223
Fixes: 36793372
Test: Settings unit test
2017-04-13 13:21:26 -07:00
Daniel Nishi
c365a8735c Merge "Add a movies & tv apps category to storage settings." into oc-dev 2017-04-13 18:39:58 +00:00
Daniel Nishi
25b62b1126 Merge "Don't crash in SecondaryUserController." into oc-dev am: aa3685fe14
am: 129eb1773a

Change-Id: Iae6c55f2e6f26dc6b147d70c070109398c528636
2017-04-12 19:23:12 +00:00
Daniel Nishi
06470b68e0 Don't crash in SecondaryUserController.
If icons were fetched before displayPreference() is called, it can
cause a NPE. This adds a null check to ensure that it never
attempts to set an icon without both the icon and preference being
non-null.

Change-Id: Ib4269428e64545c9e255f7e3292fb6c046c1f307
Fixes: 37248158
Test: Settings Robotest
2017-04-12 09:33:32 -07:00
Daniel Nishi
89bec9c941 Fix storage settings crash.
It may crash if opened during the uninstall of an app. By catching
the exception which may occur, we can just skip the uninstalled app
and avoid crashing.

Change-Id: If556db7b5a299ba53a29baefbbe9709ba6d12190
Fixes: 36793223
Fixes: 36793372
Test: Settings unit test
2017-04-10 16:06:16 -07:00
Garfield Tan
a614491061 Merge "Fix the intent to launch storage details." into oc-dev am: 66871d8531
am: cea8a43a92

Change-Id: I29826b9af0264fd087a5cde19b9da7e26a9f8c3f
2017-04-10 21:05:13 +00:00
Garfield Tan
66871d8531 Merge "Fix the intent to launch storage details." into oc-dev 2017-04-10 20:24:20 +00:00
Daniel Nishi
84aba27da4 Merge "Add user icon to the other user preferences." into oc-dev am: b1c336de5f
am: f4af2774ee

Change-Id: I1ff26ce55a3b1ade531745e091e5c6e2de243593
2017-04-10 17:37:54 +00:00
Garfield Tan
973cddcb1b Fix the intent to launch storage details.
Test: Manual tests & robo tests.
Bug: 37164357
Change-Id: Ia73a6286edadb9c9e1691dcc0c9e391ce2981dee
2017-04-07 19:08:29 -07:00
Daniel Nishi
fe33c58a18 Add user icon to the other user preferences.
This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.

Fixes: 36252572
Test: Robotest

Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121
2017-04-07 14:57:07 -07:00
Doris Ling
0c39be8889 Merge "Update USb preference controller to use the new summary texts." into oc-dev am: e94ba3b55f
am: 8f3be96ba8

Change-Id: I6b8a83881fae1fea4cd1776fa28b354cae67dae9
2017-04-07 02:36:58 +00:00
TreeHugger Robot
e94ba3b55f Merge "Update USb preference controller to use the new summary texts." into oc-dev 2017-04-07 02:27:55 +00:00
Daniel Nishi
f6b12274f1 Re-add the option to migrate data back.
Currently, users can use an SD card or USB drive and adopt it as
internal storage using existing flows. They can manage this drive
perfectly fine using the old storage screen, which is still around.

One functionality that was lost was the ability to migrate data from
the adopted drive back to the private internal storage. This appeared
in a dropdown in the old storage settings.

By duplicating the code to create just that specific menu item and its
click behavior, we can restore this functionality to the new storage
view.

Change-Id: Id0e01c560e7249acccfe86c5da44466dd58fe5d4
Merged-In: I4b8c06912d2c0b2c5be5bce8b217d45accf34d4b
Fixes: 35926028
Test: Settings Robotest
2017-04-06 13:57:00 -07:00