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

Merge "Update Policy transparency dialog to new style" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-24 03:28:04 +00:00
committed by Android (Google) Code Review
parent 24f2dda922 de88f5244c
commit 9081a2e67d
4 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
res/layout/admin_support_details_dialog.xml
View File

@@ -13,45 +13,54 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="wrap_content" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:padding="@dimen/admin_details_dialog_padding" android:layout_height="wrap_content"
android:orientation="vertical"> android:paddingTop="@dimen/admin_details_dialog_padding"
android:paddingStart="@dimen/admin_details_dialog_padding"
android:paddingEnd="@dimen/admin_details_dialog_padding"
android:paddingBottom="@dimen/admin_details_dialog_padding_bottom"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:paddingBottom="@dimen/admin_details_dialog_title_bottom_padding">
<ImageView
android:id="@+id/admin_support_icon"
android:layout_width="@dimen/admin_details_dialog_icon_size"
android:layout_height="@dimen/admin_details_dialog_icon_size"
android:scaleType="fitCenter"
android:contentDescription="@null"/>
<TextView
android:id="@+id/admin_support_dialog_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_marginTop="16dp"
android:gravity="center_vertical" android:gravity="center_horizontal"
android:paddingBottom="@dimen/admin_details_dialog_title_bottom_padding"> android:text="@string/disabled_by_policy_title"
<ImageView android:id="@+id/admin_support_icon" android:textAppearance="@style/TextAppearance.AdminDialogTitle"/>
android:layout_width="@dimen/admin_details_dialog_icon_size"
android:layout_height="@dimen/admin_details_dialog_icon_size"
android:scaleType="fitCenter"
android:contentDescription="@null" />
<TextView android:id="@+id/admin_support_dialog_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="@dimen/admin_details_dialog_padding"
android:text="@string/disabled_by_policy_title"
android:textAppearance="@style/TextAppearance.HeadLineFontFamily"/>
</LinearLayout> </LinearLayout>
<ScrollView <ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadeScrollbars="false">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fadeScrollbars="false"> android:orientation="vertical">
<LinearLayout <TextView
android:id="@+id/admin_support_msg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:textAppearance="@style/TextAppearance.AdminDialogMessage"
<TextView android:id="@+id/admin_support_msg" android:maxLength="200"
android:layout_width="match_parent" android:gravity="center_horizontal"
android:layout_height="wrap_content" android:autoLink="email|phone|web"
android:textAppearance="@style/TextAppearance.HeadLineFontFamily.Subhead" android:textColor="?android:attr/textColorSecondary"/>
android:maxLength="200"
android:autoLink="email|phone|web"
android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

5
res/values/dimens.xml
View File

@@ -262,8 +262,9 @@
<!-- Admin support contact details dialog. --> <!-- Admin support contact details dialog. -->
<dimen name="admin_details_dialog_padding">24dp</dimen> <dimen name="admin_details_dialog_padding">24dp</dimen>
<dimen name="admin_details_dialog_title_bottom_padding">20dp</dimen> <dimen name="admin_details_dialog_padding_bottom">32dp</dimen>
<dimen name="admin_details_dialog_icon_size">48dp</dimen> <dimen name="admin_details_dialog_title_bottom_padding">16dp</dimen>
<dimen name="admin_details_dialog_icon_size">32dp</dimen>
<dimen name="admin_details_dialog_link_padding_top">36dp</dimen> <dimen name="admin_details_dialog_link_padding_top">36dp</dimen>
<dimen name="admin_details_dialog_learn_more_button_top_margin">24dp</dimen> <dimen name="admin_details_dialog_learn_more_button_top_margin">24dp</dimen>
<dimen name="admin_details_dialog_learn_more_button_padding">8dp</dimen> <dimen name="admin_details_dialog_learn_more_button_padding">8dp</dimen>

11
res/values/styles.xml
View File

@@ -871,4 +871,15 @@
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
</style> </style>
<style name="TextAppearance.AdminDialogTitle"
parent="@*android:style/TextAppearance.DeviceDefault.Title">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textSize">24sp</item>
</style>
<style name="TextAppearance.AdminDialogMessage"
parent="@*android:style/TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
</resources> </resources>

22
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -22,12 +22,8 @@ import android.app.Activity;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Process; import android.os.Process;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.IconDrawableFactory;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -38,7 +34,6 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -143,21 +138,8 @@ public class ActionDisabledByAdminDialogHelper {
@VisibleForTesting @VisibleForTesting
void setAdminSupportIcon(View root, ComponentName admin, int userId) { void setAdminSupportIcon(View root, ComponentName admin, int userId) {
ImageView supportIconView = root.requireViewById(R.id.admin_support_icon); ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);
if (isNotCurrentUserOrProfile(admin, userId)) { supportIconView.setImageDrawable(
supportIconView.setImageDrawable( mActivity.getDrawable(com.android.internal.R.drawable.ic_corp_badge));
mActivity.getDrawable(com.android.internal.R.drawable.ic_info));
TypedArray ta = mActivity.obtainStyledAttributes(new int[]{android.R.attr.colorAccent});
supportIconView.setImageTintList(ColorStateList.valueOf(ta.getColor(0, 0)));
ta.recycle();
} else {
final Drawable badgedIcon = Utils.getBadgedIcon(
IconDrawableFactory.newInstance(mActivity),
mActivity.getPackageManager(),
admin.getPackageName(),
userId);
supportIconView.setImageDrawable(badgedIcon);
}
} }
@VisibleForTesting @VisibleForTesting