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

Merge "Improved UX for DISALLOW_SET_USER_ICON restriction." into nyc-dev am: 9abb6b0

Browse Source 
am: dfa04e2

* commit 'dfa04e2017b584b33dd11ae8da67e4578bdee5e0':
  Improved UX for DISALLOW_SET_USER_ICON restriction.

Change-Id: I403f6bb442e4e255c3f2daf70a9f88d8a02fe6e6
This commit is contained in:
Oleksandr Peletskyi
2016-04-14 20:29:11 +00:00
committed by android-build-merger
parent 3e8cbe9ef8 dfa04e2017
commit 00fabe1e63
3 changed files with 144 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/layout/edit_user_photo_popup_item.xml
View File

@@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 2013, 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.
*/
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/text1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:gravity="center_vertical"
android:paddingStart="16dip"
android:paddingEnd="16dip"
android:ellipsize="marquee"
/>

43
res/layout/restricted_popup_menu_item.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright 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.
*/
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="16dip"
android:paddingEnd="16dip">
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorAlertDialogListItem"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:ellipsize="marquee"
android:layout_alignParentLeft="true" />
<ImageView
android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size"
android:scaleType="centerInside"
android:src="@drawable/ic_info"
android:layout_alignParentRight="true"
android:visibility="gone" />
</RelativeLayout>