PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Layout updated for file size text wrapping with largest display

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

Change-Id: Ib00b23553c34c1e69cb84e446f409c38ea7544ef
Fixes: 69074097
Test: manual
This commit is contained in:
Stanley Wang
2018-08-27 17:05:49 +08:00
parent e57e432160
commit 1ed36d8b23
6 changed files with 202 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
res/layout-land/storage_summary_donut.xml Normal file
View File

@@ -0,0 +1,78 @@
<?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>

78
res/layout-sw360dp/storage_summary_donut.xml Normal file
View File

@@ -0,0 +1,78 @@
<?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>

38
res/layout/storage_summary_donut.xml
View File

@@ -18,19 +18,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:attr/colorPrimary" android:background="?android:attr/colorPrimary"
android:gravity="center_vertical" android:gravity="center"
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:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/preference_no_icon_padding_start"
android:paddingEnd="@dimen/storage_summary_padding_end"
android:paddingTop="32dp" android:paddingTop="32dp"
android:paddingBottom="32dp" > android:paddingBottom="32dp" >
@@ -42,7 +31,7 @@
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Display1" android:textAppearance="@android:style/TextAppearance.Material.Display1"
android:textSize="36sp" /> android:textSize="36sp" />
@@ -53,27 +42,22 @@
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:maxLines="10" android:maxLines="10"
android:paddingBottom="20dp" android:textAlignment="center"
android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" /> 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 <Button
android:id="@+id/deletion_helper_button" android:id="@+id/deletion_helper_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@android:id/summary"
android:text="@string/storage_menu_free" android:text="@string/storage_menu_free"
style="@style/ActionPrimaryButton" /> 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> </LinearLayout>

5
res/values-land/dimens.xml
View File

@@ -30,4 +30,9 @@
<!-- Display, Screen zoom --> <!-- Display, Screen zoom -->
<dimen name="screen_zoom_preview_height">160dp</dimen> <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> </resources>

4
res/values-sw400dp/dimens.xml → res/values-sw360dp/dimens.xml
View File

@@ -25,4 +25,8 @@
<!-- Suggestion cards--> <!-- Suggestion cards-->
<dimen name="suggestion_card_padding_bottom_one_card">22dp</dimen> <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> </resources>

4
res/values/dimens.xml
View File

@@ -274,11 +274,11 @@
<!-- Padding between the donut and the storage summary. --> <!-- Padding between the donut and the storage summary. -->
<dimen name="storage_summary_padding_end">16dp</dimen> <dimen name="storage_summary_padding_end">16dp</dimen>
<!-- Text size of the big number in the donut. --> <!-- Text size of the big number in the donut. -->
<dimen name="storage_donut_view_percent_text_size">30sp</dimen> <dimen name="storage_donut_view_percent_text_size">45sp</dimen>
<!-- Text size of the percentage sign in the donut. --> <!-- Text size of the percentage sign in the donut. -->
<dimen name="storage_donut_view_percent_sign_size">20sp</dimen> <dimen name="storage_donut_view_percent_sign_size">20sp</dimen>
<!-- Text size of the label text in the donut. --> <!-- Text size of the label text in the donut. -->
<dimen name="storage_donut_view_label_text_size">14sp</dimen> <dimen name="storage_donut_view_label_text_size">21sp</dimen>
<!-- Text size of the label text in the donut if the label text is long. --> <!-- Text size of the label text in the donut if the label text is long. -->
<dimen name="storage_donut_view_shrunken_label_text_size">10sp</dimen> <dimen name="storage_donut_view_shrunken_label_text_size">10sp</dimen>
<!-- The width of the storage summary donut --> <!-- The width of the storage summary donut -->