Also re-enable and fix tests. Test: manual Fixes: 226183482 Fixes: 218799125 Fixes: 219375624 Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
		
			
				
	
	
		
			37 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
			
		
		
	
	
			37 lines
		
	
	
		
			1.8 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.
 | |
| -->
 | |
| <!-- Layout used as footer in listpreference dialog to denote that some of the options
 | |
|      are diabled by admin. -->
 | |
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 | |
|         android:id="@+id/admin_disabled_other_options"
 | |
|         android:layout_width="match_parent"
 | |
|         android:layout_height="wrap_content"
 | |
|         android:paddingStart="?android:attr/dialogPreferredPadding"
 | |
|         android:paddingEnd="?android:attr/dialogPreferredPadding"
 | |
|         android:orientation="vertical">
 | |
|     <TextView
 | |
|             android:layout_width="match_parent"
 | |
|             android:layout_height="wrap_content"
 | |
|             android:id="@+id/admin_disabled_other_options_text"
 | |
|             android:text="@string/admin_disabled_other_options" />
 | |
|     <TextView android:id="@+id/admin_more_details_link"
 | |
|             android:layout_width="wrap_content"
 | |
|             android:layout_height="wrap_content"
 | |
|             android:text="@string/admin_more_details"
 | |
|             android:textColor="?android:attr/colorAccent"
 | |
|             android:clickable="true"
 | |
|             android:background="?android:attr/selectableItemBackground" />
 | |
| </LinearLayout> |