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

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

Merge "Add progress bars and make them show something"

parents 9f45ce2b 2bac5c43
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@
        android:viewportWidth="92.0"
        android:viewportHeight="92.0">
    <path
        android:fillColor="#C8CCCE"
        android:fillColor="#000000"
        android:pathData="m23,69c0,2.11 1.72,3.83 3.83,3.83h3.83v13.42c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L42.17,72.83h7.67v13.42c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L61.33,72.83h3.83c2.11,0 3.83,-1.72 3.83,-3.83L69,30.67L23,30.67L23,69zM13.42,30.67c-3.18,0 -5.75,2.57 -5.75,5.75v26.83c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L19.17,36.42c0,-3.18 -2.57,-5.75 -5.75,-5.75zM78.58,30.67c-3.18,0 -5.75,2.57 -5.75,5.75v26.83c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L84.33,36.42c0,-3.18 -2.57,-5.75 -5.75,-5.75zM59.53,8.28 L64.53,3.28c0.75,-0.75 0.75,-1.95 0,-2.7 -0.75,-0.75 -1.95,-0.75 -2.7,0L56.16,6.23C53.09,4.72 49.66,3.84 46,3.84c-3.68,0 -7.13,0.88 -10.22,2.41L30.09,0.56c-0.75,-0.75 -1.95,-0.75 -2.7,0 -0.75,0.75 -0.75,1.95 0,2.7l5.02,5.02C26.72,12.48 23,19.23 23,26.84h46c0,-7.63 -3.74,-14.37 -9.47,-18.55zM38.33,19.17h-3.83v-3.83h3.83v3.83zM57.5,19.17h-3.83v-3.83h3.83v3.83z"/>
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@
        android:viewportWidth="92.0"
        android:viewportHeight="92.0">
    <path
        android:fillColor="#C8CCCE"
        android:fillColor="#000000"
        android:pathData="M34.5,61.99 L18.51,46 13.09,51.42 34.5,72.83l46,-46 -5.42,-5.42z"/>
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@
        android:viewportWidth="92.0"
        android:viewportHeight="92.0">
    <path
        android:fillColor="#C8CCCE"
        android:fillColor="#000000"
        android:pathData="M2,84H90L46,8 2,84zM50,72h-8v-8h8v8zM50,56H42V40h8v16z"/>
</vector>
+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@
                android:layout_height="wrap_content"
                android:layout_marginBottom="12dp"
                android:src="@drawable/ic_report_problem_92"
                android:tint="@color/bigIconColor"
                android:contentDescription="@null" />

        <TextView android:id="@+id/simple_status"
+5 −6
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@
    </LinearLayout>

    <LinearLayout
            android:id="@+id/center_view"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_weight="1"
@@ -58,19 +57,19 @@
            android:paddingRight="16dip">

        <ImageView
                android:id="@+id/center_icon"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_width="92dp"
                android:layout_height="92dp"
                android:layout_marginBottom="12dp"
                android:contentDescription="@null"
                android:src="@drawable/ic_android_92" />
                android:tint="@color/bigIconColor"
                android:src="@drawable/ic_file_download" />

        <ProgressBar
                android:id="@+id/progress_bar"
                style="?android:attr/progressBarStyleHorizontal"
                android:layout_width="250dp"
                android:layout_height="wrap_content"
                android:indeterminate="true" />
                android:indeterminate="false" />

        <TextView
                android:id="@+id/center_text"
Loading