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

Commit fc7188d8 authored by Fan Zhang's avatar Fan Zhang
Browse files

Clean up DeviceAdminSetting: make it into DashboardFragment 

Change-Id: Ib5634f782daef15ab317175084c6813d6b8a8bb7
Fixes: 110207366
Test: robo
parent 85a63957

res/layout/date_time_custom_list_item_2.xml

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

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

-->



<!-- Based on simple_list_item_2.xml in framework -->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

    android:gravity="center_vertical"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:orientation="vertical"

    android:paddingStart="@dimen/preference_no_icon_padding_start"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



    <TextView

        android:id="@android:id/text1"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceListItem" />



    <TextView

        android:id="@android:id/text2"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:textAppearance="?android:attr/textAppearanceListItemSecondary"

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



</LinearLayout>

res/layout/device_admin_item.xml

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

<!--

/*

** Copyright 2010, 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="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:orientation="horizontal"

    android:gravity="center_vertical" >



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="start|center_vertical"

        android:minWidth="60dp"

        android:orientation="horizontal"

        android:paddingEnd="12dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">



        <ImageView

            android:id="@+id/icon"

            android:layout_width="@dimen/secondary_app_icon_size"

            android:layout_height="@dimen/secondary_app_icon_size"

            android:layout_gravity="center_vertical"

            android:layout_marginEnd="8dip"

            android:contentDescription="@null" />



    </LinearLayout>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip"

        android:layout_weight="1">



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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:ellipsize="marquee"

            android:layout_alignParentTop="true"

            android:fadingEdge="horizontal" />



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

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="4dip"

            android:layout_below="@id/name"

            android:layout_alignStart="@id/name"

            android:textAppearance="?android:attr/textAppearanceSmall"

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

            android:maxLines="4" />



    </RelativeLayout>



    <Switch

        android:id="@+id/checkbox"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginStart="16dip"

        android:focusable="false"

        android:clickable="false" />



</LinearLayout>

res/layout/device_admin_settings.xml

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

<!-- Copyright (C) 2010 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="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="0px"

            android:layout_weight="1">



        <ListView android:id="@android:id/list"

                android:layout_width="match_parent" 

                android:layout_height="match_parent"

                android:scrollbarStyle="outsideOverlay"

                android:drawSelectorOnTop="false"

                android:fastScrollEnabled="true" />



        <TextView android:id="@android:id/empty"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:gravity="center"

                android:text="@string/no_device_admins"

                android:textAppearance="?android:attr/textAppearanceMedium" />



    </FrameLayout>



</LinearLayout>

res/values/bools.xml

+0 −3
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ 
    <!-- Whether touch_sounds should be shown or not. -->

    <bool name="config_show_touch_sounds">true</bool>



    <!-- Whether device_administrators should be shown or not. -->

    <bool name="config_show_device_administrators">true</bool>



    <!-- Whether encryption_and_credentials_encryption_status should be shown or not. -->

    <bool name="config_show_encryption_and_credentials_encryption_status">true</bool>

res/xml/device_admin_settings.xml

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

<!--

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

  -->



<PreferenceScreen

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

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

    android:title="@string/manage_device_admin"

    android:key="device_admin_settings">



    <PreferenceCategory

        android:key="device_admin_list"

        android:title="@string/summary_placeholder"

        settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminListPreferenceController" />



</PreferenceScreen>
 
 No newline at end of file