From c920a58d5f2207bdaa29d41ccc53e68d5bf9d08c Mon Sep 17 00:00:00 2001 From: Varun Shah Date: Fri, 5 Jun 2020 21:47:29 -0700 Subject: [PATCH] Add blob size to shared data dev options screens. Bug: 156671006 Test: make RunSettingsRoboTests ROBOTEST_FILTER=SharedDataPreferenceControllerTest Test: manual (visual) Change-Id: Ia98c3d9812f6225ee834b4d1b0f12a1a73a87598 --- res/layout/blob_list_item_view.xml | 7 +++++++ .../settings/development/storage/BlobInfoListView.java | 1 + .../settings/development/storage/BlobInfoViewHolder.java | 2 ++ .../settings/development/storage/LeaseInfoListView.java | 2 ++ .../settings/development/storage/SharedDataUtils.java | 5 +++++ .../storage/SharedDataPreferenceControllerTest.java | 3 ++- 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/res/layout/blob_list_item_view.xml b/res/layout/blob_list_item_view.xml index 897d19c2694..339c8ef7d0d 100644 --- a/res/layout/blob_list_item_view.xml +++ b/res/layout/blob_list_item_view.xml @@ -47,4 +47,11 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="?android:attr/textColorSecondary"/> + + diff --git a/src/com/android/settings/development/storage/BlobInfoListView.java b/src/com/android/settings/development/storage/BlobInfoListView.java index 8e312a25579..54579645f16 100644 --- a/src/com/android/settings/development/storage/BlobInfoListView.java +++ b/src/com/android/settings/development/storage/BlobInfoListView.java @@ -158,6 +158,7 @@ public class BlobInfoListView extends ListActivity { holder.blobId.setText(getString(R.string.blob_id_text, blob.getId())); holder.blobExpiry.setText(getString(R.string.blob_expires_text, SharedDataUtils.formatTime(blob.getExpiryTimeMs()))); + holder.blobSize.setText(SharedDataUtils.formatSize(blob.getSizeBytes())); return convertView; } } diff --git a/src/com/android/settings/development/storage/BlobInfoViewHolder.java b/src/com/android/settings/development/storage/BlobInfoViewHolder.java index de8c9a95a4b..073a138fe98 100644 --- a/src/com/android/settings/development/storage/BlobInfoViewHolder.java +++ b/src/com/android/settings/development/storage/BlobInfoViewHolder.java @@ -30,6 +30,7 @@ class BlobInfoViewHolder { TextView blobLabel; TextView blobId; TextView blobExpiry; + TextView blobSize; static BlobInfoViewHolder createOrRecycle(LayoutInflater inflater, View convertView) { if (convertView != null) { @@ -42,6 +43,7 @@ class BlobInfoViewHolder { holder.blobLabel = convertView.findViewById(R.id.blob_label); holder.blobId = convertView.findViewById(R.id.blob_id); holder.blobExpiry = convertView.findViewById(R.id.blob_expiry); + holder.blobSize = convertView.findViewById(R.id.blob_size); convertView.setTag(holder); return holder; } diff --git a/src/com/android/settings/development/storage/LeaseInfoListView.java b/src/com/android/settings/development/storage/LeaseInfoListView.java index ef9e5b813f2..b20bb65ff45 100644 --- a/src/com/android/settings/development/storage/LeaseInfoListView.java +++ b/src/com/android/settings/development/storage/LeaseInfoListView.java @@ -93,11 +93,13 @@ public class LeaseInfoListView extends ListActivity { final TextView blobLabel = headerView.findViewById(R.id.blob_label); final TextView blobId = headerView.findViewById(R.id.blob_id); final TextView blobExpiry = headerView.findViewById(R.id.blob_expiry); + final TextView blobSize = headerView.findViewById(R.id.blob_size); blobLabel.setText(mBlobInfo.getLabel()); blobLabel.setTypeface(Typeface.DEFAULT_BOLD); blobId.setText(getString(R.string.blob_id_text, mBlobInfo.getId())); blobExpiry.setVisibility(View.GONE); + blobSize.setText(SharedDataUtils.formatSize(mBlobInfo.getSizeBytes())); return headerView; } diff --git a/src/com/android/settings/development/storage/SharedDataUtils.java b/src/com/android/settings/development/storage/SharedDataUtils.java index 2f48f6d41fa..e0c038a1cfe 100644 --- a/src/com/android/settings/development/storage/SharedDataUtils.java +++ b/src/com/android/settings/development/storage/SharedDataUtils.java @@ -39,4 +39,9 @@ class SharedDataUtils { CALENDAR.setTimeInMillis(millis); return FORMATTER.format(CALENDAR.getTime()); } + + static String formatSize(long sizeBytes) { + final double sizeInMb = sizeBytes / (1024.0 * 1024.0); + return String.format("%.2f MB", sizeInMb); + } } diff --git a/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java index f11fb399689..c6a19c703e0 100644 --- a/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/storage/SharedDataPreferenceControllerTest.java @@ -113,7 +113,8 @@ public class SharedDataPreferenceControllerTest { accessors.add(two); final List tmp = new ArrayList<>(); - tmp.add(new BlobInfo(10, System.currentTimeMillis(), "testing blob 1", accessors)); + tmp.add(new BlobInfo(10, System.currentTimeMillis(), "testing blob 1", 54 * 1024 * 1024, + accessors)); return tmp; } }