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

Commit 60a09ea2 authored by Jason Monk's avatar Jason Monk
Browse files

Start implementation of new app info storage page

Things are mostly in the right places, may need some minor location
adjustment on everything and styling for the buttons.

Bug: 19511439
Change-Id: If7730285d6ddc36e32cc8bc119885a8e215c0eb5
parent ad99996f
Loading
Loading
Loading
Loading
+58 −0
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.
-->

<!-- Clear cache section -->
<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/all_details"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
    android:orientation="vertical">

    <FrameLayout
        android:id="@+id/cache_size"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="8dip">
        <TextView
            android:text="@string/cache_size_label"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:maxLines="1"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:textColor="?android:textColorPrimary"
            android:gravity="center_vertical" />
        <TextView
            android:id="@+id/cache_size_text"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:gravity="right"
            android:maxLines="1" />
    </FrameLayout>

    <include
        android:id="@+id/clear_cache_button"
        layout="@layout/single_button_panel" />

    <Space
        android:layout_width="match_parent"
        android:layout_height="10dp" />

</LinearLayout>
+151 −0
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:id="@+id/all_details"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
    android:orientation="vertical">

    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/category_title"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dashboard_category_title_height"
        android:singleLine="true"
        android:gravity="center_vertical"
        android:textAppearance="@style/TextAppearance.CategoryTitle"
        android:textAlignment="viewStart"
        android:text="@string/storage_label"
        />

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="0dip">
        <TextView
            android:id="@+id/total_size_prefix"
            android:text="@string/total_size_label"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:textColor="?android:textColorPrimary"
            android:maxLines="1" />
        <TextView
            android:id="@+id/total_size_text"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:gravity="right"
            android:maxLines="1" />
    </FrameLayout>

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="3dip">
        <TextView
            android:id="@+id/application_size_prefix"
            android:text="@string/application_size_label"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:textColor="?android:textColorPrimary"
            android:maxLines="1" />
        <TextView
            android:id="@+id/application_size_text"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:gravity="right"
            android:maxLines="1" />
    </FrameLayout>

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="3dip">
        <TextView
            android:id="@+id/external_code_size_prefix"
            android:text="@string/external_code_size_label"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:textColor="?android:textColorPrimary"
            android:maxLines="1" />
        <TextView
            android:id="@+id/external_code_size_text"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:gravity="right"
            android:maxLines="1" />
    </FrameLayout>

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="3dip">
        <TextView
            android:id="@+id/data_size_prefix"
            android:text="@string/data_size_label"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:textColor="?android:textColorPrimary"
            android:maxLines="1" />
        <TextView
            android:id="@+id/data_size_text"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:gravity="right"
            android:maxLines="1" />
    </FrameLayout>

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:paddingTop="3dip">
        <TextView
            android:id="@+id/external_data_size_prefix"
            android:text="@string/external_data_size_label"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:textColor="?android:textColorPrimary"
            android:maxLines="1" />
        <TextView
            android:id="@+id/external_data_size_text"
            android:textAppearance="?android:attr/textAppearanceMedium"
            android:layout_height="wrap_content"
            android:layout_width="match_parent"
            android:gravity="right"
            android:maxLines="1" />
    </FrameLayout>

    <include
        android:id="@+id/clear_data_button"
        layout="@layout/single_button_panel" />

    <Space
        android:layout_width="match_parent"
        android:layout_height="10dp" />

</LinearLayout>
+43 −0
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.
-->

<!--
  Defines a panel with one button in the same layout as the two button layout.
-->

<LinearLayout
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:gravity="bottom"
        android:paddingTop="4dip"
        android:orientation="horizontal">
        <Button
            android:id="@+id/button"
            android:layout_width="120dip"
            android:layout_weight="0.4"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical" />
        <Space
            android:layout_width="0dip"
            android:layout_height="wrap_content"
            android:layout_weight="0.2" />
        <Space
            android:layout_width="120dip"
            android:layout_weight="0.4"
            android:layout_height="wrap_content"
            android:layout_gravity="center_vertical"/>
</LinearLayout>

res/layout/storage_settings.xml

deleted100644 → 0
+0 −306
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.
-->

<ScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:clipToPadding="false"
    android:scrollbarStyle="@integer/preference_scrollbar_style">

    <LinearLayout
        android:id="@+id/all_details"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:paddingStart="?android:attr/listPreferredItemPaddingStart"
        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
        android:paddingBottom="5dip"
        android:orientation="vertical">


        <TextView
            style="?android:attr/listSeparatorTextViewStyle"
            android:layout_marginTop="8dip"
            android:text="@string/storage_label" />


        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:baselineAligned="true"
                android:paddingTop="-1dip">
                <TextView
                    android:id="@+id/total_size_prefix"
                    android:text="@string/total_size_label"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1"
                    android:paddingTop="6dip" />
                <ImageView
                    android:id="@+id/info_size_dots"
                    android:src="@drawable/dotted_line_480px"
                    android:layout_width="0dip"
                    android:layout_weight="1"
                    android:layout_height="1px"
                    android:layout_gravity="bottom"
                    android:layout_marginStart="1dip"
                    android:layout_marginEnd="1dip"
                    android:layout_marginBottom="4dip"
                    android:scaleType="center"
                    android:contentDescription="@null" />
                <TextView
                    android:id="@+id/total_size_text"
                    android:paddingTop="6dip"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1" />
            </LinearLayout>

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:baselineAligned="true"
                android:paddingTop="-1dip">
                <TextView
                    android:id="@+id/application_size_prefix"
                    android:text="@string/application_size_label"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1"
                    android:paddingTop="6dip" />
                <ImageView
                    android:id="@+id/info_size_dots"
                    android:src="@drawable/dotted_line_480px"
                    android:layout_width="0dip"
                    android:layout_weight="1"
                    android:layout_height="1px"
                    android:layout_gravity="bottom"
                    android:layout_marginStart="1dip"
                    android:layout_marginEnd="1dip"
                    android:layout_marginBottom="4dip"
                    android:scaleType="center"
                    android:contentDescription="@null" />
                <TextView
                    android:id="@+id/application_size_text"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:paddingTop="6dip"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1" />
            </LinearLayout>

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:baselineAligned="true"
                android:paddingTop="-1dip">
                <TextView
                    android:id="@+id/external_code_size_prefix"
                    android:text="@string/external_code_size_label"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1"
                    android:paddingTop="6dip" />
                <ImageView
                    android:id="@+id/info_size_dots"
                    android:src="@drawable/dotted_line_480px"
                    android:layout_width="0dip"
                    android:layout_weight="1"
                    android:layout_height="1px"
                    android:layout_gravity="bottom"
                    android:layout_marginStart="1dip"
                    android:layout_marginEnd="1dip"
                    android:layout_marginBottom="4dip"
                    android:scaleType="center"
                    android:contentDescription="@null" />
                <TextView
                    android:id="@+id/external_code_size_text"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:paddingTop="6dip"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1" />
            </LinearLayout>

            <LinearLayout
                android:id="@+id/info_size"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:baselineAligned="true"
                android:paddingTop="-1dip">
                <TextView
                    android:id="@+id/data_size_prefix"
                    android:text="@string/data_size_label"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1"
                    android:paddingTop="6dip" />
                <ImageView
                    android:id="@+id/info_size_dots"
                    android:src="@drawable/dotted_line_480px"
                    android:layout_width="0dip"
                    android:layout_weight="1"
                    android:layout_height="1px"
                    android:layout_gravity="bottom"
                    android:layout_marginStart="1dip"
                    android:layout_marginEnd="1dip"
                    android:layout_marginBottom="4dip"
                    android:scaleType="center"
                    android:contentDescription="@null" />
                <TextView
                    android:id="@+id/data_size_text"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:paddingTop="6dip"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1" />
            </LinearLayout>

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:baselineAligned="true"
                android:paddingTop="-1dip">
                <TextView
                    android:id="@+id/external_data_size_prefix"
                    android:text="@string/external_data_size_label"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1"
                    android:paddingTop="6dip" />
                <ImageView
                    android:id="@+id/info_size_dots"
                    android:src="@drawable/dotted_line_480px"
                    android:layout_width="0dip"
                    android:layout_weight="1"
                    android:layout_height="1px"
                    android:layout_gravity="bottom"
                    android:layout_marginStart="1dip"
                    android:layout_marginEnd="1dip"
                    android:layout_marginBottom="4dip"
                    android:scaleType="center"
                    android:contentDescription="@null" />
                <TextView
                    android:id="@+id/external_data_size_text"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:paddingTop="6dip"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1" />
            </LinearLayout>

            <!-- Clear data and install location buttons  -->
            <include
                layout="@layout/two_buttons_panel"
                android:id="@+id/data_buttons_panel"/>

        </LinearLayout>


        <!-- Clear cache section -->
        <RelativeLayout
            android:id="@+id/cache_panel"
            android:layout_width="match_parent"
            android:layout_height="wrap_content" >
            <TextView
                android:id="@+id/cache_header"
                style="?android:attr/listSeparatorTextViewStyle"
                android:layout_marginTop="8dip"
                android:text="@string/cache_header_label" />
            <LinearLayout
                android:id="@+id/cache_size"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="horizontal"
                android:baselineAligned="true"
                android:layout_below="@id/cache_header"
                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                android:paddingTop="-1dip">
                <TextView
                    android:text="@string/cache_size_label"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:paddingTop="6dip"
                    android:gravity="center_vertical" />
                <ImageView
                    android:src="@drawable/dotted_line_480px"
                    android:layout_width="0dip"
                    android:layout_weight="1"
                    android:layout_height="1px"
                    android:layout_gravity="bottom"
                    android:layout_marginStart="1dip"
                    android:layout_marginEnd="1dip"
                    android:layout_marginBottom="4dip"
                    android:scaleType="center"
                    android:contentDescription="@null" />
                <TextView
                    android:id="@+id/cache_size_text"
                    android:textAppearance="?android:attr/textAppearanceMedium"
                    android:paddingTop="6dip"
                    android:layout_height="wrap_content"
                    android:layout_width="wrap_content"
                    android:maxLines="1" />
            </LinearLayout>

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_below="@id/cache_size"
                android:paddingStart="?android:attr/listPreferredItemPaddingStart"
                android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
                android:paddingTop="4dip"
                android:orientation="horizontal">
                <View
                    android:layout_width="120dip"
                    android:layout_height="0dip"
                    android:layout_weight="0.4" />
                <View
                    android:layout_width="0dip"
                    android:layout_height="0dip"
                    android:visibility="invisible"
                    android:layout_weight="0.2" />
                <Button
                    android:id="@+id/clear_cache_button"
                    android:layout_width="120dip"
                    android:layout_height="wrap_content"
                    android:layout_weight="0.4"
                    android:text="@string/clear_cache_btn_text" />
            </LinearLayout>

        </RelativeLayout>
    </LinearLayout>
</ScrollView>
+5 −2

File changed.

Preview size limit exceeded, changes collapsed.

Loading