Merge "Refine the ProgressCategory" into oc-dev

am: 5f4f1b81af

Change-Id: I2b0fda608b8fe33eaa8ba6e7580c3becc1ebad71
This commit is contained in:
Lei Yu
2017-06-02 17:13:55 +00:00
committed by android-build-merger

View File

@@ -20,9 +20,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginBottom="16dp"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<LinearLayout <LinearLayout
@@ -56,6 +56,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="16dip" android:layout_marginStart="16dip"
android:minWidth="32dp"
android:text="@string/progress_scanning"/> android:text="@string/progress_scanning"/>
</LinearLayout> </LinearLayout>