Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef7b5e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add blob size to shared data dev options screens." into rvc-dev

parents 01464a1b c920a58d

res/layout/blob_list_item_view.xml

+7 −0
Original line number Diff line number Diff line
@@ -47,4 +47,11 @@ 
        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"/>



    <TextView

        android:id="@+id/blob_size"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"/>

</LinearLayout>

src/com/android/settings/development/storage/BlobInfoListView.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

        }

    }

src/com/android/settings/development/storage/BlobInfoViewHolder.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

    }

src/com/android/settings/development/storage/LeaseInfoListView.java

+2 −0
Original line number Diff line number Diff line
@@ -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;

    }

src/com/android/settings/development/storage/SharedDataUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -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);

    }

}