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

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

Merge "Redo the empty states in print settings"

parents 25d95e0d 2f4f2692
Loading
Loading
Loading
Loading
−3.34 KiB
Loading image diff...
−3.34 KiB
Loading image diff...
−3.34 KiB
Loading image diff...
+34 −42
Original line number Diff line number Diff line
@@ -14,48 +14,40 @@
     limitations under the License.
-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/empty_print_state"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:visibility="gone">

    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_marginStart="16dp"
    android:layout_marginEnd="16dp"
    android:gravity="center"
    android:orientation="vertical">

    <ImageView
            android:id="@+id/icon"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginBottom="12dip"
            android:src="@drawable/ic_grayedout_printer"
            android:contentDescription="@null">
        </ImageView>
        android:layout_width="120dp"
        android:layout_height="110dp"
        android:layout_marginBottom="12dp"
        android:src="@*android:drawable/ic_print"
        android:scaleType="fitEnd"
        android:alpha="0.1"
        android:tint="?android:colorForeground"
        android:importantForAccessibility="no" />

    <TextView
        android:id="@+id/message"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginBottom="16dp"
        android:gravity="center"
        android:textAppearance="?android:attr/textAppearanceLarge"
            android:textColor="?android:attr/textColorSecondary">
        </TextView>
        android:textColor="?android:attr/textColorSecondary" />

        <Button android:id="@+id/add_new_service"
    <Button
        android:id="@+id/add_new_service"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
            android:layout_gravity="center"
            android:gravity="center"
            android:visibility="gone"
            style="?android:attr/buttonBarButtonStyle"
            android:textAppearance="?android:attr/textAppearanceSmall"
        style="?android:attr/borderlessButtonStyle"
        android:textColor="?android:attr/textColorSecondary"
        android:text="@string/print_menu_item_add_service"
            android:textAllCaps="true"
            />
        android:visibility="gone" />

</LinearLayout>

</FrameLayout>
+32 −39
Original line number Diff line number Diff line
@@ -14,45 +14,38 @@
     limitations under the License.
-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/empty_printers_list_service_enabled"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:visibility="gone">

    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_marginStart="16dp"
    android:layout_marginEnd="16dp"
    android:gravity="center"
    android:orientation="vertical">

    <ImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginBottom="12dip"
            android:src="@drawable/ic_grayedout_printer"
            android:importantForAccessibility="no">
        </ImageView>
        android:layout_width="120dp"
        android:layout_height="110dp"
        android:layout_marginBottom="12dp"
        android:src="@*android:drawable/ic_print"
        android:scaleType="fitEnd"
        android:alpha="0.1"
        android:tint="?android:colorForeground"
        android:importantForAccessibility="no"/>

    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
            android:layout_marginLeft="32dip"
            android:layout_marginRight="32dip"
        android:layout_marginBottom="16dp"
        android:gravity="center"
        android:textAppearance="?android:attr/textAppearanceLarge"
        android:textColor="?android:attr/textColorSecondary"
            android:text="@string/print_searching_for_printers">
        </TextView>
        android:text="@string/print_searching_for_printers"/>

    <ProgressBar
            android:layout_width="fill_parent"
        android:layout_width="300dp"
        android:layout_height="wrap_content"
        android:indeterminate="true"
            style="?android:attr/progressBarStyleHorizontal">
        </ProgressBar>
        android:importantForAccessibility="no"
        style="?android:attr/progressBarStyleHorizontal"/>

</LinearLayout>

</FrameLayout>
Loading