Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d298d61294
1 changed files with 2 additions and 2 deletions
|
@ -54,7 +54,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Location path \u2022 300 MB"
|
android:text="Location path \u2022 300 MB"
|
||||||
android:textColor="@color/color_white"
|
android:textColor="@color/color_white"
|
||||||
android:textSize="@dimen/default_sub_text_size" />
|
android:textSize="@dimen/default_list_text_size" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
android:paddingTop="3dp"
|
android:paddingTop="3dp"
|
||||||
android:id="@+id/android_19_location_changed"
|
android:id="@+id/android_19_location_changed"
|
||||||
android:text="@string/android_19_location_disabled"
|
android:text="@string/android_19_location_disabled"
|
||||||
android:textSize="@dimen/default_sub_text_size" />
|
android:textSize="@dimen/default_list_text_size" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/divider"
|
android:id="@+id/divider"
|
||||||
|
|
Loading…
Reference in a new issue