- Update conditional card layout - move action button from right side to bottom. - Get rid of the forking between small/big screens. - Update a few icons Fixes: 121189136 Fixes: 124315564 Fixes: 124316920 Test: visual Change-Id: I205d9995a2d7ed06ad9d32f3cea74f2840a28aed
60 lines
2.6 KiB
XML
60 lines
2.6 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2016 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<!-- Used by UserPreference to show the trash icon -->
|
|
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
|
<include layout="@layout/restricted_icon" />
|
|
|
|
<LinearLayout android:id="@+id/user_delete_widget"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal">
|
|
<View
|
|
android:id="@+id/divider_manage"
|
|
android:layout_width="2dip"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginTop="5dip"
|
|
android:layout_marginBottom="5dip"
|
|
android:background="@android:drawable/divider_horizontal_dark" />
|
|
<ImageView
|
|
android:id="@+id/manage_user"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="fill_parent"
|
|
android:paddingStart="16dip"
|
|
android:paddingEnd="16dip"
|
|
android:src="@drawable/ic_settings_accent"
|
|
android:contentDescription="@string/settings_label"
|
|
android:layout_gravity="center"
|
|
android:background="?android:attr/selectableItemBackground" />
|
|
<View
|
|
android:id="@+id/divider_delete"
|
|
android:layout_width="2dip"
|
|
android:layout_height="match_parent"
|
|
android:layout_marginTop="5dip"
|
|
android:layout_marginBottom="5dip"
|
|
android:background="@android:drawable/divider_horizontal_dark" />
|
|
<ImageView
|
|
android:id="@+id/trash_user"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="fill_parent"
|
|
android:paddingStart="16dip"
|
|
android:paddingEnd="16dip"
|
|
android:src="@drawable/ic_delete"
|
|
android:contentDescription="@string/user_delete_user_description"
|
|
android:layout_gravity="center"
|
|
android:background="?android:attr/selectableItemBackground" />
|
|
</LinearLayout>
|
|
</merge> |