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

Commit 9159fe9a authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Kenny Guy
Browse files

Add support for showing the admin disabling settings. 

For settings disabled by user restrictions show
the user a lock icon and allow them to click to
find more info.

Bug: 22543585

Change-Id: Ie8b02ac26f2b22db386a9044f3c6570098f6e14b
parent f467c0ac

AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -2646,5 +2646,15 @@ 
                android:value="com.android.settings.applications.WriteSettingsDetails" />

        </activity>



        <activity android:name="ShowAdminSupportDetailsDialog"

                android:theme="@style/Transparent"

                android:excludeFromRecents="true">



            <intent-filter>

                <action android:name="android.app.action.SHOW_ADMIN_SUPPORT_DETAILS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>



    </application>

</manifest>

res/drawable/ic_settings_lock_outline.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2015 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.

-->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="22.0"

        android:tint="?android:attr/colorAccent">

    <path

            android:fillColor="@android:color/white"

            android:pathData="M12 17c1.1 0 2-.9 2-2s-.9-2-2-2-2 .9-2 2 .9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zM8.9 6c0-1.71 1.39-3.1 3.1-3.1s3.1 1.39 3.1 3.1v2H8.9V6zM18 20H6V10h12v10z" />

</vector>

res/layout/admin_support_details_dialog.xml

0 → 100644
+70 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 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"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:padding="@dimen/admin_details_dialog_padding"

        android:orientation="vertical">

    <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="center_vertical"

            android:paddingBottom="@dimen/admin_details_dialog_padding">

        <ImageView

                android:layout_width="@dimen/admin_details_dialog_icon_size"

                android:layout_height="@dimen/admin_details_dialog_icon_size"

                android:src="@drawable/ic_settings_lock_outline"

                android:scaleType="fitCenter"

                android:contentDescription="@null" />

        <TextView

                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="@android:style/TextAppearance.Material.Title" />

    </LinearLayout>



    <ScrollView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:fadeScrollbars="false">

        <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">

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

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

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

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

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

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

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

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:paddingTop="@dimen/admin_details_dialog_link_padding_top"

                    android:text="@string/list_of_administrators"

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

                    android:textColor="?android:attr/colorAccent"

                    android:clickable="true"

                    android:background="?android:attr/selectableItemBackground" />

        </LinearLayout>

    </ScrollView>

</LinearLayout>
 
 No newline at end of file

res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -114,4 +114,8 @@ 
        <attr name="android:entries" />

        <attr name="android:entryValues" />

    </declare-styleable>



    <declare-styleable name="RestrictedPreference">

        <attr name="userRestriction" format="string"/>

    </declare-styleable>

</resources>

res/values/dimens.xml

+9 −0
Original line number Diff line number Diff line
@@ -250,6 +250,15 @@ 
    <dimen name="shortcut_size">40dp</dimen>

    <dimen name="badge_size">10dp</dimen>



    <!-- Lock icon for preferences locked by admin -->

    <dimen name="restricted_lock_icon_size">16dp</dimen>

    <dimen name="restricted_lock_icon_padding">4dp</dimen>



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

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

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

    <dimen name="admin_details_dialog_link_padding_top">36dp</dimen>



    <!-- Button bar padding for unmount button. -->

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

</resources>