* Update string and icon * Flip icon if languate is RTL e.g. Arabic * Add dialog when 'Remove app' is selected * Add Material Next theme to dialog * Update string terminology when removing a CA or user certificate to from 'remove' to 'uninstall' * Final UI tweaks to RequestManageCredentials screen Screenshots * Light mode: https://screenshot.googleplex.com/66QKFLhtn6ZueZQ * Dark mode: https://screenshot.googleplex.com/9kkTaaDV6CiHudF * RTL: https://screenshot.googleplex.com/AkwSibXakARYM8H * Request light mode: https://screenshot.googleplex.com/6n6raBQ8drXRHcU * Request dark mode: https://screenshot.googleplex.com/3bmWNoTwE6JBqAX Bug: 189416800 Test: atest CredentialManagementAppButtonsControllerTest manual testing with TestDPC Change-Id: I5450d33603418930e92b03c4447aaa1095afe9a3
		
			
				
	
	
		
			154 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
			
		
		
	
	
			154 lines
		
	
	
		
			5.9 KiB
		
	
	
	
		
			XML
		
	
	
	
	
	
<?xml version="1.0" encoding="utf-8"?>
 | 
						|
<!--
 | 
						|
  ~ Copyright (C) 2021 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"
 | 
						|
    xmlns:app="http://schemas.android.com/apk/res-auto"
 | 
						|
    android:layout_width="match_parent"
 | 
						|
    android:layout_height="match_parent"
 | 
						|
    android:orientation="vertical"
 | 
						|
    android:paddingTop="20dp"
 | 
						|
    android:paddingStart="30dp"
 | 
						|
    android:paddingEnd="30dp">
 | 
						|
 | 
						|
    <LinearLayout
 | 
						|
        android:layout_width="match_parent"
 | 
						|
        android:layout_height="wrap_content"
 | 
						|
        android:orientation="horizontal"
 | 
						|
        android:weightSum="2">
 | 
						|
 | 
						|
        <LinearLayout
 | 
						|
            android:layout_width="wrap_content"
 | 
						|
            android:layout_height="wrap_content"
 | 
						|
            android:layout_weight="1"
 | 
						|
            style="@style/RequestManageCredentialsHeaderLandscape">
 | 
						|
 | 
						|
            <ScrollView
 | 
						|
                android:layout_width="wrap_content"
 | 
						|
                android:layout_height="wrap_content"
 | 
						|
                android:scrollbars="none">
 | 
						|
 | 
						|
                <LinearLayout
 | 
						|
                    android:layout_width="wrap_content"
 | 
						|
                    android:layout_height="wrap_content"
 | 
						|
                    android:orientation="vertical">
 | 
						|
 | 
						|
                    <ImageView
 | 
						|
                        android:id="@+id/credential_management_app_icon"
 | 
						|
                        android:layout_width="48dp"
 | 
						|
                        android:layout_height="48dp"
 | 
						|
                        android:contentDescription="@null" />
 | 
						|
 | 
						|
                    <TextView
 | 
						|
                        android:id="@+id/credential_management_app_title"
 | 
						|
                        style="@style/RequestManageCredentialsTitle"
 | 
						|
                        android:layout_width="wrap_content"
 | 
						|
                        android:layout_height="wrap_content" />
 | 
						|
 | 
						|
                    <TextView
 | 
						|
                        android:id="@+id/credential_management_app_description"
 | 
						|
                        style="@style/RequestManageCredentialsDescription"
 | 
						|
                        android:layout_width="wrap_content"
 | 
						|
                        android:layout_height="wrap_content"
 | 
						|
                        android:text="@string/request_manage_credentials_description" />
 | 
						|
 | 
						|
                </LinearLayout>
 | 
						|
 | 
						|
            </ScrollView>
 | 
						|
 | 
						|
        </LinearLayout>
 | 
						|
 | 
						|
        <LinearLayout
 | 
						|
            android:layout_width="wrap_content"
 | 
						|
            android:layout_height="match_parent"
 | 
						|
            android:layout_weight="1">
 | 
						|
 | 
						|
            <RelativeLayout
 | 
						|
                android:layout_width="match_parent"
 | 
						|
                android:layout_height="match_parent"
 | 
						|
                android:orientation="vertical">
 | 
						|
 | 
						|
                <androidx.coordinatorlayout.widget.CoordinatorLayout
 | 
						|
                    android:layout_width="match_parent"
 | 
						|
                    android:layout_height="wrap_content"
 | 
						|
                    android:clipChildren="true">
 | 
						|
 | 
						|
                    <androidx.recyclerview.widget.RecyclerView
 | 
						|
                        android:id="@+id/apps_list"
 | 
						|
                        android:layout_width="match_parent"
 | 
						|
                        android:layout_height="match_parent" />
 | 
						|
 | 
						|
                    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
 | 
						|
                        android:id="@+id/extended_fab"
 | 
						|
                        style="@style/RequestManageCredentialsFab"
 | 
						|
                        android:layout_width="wrap_content"
 | 
						|
                        android:layout_height="wrap_content"
 | 
						|
                        android:text="@string/request_manage_credentials_more"
 | 
						|
                        android:textColor="?android:attr/colorBackground"
 | 
						|
                        android:theme="@style/Theme.CollapsingToolbar.Settings"
 | 
						|
                        app:backgroundTint="?android:attr/colorAccent"
 | 
						|
                        app:elevation="3dp"
 | 
						|
                        app:icon="@drawable/ic_arrow_downward"
 | 
						|
                        app:iconTint="?android:attr/colorBackground"
 | 
						|
                        app:layout_anchor="@id/apps_list"
 | 
						|
                        app:layout_anchorGravity="bottom|center" />
 | 
						|
 | 
						|
                </androidx.coordinatorlayout.widget.CoordinatorLayout>
 | 
						|
 | 
						|
            </RelativeLayout>
 | 
						|
 | 
						|
        </LinearLayout>
 | 
						|
 | 
						|
    </LinearLayout>
 | 
						|
 | 
						|
    <Space
 | 
						|
        android:layout_width="match_parent"
 | 
						|
        android:layout_height="0dp"
 | 
						|
        android:layout_weight="1"/>
 | 
						|
 | 
						|
    <LinearLayout
 | 
						|
        android:id="@+id/button_panel"
 | 
						|
        style="@style/RequestManageCredentialsButtonPanel"
 | 
						|
        android:layout_width="match_parent"
 | 
						|
        android:layout_height="0dp"
 | 
						|
        android:layout_weight="1"
 | 
						|
        android:gravity="center|bottom">
 | 
						|
 | 
						|
        <Button
 | 
						|
            android:id="@+id/dont_allow_button"
 | 
						|
            style="@style/RequestManageCredentialsDontAllowButton"
 | 
						|
            android:layout_width="wrap_content"
 | 
						|
            android:layout_height="wrap_content"
 | 
						|
            android:text="@string/request_manage_credentials_dont_allow" />
 | 
						|
 | 
						|
        <Space
 | 
						|
            android:layout_width="0dp"
 | 
						|
            android:layout_height="0dp"
 | 
						|
            android:layout_weight="1"
 | 
						|
            android:visibility="invisible" />
 | 
						|
 | 
						|
        <Button
 | 
						|
            android:id="@+id/allow_button"
 | 
						|
            style="@style/RequestManageCredentialsAllowButton"
 | 
						|
            android:theme="@style/RoundedCornerButtonTheme"
 | 
						|
            android:layout_width="wrap_content"
 | 
						|
            android:layout_height="wrap_content"
 | 
						|
            android:text="@string/request_manage_credentials_allow" />
 | 
						|
 | 
						|
    </LinearLayout>
 | 
						|
 | 
						|
</LinearLayout>
 |