In App & content access page for restricted profiles, Location restriction should be shown without its parent element. Also fixed an issue when app summary may be incomplete. Bug:15761405,17182612 Change-Id: Ia298cf581413d124d25608f825f97a9e64baf479
		
			
				
	
	
		
			97 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
			
		
		
	
	
			97 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
| <?xml version="1.0" encoding="utf-8"?>
 | |
| <!-- Copyright (C) 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.
 | |
| -->
 | |
| 
 | |
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 | |
|     android:layout_width="match_parent"
 | |
|     android:layout_height="wrap_content"
 | |
|     android:minHeight="?android:attr/listPreferredItemHeight"
 | |
|     android:gravity="center_vertical"
 | |
|     android:orientation="vertical"
 | |
|     android:focusable="true"
 | |
|     android:clickable="true"
 | |
|     android:paddingStart="@dimen/settings_side_margin"
 | |
|     android:paddingEnd="@dimen/settings_side_margin" >
 | |
| 
 | |
|     <LinearLayout
 | |
|         android:layout_width="match_parent"
 | |
|         android:layout_height="match_parent"
 | |
|         android:layout_weight="1"
 | |
|         android:id="@+id/app_restrictions_pref"
 | |
|         android:gravity="center_vertical"
 | |
|         android:paddingStart="?android:attr/listPreferredItemPaddingStart"
 | |
|         android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
 | |
|         android:background="?android:attr/selectableItemBackground" >
 | |
|         <LinearLayout
 | |
|             android:layout_width="wrap_content"
 | |
|             android:layout_height="match_parent"
 | |
|             android:gravity="center"
 | |
|             android:minWidth="@*android:dimen/preference_icon_minWidth"
 | |
|             android:orientation="horizontal">
 | |
|             <ImageView
 | |
|                 android:id="@+android:id/icon"
 | |
|                 android:layout_width="48dp"
 | |
|                 android:layout_height="48dp"
 | |
|                 android:layout_gravity="center"
 | |
|                 android:minWidth="48dp"
 | |
|                 android:scaleType="centerInside"
 | |
|                 android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"
 | |
|                  />
 | |
|         </LinearLayout>
 | |
|         <RelativeLayout
 | |
|             android:layout_width="wrap_content"
 | |
|             android:layout_height="wrap_content"
 | |
|             android:layout_marginEnd="6dip"
 | |
|             android:layout_marginTop="6dip"
 | |
|             android:layout_marginBottom="6dip"
 | |
|             android:layout_weight="1">
 | |
|             <TextView
 | |
|                 android:id="@+android:id/title"
 | |
|                 android:layout_width="wrap_content"
 | |
|                 android:layout_height="wrap_content"
 | |
|                 android:singleLine="true"
 | |
|                 android:textAppearance="?android:attr/textAppearanceMedium"
 | |
|                 android:ellipsize="marquee"
 | |
|                 android:fadingEdge="horizontal"/>
 | |
|             <TextView
 | |
|                 android:id="@android:id/summary"
 | |
|                 android:layout_width="wrap_content"
 | |
|                 android:layout_height="wrap_content"
 | |
|                 android:layout_below="@android:id/title"
 | |
|                 android:layout_alignStart="@android:id/title"
 | |
|                 android:paddingBottom="3dip"
 | |
|                 android:textAppearance="?android:attr/textAppearanceSmall"
 | |
|                 android:textSize="13sp"
 | |
|                 android:textColor="?android:attr/textColorSecondary"
 | |
|                 android:focusable="false"
 | |
|                 android:text="@string/user_summary_restricted_profile"
 | |
|                 android:maxLines="4" />
 | |
|         </RelativeLayout>
 | |
|         <ImageView
 | |
|                 android:id="@+id/delete"
 | |
|                 android:layout_width="wrap_content"
 | |
|                 android:layout_height="fill_parent"
 | |
|                 android:paddingStart="16dip"
 | |
|                 android:paddingEnd="16dip"
 | |
|                 android:src="@drawable/ic_menu_delete"
 | |
|                 android:contentDescription="@string/user_delete_user_description"
 | |
|                 android:layout_gravity="center"
 | |
|                 android:background="?android:attr/selectableItemBackground" />
 | |
|     </LinearLayout>
 | |
|     <View android:layout_width="match_parent"
 | |
|           android:layout_height="2dp"
 | |
|           android:background="@color/divider_color" />
 | |
| </LinearLayout>
 |