Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de88f524 authored by Edgar Wang's avatar Edgar Wang
Browse files

Update Policy transparency dialog to new style 

- Tweak layout
- Update app icon
- Update font Size

Bug: 188756125
Test: manual
Change-Id: I7ddd73c80ead95d57202d1753408b437611a76b4
parent 8033a6ff

res/layout/admin_support_details_dialog.xml

+39 −30
Original line number Diff line number Diff line
@@ -13,28 +13,35 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

        android:padding="@dimen/admin_details_dialog_padding"

    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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="center_vertical"

        android:orientation="vertical"

        android:gravity="center_horizontal"

        android:paddingBottom="@dimen/admin_details_dialog_title_bottom_padding">

        <ImageView android:id="@+id/admin_support_icon"

        <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"

        <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:layout_marginTop="16dp"

            android:gravity="center_horizontal"

            android:text="@string/disabled_by_policy_title"

                android:textAppearance="@style/TextAppearance.HeadLineFontFamily"/>

            android:textAppearance="@style/TextAppearance.AdminDialogTitle"/>

    </LinearLayout>



    <ScrollView
@@ -45,11 +52,13 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <TextView android:id="@+id/admin_support_msg"

            <TextView

                android:id="@+id/admin_support_msg"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                      android:textAppearance="@style/TextAppearance.HeadLineFontFamily.Subhead"

                android:textAppearance="@style/TextAppearance.AdminDialogMessage"

                android:maxLength="200"

                android:gravity="center_horizontal"

                android:autoLink="email|phone|web"

                android:textColor="?android:attr/textColorSecondary"/>

        </LinearLayout>

res/values/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -262,8 +262,9 @@ 


    <!-- Admin support contact details dialog. -->

    <dimen name="admin_details_dialog_padding">24dp</dimen>

    <dimen name="admin_details_dialog_title_bottom_padding">20dp</dimen>

    <dimen name="admin_details_dialog_icon_size">48dp</dimen>

    <dimen name="admin_details_dialog_padding_bottom">32dp</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_learn_more_button_top_margin">24dp</dimen>

    <dimen name="admin_details_dialog_learn_more_button_padding">8dp</dimen>

res/values/styles.xml

+11 −0
Original line number Diff line number Diff line
@@ -871,4 +871,15 @@ 
        <item name="android:textSize">16sp</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </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>

src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java

+2 −20
Original line number Diff line number Diff line
@@ -22,12 +22,8 @@ import android.app.Activity; 
import android.app.admin.DevicePolicyManager;

import android.content.ComponentName;

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.UserHandle;

import android.util.IconDrawableFactory;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;
@@ -38,7 +34,6 @@ import androidx.annotation.VisibleForTesting; 
import androidx.appcompat.app.AlertDialog;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -143,21 +138,8 @@ public class ActionDisabledByAdminDialogHelper { 
    @VisibleForTesting

    void setAdminSupportIcon(View root, ComponentName admin, int userId) {

        ImageView supportIconView = root.requireViewById(R.id.admin_support_icon);

        if (isNotCurrentUserOrProfile(admin, userId)) {

        supportIconView.setImageDrawable(

                    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);

        }

                mActivity.getDrawable(com.android.internal.R.drawable.ic_corp_badge));

    }



    @VisibleForTesting