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

Commit 95d0b959 authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge "Make "Action not allowed" dialog compliant with Material Spec and... 

Merge "Make "Action not allowed" dialog compliant with Material Spec and replace full screen activities with the dialog." into pi-dev
parents 6a3bac39 e35badd9

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2955,7 +2955,7 @@ 
                       android:value="com.android.settings.applications.appinfo.ExternalSourcesDetails" />

        </activity>



        <activity android:name="ShowAdminSupportDetailsDialog"

        <activity android:name=".enterprise.ActionDisabledByAdminDialog"

                android:theme="@style/Transparent"

                android:excludeFromRecents="true"

                android:launchMode="singleTop">

res/layout/admin_support_details_content.xml

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

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

-->

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

    <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:text="@string/default_admin_support_msg"

            android:maxLength="200"

            android:autoLink="email|phone|web"

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

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

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

            android:clickable="true"

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

</merge>
 
 No newline at end of file

res/layout/admin_support_details_dialog.xml

+9 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:gravity="center_vertical"

            android:paddingBottom="@dimen/admin_details_dialog_padding">

            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"
@@ -46,7 +46,14 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">

            <include layout="@layout/admin_support_details_content" />

            <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:text="@string/default_admin_support_msg"

                      android:maxLength="200"

                      android:autoLink="email|phone|web"

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

        </LinearLayout>

    </ScrollView>

</LinearLayout>

res/layout/admin_support_details_empty_view.xml

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

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

-->

<!-- Layout used for displaying admin support details in empty preference fragments. -->

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

        android:id="@+id/admin_support_details"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:padding="@*android:dimen/preference_fragment_padding_side"

        android:gravity="center_vertical"

        android:orientation="vertical"

        android:visibility="gone">

    <include layout="@layout/admin_support_details_content" />

</LinearLayout>
 
 No newline at end of file

res/layout/preference_list_fragment.xml

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ 
        android:gravity="center_vertical"

        android:visibility="gone" />



    <include layout="@layout/admin_support_details_empty_view" />



    <RelativeLayout android:id="@+id/button_bar"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"