Merge "Improve multi user functionality for restricted users" into rvc-dev (f1fbba45) · Commits · e / os / android_packages_apps_Settings

res/layout/edit_user_info_dialog_content.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		android:layout_width="56dip"
		android:layout_height="56dip"
		android:layout_gravity="bottom"
		android:layout_marginEnd="6dp"
		android:contentDescription="@string/user_image_photo_selector"
		android:background="@*android:drawable/spinner_background_holo_dark"
		android:scaleType="fitCenter"/>

res/layout/user_info_header.xml

deleted100644 → 0

+0 −129

Original line number	Diff line number	Diff line
		<?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"
		xmlns:tools="http://schemas.android.com/tools"
		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" >

		<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"
		tools:text="Richard"
		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_delete"
		android:contentDescription="@string/user_delete_user_description"
		android:layout_gravity="center"
		android:background="?android:attr/selectableItemBackground" />
		</LinearLayout>

		<LinearLayout
		android:id="@+id/switch_pref"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center_vertical"
		android:visibility="gone"
		tools:visibility="visible"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:background="?android:attr/selectableItemBackground" >

		<ImageView
		android:id="@+id/switchIcon"
		android:layout_width="48dp"
		android:layout_height="48dp"
		android:layout_gravity="center"
		android:src="@drawable/ic_swap"
		android:minWidth="48dp"
		android:scaleType="centerInside"
		android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"/>

		<TextView
		android:id="@+id/switchTitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		tools:text="Switch to Richard"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal"/>

		</LinearLayout>

		<View android:layout_width="match_parent"
		android:layout_height="2dp"
		android:background="@color/divider_color" />
		</LinearLayout>

res/xml/user_details_settings.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,10 @@
		android:key="enable_calling"
		android:icon="@drawable/ic_phone"
		android:title="@string/user_enable_calling_sms" />
		<com.android.settingslib.RestrictedPreference
		android:key="app_and_content_access"
		android:icon="@drawable/ic_lock_closed"
		android:title="@string/user_restrictions_title" />
		<com.android.settingslib.RestrictedPreference
		android:key="remove_user"
		android:icon="@drawable/ic_delete"

src/com/android/settings/SettingsLicenseActivity.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import androidx.fragment.app.FragmentActivity;
		import androidx.loader.app.LoaderManager;
		import androidx.loader.content.Loader;

		import com.android.settings.users.RestrictedProfileSettings;
		import com.android.settingslib.license.LicenseHtmlLoaderCompat;

		import java.io.File;
		@@ -78,7 +77,7 @@ public class SettingsLicenseActivity extends FragmentActivity implements

		@VisibleForTesting
		Uri getUriFromGeneratedHtmlFile(File generatedHtmlFile) {
		return FileProvider.getUriForFile(this, RestrictedProfileSettings.FILE_PROVIDER_AUTHORITY,
		return FileProvider.getUriForFile(this, Utils.FILE_PROVIDER_AUTHORITY,
		generatedHtmlFile);
		}

src/com/android/settings/Utils.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -116,6 +116,8 @@ public final class Utils extends com.android.settingslib.Utils {

		private static final String TAG = "Settings";

		public static final String FILE_PROVIDER_AUTHORITY = "com.android.settings.files";

		/**
		* Set the preference's title to the matching activity's label.
		*/