From 07f2086ecda884de8843eb03bc303e8db1022283 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 27 May 2021 10:27:24 +0800 Subject: [PATCH 1/6] Fix NPE at Storage Settings configuration change At configuration change, both StorageCategoryFragment and ProfileSelectStorageFragment are re-created and there is a different callback sequence than normal case. This change save/restore mSelectedStorageEntry in instance state bundle to fix the NPE. Bug: 189108700 Test: manual Install work profile and rotate Storage Settings. Change-Id: I39d7ef7ced22188ee66216d57518198d63671e0e --- .../settings/deviceinfo/StorageCategoryFragment.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/com/android/settings/deviceinfo/StorageCategoryFragment.java b/src/com/android/settings/deviceinfo/StorageCategoryFragment.java index ce8f2199187..9ae835e7a3f 100644 --- a/src/com/android/settings/deviceinfo/StorageCategoryFragment.java +++ b/src/com/android/settings/deviceinfo/StorageCategoryFragment.java @@ -73,6 +73,7 @@ public class StorageCategoryFragment extends DashboardFragment LoaderManager.LoaderCallbacks>, Preference.OnPreferenceClickListener { private static final String TAG = "StorageCategoryFrag"; + private static final String SELECTED_STORAGE_ENTRY_KEY = "selected_storage_entry_key"; private static final String SUMMARY_PREF_KEY = "storage_summary"; private static final String FREE_UP_SPACE_PREF_KEY = "free_up_space"; private static final int STORAGE_JOB_ID = 0; @@ -127,6 +128,10 @@ public class StorageCategoryFragment extends DashboardFragment mStorageManager = getActivity().getSystemService(StorageManager.class); + if (icicle != null) { + mSelectedStorageEntry = icicle.getParcelable(SELECTED_STORAGE_ENTRY_KEY); + } + initializePreference(); } @@ -167,6 +172,12 @@ public class StorageCategoryFragment extends DashboardFragment } } + @Override + public void onSaveInstanceState(Bundle outState) { + outState.putParcelable(SELECTED_STORAGE_ENTRY_KEY, mSelectedStorageEntry); + super.onSaveInstanceState(outState); + } + private void onReceivedSizes() { boolean stopLoading = false; if (mStorageInfo != null) { From ccd292083dd61e54251432c39ffd125539741917 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Thu, 27 May 2021 13:48:36 +0800 Subject: [PATCH 2/6] Fix the color problem at top/bottom border when page transition Fixes: 183361867 Test: manual test Change-Id: Ia1b418adaeacd68fa6904ace8a0b2818c2d9d9be --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f992e45c8e1..ba152150c72 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2448,7 +2448,7 @@ From 8610fff399d1c9bbe3048bd0a5ef62ecb2c65a94 Mon Sep 17 00:00:00 2001 From: Sunny Shao Date: Tue, 25 May 2021 21:31:30 +0800 Subject: [PATCH 3/6] Hide "Add link" item when have no addable items Fixes: 188115562 Test: manual test Change-Id: I9cfc634a50cc75d907f4563e1a9d9c1fa34d88fb --- .../applications/intentpicker/AppLaunchSettings.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java index 8683f56af79..439a6a31b40 100644 --- a/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java +++ b/src/com/android/settings/applications/intentpicker/AppLaunchSettings.java @@ -312,6 +312,7 @@ public class AppLaunchSettings extends AppInfoBase implements /** Initialize add link preference */ private void initAddLinkPreference() { mAddLinkPreference = findPreference(ADD_LINK_PREF_KEY); + mAddLinkPreference.setVisible(isAddLinksShown()); mAddLinkPreference.setEnabled(isAddLinksNotEmpty()); mAddLinkPreference.setOnPreferenceClickListener(preference -> { final int stateNoneLinksNo = getLinksNumber(DOMAIN_STATE_NONE); @@ -327,6 +328,10 @@ public class AppLaunchSettings extends AppInfoBase implements return getLinksNumber(DOMAIN_STATE_NONE) > 0; } + private boolean isAddLinksShown() { + return (isAddLinksNotEmpty() || getLinksNumber(DOMAIN_STATE_SELECTED) > 0); + } + private void showProgressDialogFragment() { final Bundle args = new Bundle(); args.putString(APP_PACKAGE_KEY, mPackageName); From 8fde6ca8218bd0e53083cefebf43c6ce85b86949 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Tue, 25 May 2021 00:53:54 +0800 Subject: [PATCH 4/6] Shows trash category in Storage Settings If there is APP which supports VIEW_TRASH intent, use it to show trash files. Otherwise popup a dialog to guide users to empty trash files. Bug: 189109564 Test: manual visual Observe size information are the same as files in Files APP. Observe if empty trash button empty trash files. Observe if Trash category update summary and order after emptying trash files. Change-Id: Ia3c46dcb1b4fadcdfb865f7dd315c27f8f98cb2c --- res/drawable/ic_trash_can.xml | 3 +- .../deviceinfo/StorageItemPreference.java | 12 +-- .../storage/EmptyTrashFragment.java | 73 +++++++++++++++++-- .../StorageItemPreferenceController.java | 27 +++++-- .../deviceinfo/storage/StorageUtils.java | 10 +++ 5 files changed, 101 insertions(+), 24 deletions(-) diff --git a/res/drawable/ic_trash_can.xml b/res/drawable/ic_trash_can.xml index ed4a4cbbd09..7829e1b9f8a 100644 --- a/res/drawable/ic_trash_can.xml +++ b/res/drawable/ic_trash_can.xml @@ -18,7 +18,8 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24" - android:viewportHeight="24"> + android:viewportHeight="24" + android:tint="?android:attr/colorControlNormal"> { - // TODO(170918505): Implement the logic in worker thread. - }).setNegativeButton(android.R.string.cancel, null) + .setMessage(getActivity().getString(R.string.storage_trash_dialog_ask_message, + StorageUtils.getStorageSizeLabel(getActivity(), mTrashSize))) + .setPositiveButton(R.string.storage_trash_dialog_confirm, + (dialog, which) -> emptyTrashAsync()) + .setNegativeButton(android.R.string.cancel, null) .create(); } + + private void emptyTrashAsync() { + final Context context = getActivity(); + final Context perUserContext; + try { + perUserContext = context.createPackageContextAsUser( + context.getApplicationContext().getPackageName(), + 0 /* flags= */, + UserHandle.of(mUserId)); + } catch (NameNotFoundException e) { + Log.e(TAG, "Not able to get Context for user ID " + mUserId); + return; + } + + final Bundle trashQueryArgs = new Bundle(); + trashQueryArgs.putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY); + ThreadUtils.postOnBackgroundThread(() -> { + perUserContext.getContentResolver().delete( + MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL), + trashQueryArgs); + if (mOnEmptyTrashCompleteListener == null) { + return; + } + ThreadUtils.postOnMainThread( + () -> mOnEmptyTrashCompleteListener.onEmptyTrashComplete()); + }); + } } diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index 67a5bb7f49d..d57d81ef7f8 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -32,6 +32,7 @@ import android.os.UserManager; import android.os.storage.VolumeInfo; import android.util.Log; import android.util.SparseArray; +import android.widget.Toast; import androidx.annotation.VisibleForTesting; import androidx.fragment.app.Fragment; @@ -64,7 +65,8 @@ import java.util.Map; * categorization breakdown. */ public class StorageItemPreferenceController extends AbstractPreferenceController implements - PreferenceControllerMixin { + PreferenceControllerMixin, + EmptyTrashFragment.OnEmptyTrashCompleteListener { private static final String TAG = "StorageItemPreference"; private static final String SYSTEM_FRAGMENT_TAG = "SystemInfo"; @@ -256,8 +258,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle mGamesPreference.setVisible(privateStoragePreferencesVisible); mDocumentsAndOtherPreference.setVisible(privateStoragePreferencesVisible); mSystemPreference.setVisible(privateStoragePreferencesVisible); - // TODO(b/170918505): Shows trash category after trash category feature complete. - mTrashPreference.setVisible(false); + mTrashPreference.setVisible(privateStoragePreferencesVisible); if (privateStoragePreferencesVisible) { final VolumeInfo sharedVolume = mSvp.findEmulatedForPrivate(mVolume); @@ -460,13 +461,29 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle private void launchTrashIntent() { final Intent intent = new Intent("android.settings.VIEW_TRASH"); - if (intent.resolveActivity(mPackageManager) == null) { - EmptyTrashFragment.show(mFragment); + if (mPackageManager.resolveActivityAsUser(intent, 0 /* flags */, mUserId) == null) { + final long trashSize = mTrashPreference.getStorageSize(); + if (trashSize > 0) { + new EmptyTrashFragment(mFragment, mUserId, trashSize, + this /* onEmptyTrashCompleteListener */).show(); + } else { + Toast.makeText(mContext, R.string.storage_trash_dialog_empty_message, + Toast.LENGTH_SHORT).show(); + } } else { mContext.startActivityAsUser(intent, new UserHandle(mUserId)); } } + @Override + public void onEmptyTrashComplete() { + if (mTrashPreference == null) { + return; + } + mTrashPreference.setStorageSize(0, mTotalSize); + updatePrivateStorageCategoryPreferencesOrder(); + } + private static long totalValues(StorageMeasurement.MeasurementDetails details, int userId, String... keys) { long total = 0; diff --git a/src/com/android/settings/deviceinfo/storage/StorageUtils.java b/src/com/android/settings/deviceinfo/storage/StorageUtils.java index 549eef61f7f..9b52fe803b1 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageUtils.java +++ b/src/com/android/settings/deviceinfo/storage/StorageUtils.java @@ -26,6 +26,8 @@ import android.os.storage.DiskInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; +import android.text.TextUtils; +import android.text.format.Formatter; import android.util.Log; import android.widget.Toast; @@ -115,6 +117,14 @@ public class StorageUtils { .launch(); } + /** Returns size label of changing units. (e.g., 1kB, 2MB, 3GB) */ + public static String getStorageSizeLabel(Context context, long bytes) { + final Formatter.BytesResult result = Formatter.formatBytes(context.getResources(), + bytes, Formatter.FLAG_SHORTER); + return TextUtils.expandTemplate(context.getText(R.string.storage_size_large), + result.value, result.units).toString(); + } + /** An AsyncTask to unmount a specified volume. */ public static class UnmountTask extends AsyncTask { private final Context mContext; From ccc8a93c6c8132a8b7459ff868099f3ee2cffb97 Mon Sep 17 00:00:00 2001 From: menghanli Date: Thu, 27 May 2021 08:48:22 +0800 Subject: [PATCH 5/6] Fix Magnification shortcut option content overlap with top and bottom dialog container Problem: After SuW theme applied, the scrollview viewport seems can draw outside of bounds. Solution: Define whether a child is limited to draw inside of its bounds or not. Test: Run initBCTestEnv_S.sh and apply different color Bug: 187007290 Change-Id: Ie3a27616d7f30804c30e5101d2488216df516578 --- res/layout/accessibility_edit_shortcut.xml | 36 +++--- ...essibility_edit_shortcut_magnification.xml | 105 +++++++++--------- 2 files changed, 75 insertions(+), 66 deletions(-) diff --git a/res/layout/accessibility_edit_shortcut.xml b/res/layout/accessibility_edit_shortcut.xml index 53a05f77726..d0c925ea4ec 100644 --- a/res/layout/accessibility_edit_shortcut.xml +++ b/res/layout/accessibility_edit_shortcut.xml @@ -15,28 +15,32 @@ limitations under the License --> - + android:layout_height="wrap_content" + android:clipChildren="true"> - + android:layout_height="match_parent" + android:scrollbarStyle="outsideOverlay"> - + android:orientation="vertical" + android:padding="24dp"> - + - + - + + + \ No newline at end of file diff --git a/res/layout/accessibility_edit_shortcut_magnification.xml b/res/layout/accessibility_edit_shortcut_magnification.xml index 31966e3ce4c..725c4c77d79 100644 --- a/res/layout/accessibility_edit_shortcut_magnification.xml +++ b/res/layout/accessibility_edit_shortcut_magnification.xml @@ -15,64 +15,69 @@ limitations under the License --> - + android:layout_height="wrap_content" + android:clipChildren="true"> - - - - - + android:layout_height="match_parent" + android:scrollbarStyle="outsideOverlay"> + android:orientation="vertical" + android:padding="24dp"> - - - + android:layout_height="wrap_content" + android:layout_marginBottom="32dp" /> + + + + + + + + + + + + - - - - - - + + \ No newline at end of file From 02200d29af4c96d6e2bf1143d15666dc3354bf43 Mon Sep 17 00:00:00 2001 From: menghanli Date: Thu, 27 May 2021 10:20:44 +0800 Subject: [PATCH 6/6] Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo Root cause: Use marginRight between icon and text, but it does not work for RTL launguage. Solution: Use margineEnd instead. Bug: 189221008 Test: Manual testing Change-Id: I02d30228c80c95aeb3b875364f2d2cbf76f3664b --- res/values/styles.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/styles.xml b/res/values/styles.xml index a5b187bf94e..7b8a75d947e 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -648,7 +648,7 @@