PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix various UX bugs." into nyc-dev

Browse Source
This commit is contained in:
Mihai Niță
2016-02-24 16:08:16 +00:00
committed by Android (Google) Code Review
parent cc81fb8875 a475fb1e06
commit ceb80c9888
5 changed files with 106 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/locale_drag_cell.xml
View File

@@ -40,12 +40,11 @@
<TextView
android:id="@+id/miniLabel"
style="@style/LanguageCheckboxAndLabel"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
tools:text="22"
android:textColor="?android:attr/colorAccent"
android:minWidth="32sp"
android:minWidth="24sp"
android:gravity="center_vertical|center_horizontal"
android:layout_alignTop="@id/checkbox"
android:layout_alignBottom="@id/checkbox"/>

57
res/layout/locale_order_list.xml
View File

@@ -14,33 +14,38 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:orientation="vertical"
android:layoutDirection="locale"
android:textDirection="locale">
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layoutDirection="locale"
android:textDirection="locale">
<com.android.settings.localepicker.LocaleRecyclerView
android:id="@+id/dragList"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:scrollbars="vertical"/>
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<Button
android:id="@+id/add_language"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:drawableStart="@drawable/ic_add_24dp"
android:drawablePadding="24dp"
android:textAlignment="textStart"
android:text="@string/add_a_language"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:textAppearance="?android:attr/textAppearanceListItem"/>
<com.android.settings.localepicker.LocaleRecyclerView
android:id="@+id/dragList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="vertical"/>
</LinearLayout>
<Button
android:id="@+id/add_language"
android:layout_width="match_parent"
android:layout_height="?android:listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:drawableStart="@drawable/ic_add_24dp"
android:drawablePadding="24dp"
android:textAlignment="textStart"
android:text="@string/add_a_language"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:textAppearance="?android:attr/textAppearanceListItem"/>
</LinearLayout>
</ScrollView>