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

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

Merge "Cleanup Storage Settings" into sc-dev

parents 3909ddb7 192fd24f

AndroidManifest.xml

+0 −7
Original line number Diff line number Diff line
@@ -1979,13 +1979,6 @@ 
                android:value="true" />

        </activity>



        <activity

            android:name="Settings$PrivateVolumeSettingsActivity"

            android:label="@string/storage_settings_title">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.deviceinfo.PrivateVolumeSettings" />

        </activity>



        <activity

            android:name="Settings$PublicVolumeSettingsActivity"

            android:exported="true"

res/layout-land/storage_summary_donut.xml

deleted100644 → 0
+0 −77
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: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.DeviceDefault.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.DeviceDefault.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_manage"

            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

deleted100644 → 0
+0 −77
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: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.DeviceDefault.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.DeviceDefault.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_manage"

            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/preference_storage_action.xml

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

<!-- Copyright (C) 2015 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="wrap_content"

    android:layout_height="match_parent"

    android:orientation="horizontal">



    <ImageView

        android:id="@+id/unmount"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"

        android:paddingStart="16dip"

        android:paddingEnd="16dip"

        android:contentDescription="@string/storage_menu_unmount"

        android:layout_gravity="center"

        android:gravity="center"

        android:src="@drawable/ic_eject_24dp"

        android:background="?android:attr/selectableItemBackground" />



</LinearLayout>

res/layout/storage_summary_donut.xml

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

<!-- Copyright (C) 2016 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:gravity="center"

    android:orientation="vertical"

    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="center"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.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:textAlignment="center"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.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:text="@string/storage_menu_manage"

        style="@style/ActionPrimaryButton" />



</LinearLayout>