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

Commit ed903213 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

More tweaks to match UX spec. 

Fixed text colors to match spec.  Behold The Greyening!  Centered
loader spinner in grid mode.  Show multiple lines in status messages.

Add string descriptions.  Fix bug where toggling size setting didn't
kick a UI rebind.

Bug: 10510022
Change-Id: Icb41ebeb4de0fed8c04fc6cf5213af1587b72641
parent cc8f710a

packages/DocumentsUI/res/layout/fragment_directory.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
        android:layout_height="match_parent"

        android:gravity="center"

        android:text="@string/empty"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:visibility="gone" />

        android:visibility="gone"

        style="@style/TextAppearance.Medium" />



    <ListView

        android:id="@+id/list"

packages/DocumentsUI/res/layout/item_doc_grid.xml

+5 −5
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ 
                android:layout_weight="1"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textAlignment="viewStart" />

                android:textAlignment="viewStart"

                style="@style/TextAppearance.Medium" />



            <ImageView

                android:id="@android:id/icon1"
@@ -107,7 +107,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />

                style="@style/TextAppearance.Small" />



            <TextView

                android:id="@+id/size"
@@ -119,7 +119,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />

                style="@style/TextAppearance.Small" />



            <TextView

                android:id="@android:id/summary"
@@ -131,7 +131,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />

                style="@style/TextAppearance.Small" />



        </LinearLayout>

packages/DocumentsUI/res/layout/item_doc_list.xml

+5 −5
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ 
                android:layout_weight="1"

                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textAlignment="viewStart" />

                android:textAlignment="viewStart"

                style="@style/TextAppearance.Medium" />



            <ImageView

                android:id="@android:id/icon1"
@@ -96,7 +96,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />

                style="@style/TextAppearance.Small" />



            <TextView

                android:id="@+id/size"
@@ -108,7 +108,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />

                style="@style/TextAppearance.Small" />



            <TextView

                android:id="@android:id/summary"
@@ -120,7 +120,7 @@ 
                android:singleLine="true"

                android:ellipsize="marquee"

                android:textAlignment="viewStart"

                android:textAppearance="?android:attr/textAppearanceSmall" />

                style="@style/TextAppearance.Small" />



        </LinearLayout>

packages/DocumentsUI/res/layout/item_loading_grid.xml

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

<!-- Copyright (C) 2013 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.

-->



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

    android:layout_width="match_parent"

    android:layout_height="@dimen/grid_height"

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

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

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

    android:paddingTop="8dip"

    android:paddingBottom="8dip"

    android:orientation="horizontal">



    <ProgressBar

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:indeterminate="true"

        style="?android:attr/progressBarStyle" />



</FrameLayout>