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

Commit 1ed36d8b authored by Stanley Wang's avatar Stanley Wang
Browse files

Layout updated for file size text wrapping with largest display 

This solution will change the portrait layout for
large, larger, and largest of Display size.

Change-Id: Ib00b23553c34c1e69cb84e446f409c38ea7544ef
Fixes: 69074097
Test: manual
parent e57e4321

res/layout-land/storage_summary_donut.xml

0 → 100644
+78 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorPrimary"

    android:gravity="center_vertical"

    android:orientation="horizontal" >



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center_vertical"

        android:orientation="vertical"

        android:paddingStart="@dimen/preference_no_icon_padding_start"

        android:paddingEnd="@dimen/storage_summary_padding_end"

        android:paddingTop="32dp"

        android:paddingBottom="32dp" >



        <TextView

            android:id="@android:id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:singleLine="true"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Display1"

            android:textSize="36sp" />



        <TextView

            android:id="@android:id/summary"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:layout_marginEnd="4dp"

            android:maxLines="10"

            android:paddingBottom="20dp"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Body1" />



        <Button

            android:id="@+id/deletion_helper_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/summary"

            android:text="@string/storage_menu_free"

            style="@style/ActionPrimaryButton" />

    </LinearLayout>



    <com.android.settings.widget.DonutView

        android:id="@+id/donut"

        android:layout_width="112dp"

        android:layout_height="112dp"

        android:layout_marginEnd="32dp"

        android:gravity="end|center_vertical"

        android:minWidth="58dp"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />



</LinearLayout>

res/layout-sw360dp/storage_summary_donut.xml

0 → 100644
+78 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorPrimary"

    android:gravity="center_vertical"

    android:orientation="horizontal" >



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="center_vertical"

        android:orientation="vertical"

        android:paddingStart="@dimen/preference_no_icon_padding_start"

        android:paddingEnd="@dimen/storage_summary_padding_end"

        android:paddingTop="32dp"

        android:paddingBottom="32dp" >



        <TextView

            android:id="@android:id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:singleLine="true"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Display1"

            android:textSize="36sp" />



        <TextView

            android:id="@android:id/summary"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dp"

            android:layout_marginEnd="4dp"

            android:maxLines="10"

            android:paddingBottom="20dp"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Body1" />



        <Button

            android:id="@+id/deletion_helper_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_below="@android:id/summary"

            android:text="@string/storage_menu_free"

            style="@style/ActionPrimaryButton" />

    </LinearLayout>



    <com.android.settings.widget.DonutView

        android:id="@+id/donut"

        android:layout_width="112dp"

        android:layout_height="112dp"

        android:layout_marginEnd="32dp"

        android:gravity="end|center_vertical"

        android:minWidth="58dp"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />



</LinearLayout>

res/layout/storage_summary_donut.xml

+37 −53
Original line number Diff line number Diff line
@@ -18,19 +18,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/colorPrimary"

    android:gravity="center_vertical"

    android:orientation="horizontal" >



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:enabled="false"

        android:gravity="center_vertical"

        android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:gravity="center"

    android:orientation="vertical"

        android:paddingStart="@dimen/preference_no_icon_padding_start"

        android:paddingEnd="@dimen/storage_summary_padding_end"

    android:paddingTop="32dp"

    android:paddingBottom="32dp" >
@@ -42,7 +31,7 @@ 
        android:fadingEdge="horizontal"

        android:fontFamily="@*android:string/config_headlineFontFamily"

        android:singleLine="true"

            android:textAlignment="viewStart"

        android:textAlignment="center"

        android:textAppearance="@android:style/TextAppearance.Material.Display1"

        android:textSize="36sp" />
@@ -53,27 +42,22 @@ 
        android:layout_marginStart="4dp"

        android:layout_marginEnd="4dp"

        android:maxLines="10"

            android:paddingBottom="20dp"

            android:textAlignment="viewStart"

        android:textAlignment="center"

        android:textAppearance="@android:style/TextAppearance.Material.Body1" />



    <com.android.settings.widget.DonutView

        android:id="@+id/donut"

        android:layout_width="168dp"

        android:layout_height="168dp"

        android:layout_marginTop="4dp"

        android:layout_marginBottom="4dp"

        android:minWidth="58dp" />



    <Button

        android:id="@+id/deletion_helper_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

            android:layout_below="@android:id/summary"

        android:text="@string/storage_menu_free"

        style="@style/ActionPrimaryButton" />

    </LinearLayout>



    <com.android.settings.widget.DonutView

        android:id="@+id/donut"

        android:layout_width="112dp"

        android:layout_height="112dp"

        android:layout_marginEnd="32dp"

        android:gravity="end|center_vertical"

        android:minWidth="58dp"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />



</LinearLayout>

res/values-land/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -30,4 +30,9 @@ 
    <!-- Display, Screen zoom -->

    <dimen name="screen_zoom_preview_height">160dp</dimen>



    <!-- Text size of the big number in the donut. -->

    <dimen name="storage_donut_view_percent_text_size">30sp</dimen>

    <!-- Text size of the label text in the donut. -->

    <dimen name="storage_donut_view_label_text_size">14sp</dimen>



</resources>

res/values-sw400dp/dimens.xml→res/values-sw360dp/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -25,4 +25,8 @@ 
    <!-- Suggestion cards-->

    <dimen name="suggestion_card_padding_bottom_one_card">22dp</dimen>



    <!-- Text size of the big number in the donut. -->

    <dimen name="storage_donut_view_percent_text_size">30sp</dimen>

    <!-- Text size of the label text in the donut. -->

    <dimen name="storage_donut_view_label_text_size">14sp</dimen>

</resources>