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

Commit 7231147b authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Unbanish memory screen and new UX" into mnc-dev

parents e9866b6d beb171d2

res/layout/app_item_linear_color.xml

+16 −11
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
     limitations under the License.

-->



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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight"
@@ -34,16 +34,19 @@ 
        android:duplicateParentState="true" />



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:orientation="vertical"

        android:id="@+id/text_area"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_toEndOf="@android:id/icon"

        android:orientation="horizontal"

        android:duplicateParentState="true">



        <TextView

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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginTop="2dip"

            android:singleLine="true"

            android:ellipsize="marquee"
@@ -55,20 +58,22 @@ 
            android:id="@android:id/summary"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"

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

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

            android:textAlignment="viewStart"

            android:gravity="end|bottom"

            android:duplicateParentState="true" />



    </LinearLayout>



    <com.android.settings.applications.LinearColorBar

        android:id="@+id/linear_color_bar"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:layout_marginTop="5dp"

        android:layout_width="match_parent"

        android:layout_height="10dp"

        android:layout_marginTop="7dp"

        android:layout_marginBottom="5dp"

        android:layout_toEndOf="@android:id/icon"

        android:layout_below="@id/text_area"

        android:duplicateParentState="true" />



</LinearLayout>
 
</RelativeLayout>

res/layout/horizontal_preference.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ 
        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_weight="1"

        android:gravity="end" />

        android:gravity="end|bottom" />



</LinearLayout>

res/layout/proc_stats_ui.xml

+6 −16
Original line number Diff line number Diff line
@@ -28,28 +28,18 @@ 
        android:id="@+id/memory_state"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="20dp"

        android:layout_marginBottom="10dp"

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

        android:layout_marginTop="5dp"

        android:layout_marginBottom="5dp"

        android:textColor="?android:attr/colorAccent"

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

        />



    <com.android.settings.applications.LinearColorBar

        android:id="@+id/color_bar"

        android:layout_width="match_parent"

        android:layout_height="30dp"

        android:layout_height="28dp"

        android:layout_marginBottom="15dp"

        />



    <TextView

        android:id="@+id/memory_used"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="2dp"

        android:layout_marginBottom="10dp"

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

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

        />



    <include layout="@layout/memory_key" />



</LinearLayout>

res/layout/single_button_panel.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

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

        android:gravity="bottom"

        android:paddingTop="6dip"

        android:paddingBottom="6dip"

        android:paddingTop="8dip"

        android:paddingBottom="8dip"

        android:orientation="horizontal">

        <Button

            android:id="@+id/button"

res/values/arrays.xml

+6 −4
Original line number Diff line number Diff line
@@ -1225,13 +1225,15 @@ 
    <!-- [CHAR LIMIT=40] Labels for memory states -->

    <string-array name="ram_states">

        <!-- Normal desired memory state. -->

        <item>Good performance</item>

        <item>Normal</item>

        <!-- Moderate memory state, not as good as normal. -->

        <item>Ok performance</item>

        <item>Moderate</item>

        <!-- Memory is running low. -->

        <item>Poor performance</item>

        <item>Low</item>

        <!-- Memory is critical. -->

        <item>Very poor performance</item>

        <item>Critical</item>

        <!-- Unknown memory state -->

        <item>\?</item>

    </string-array>



    <array name="ram_colors">