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

Commit fb6f4744 authored by Arne Coucheron's avatar Arne Coucheron
Browse files

Revert "Settings: Add ProfileMgr in Settings Root Screen." 

This reverts commit a637c44a.

Change-Id: I2a41075613ffa5f4703d74e387c04e2dd6dcafe2
parent 811266b1

AndroidManifest.xml

+0 −21
Original line number Diff line number Diff line
@@ -1319,27 +1319,6 @@ 
                android:value="com.android.settings.applications.BackgroundCheckSummary" />

        </activity>



        <activity android:name="Settings$ProfileMgrMainActivity"

                android:label="@string/profiles_settings_title"

                android:icon="@drawable/ic_settings_profiles"

                android:enabled="false"

                android:taskAffinity="">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

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

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="3">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.personal" />

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.ProfileMgrMain" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <!-- Still need a top-level activity for showing app ops details.  Aliasing

             trick is so the code that is now a fragment can still be called

             AppOpsDetails. -->

res/drawable/ic_settings_profiles.xml

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

<!-- Copyright (c) 2016, The Linux Foundation. All rights reserved.



     Redistribution and use in source and binary forms, with or without

     modification, are permitted provided that the following conditions are

     met:

         * Redistributions of source code must retain the above copyright

           notice, this list of conditions and the following disclaimer.

         * Redistributions in binary form must reproduce the above

           copyright notice, this list of conditions and the following

           disclaimer in the documentation and/or other materials provided

           with the distribution.

         * Neither the name of The Linux Foundation nor the names of its

           contributors may be used to endorse or promote products derived

           from this software without specific prior written permission.



     THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED

     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT

     ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS

     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR

     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE

     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN

     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-->

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

    android:height="48dp"

    android:viewportHeight="48"

    android:viewportWidth="48"

    android:width="48dp" >



    <path

        android:fillColor="#019587"

        android:pathData="M44.132,34.753c0.033-0.271,0.06-0.543,0.06-0.831c0-0.278-0.026-0.558-0.06-0.828l1.784-1.397

                c0.162-0.127,0.203-0.354,0.103-0.54l-1.692-2.93c-0.102-0.187-0.33-0.255-0.518-0.187l-2.106,0.846

                c-0.44-0.336-0.913-0.616-1.431-0.828l-0.313-2.242c-0.034-0.203-0.21-0.354-0.423-0.354h-3.385c-0.212,0-0.39,0.151-0.415,0.354

                l-0.313,2.242c-0.517,0.212-0.99,0.5-1.431,0.828l-2.108-0.846c-0.193-0.075-0.413,0-0.515,0.187l-1.692,2.93

                c-0.109,0.186-0.06,0.414,0.101,0.54l1.787,1.397c-0.034,0.271-0.061,0.55-0.061,0.828c0,0.28,0.026,0.56,0.061,0.831l-1.787,1.394

                c-0.16,0.127-0.202,0.356-0.101,0.543l1.692,2.929c0.11,0.186,0.33,0.253,0.515,0.186l2.108-0.847

                c0.44,0.337,0.914,0.617,1.431,0.828l0.313,2.244c0.034,0.202,0.212,0.355,0.415,0.355h3.385c0.213,0,0.381-0.153,0.415-0.355

                l0.313-2.244c0.517-0.211,0.991-0.498,1.43-0.828l2.107,0.847c0.195,0.074,0.415,0,0.518-0.186l1.69-2.929

                c0.11-0.187,0.061-0.416-0.101-0.543L44.132,34.753z M37.844,36.461c-1.405,0-2.538-1.134-2.538-2.539

                c0-1.404,1.133-2.538,2.538-2.538s2.539,1.134,2.539,2.538C40.383,35.327,39.249,36.461,37.844,36.461z" />

    <path

        android:fillColor="#019587"

        android:pathData="M27.195,32.236c0-0.859,0.088-1.7,0.22-2.525c-2.511-0.632-4.986-0.956-6.877-0.956

                c-6.05,0-17.774,3.328-17.774,9.381v3.872h27.764C28.447,39.298,27.195,35.918,27.195,32.236z" />

    <path

        android:fillColor="#019587"

        android:pathData="M20.54,23.007c5.007,0,9.078-4.056,9.078-9.08c0-5.007-4.071-9.077-9.078-9.077

                c-5.008,0-9.077,4.07-9.077,9.077C11.463,18.951,15.532,23.007,20.54,23.007z" />



</vector>

res/values-zh-rCN/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -3246,7 +3246,6 @@ 


    <!-- StorageCleaner Settings -->

    <string name="storage_menu_cleanup">垃圾清理</string>

    <string name="profiles_settings_title">情景模式</string>



    <string name="mbn_version">MBN 版本</string>

res/values-zh-rHK/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -3212,7 +3212,6 @@ 
    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"耳機"</string>

    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"輸入周邊設備"</string>

    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"藍牙"</string>

    <string name="profiles_settings_title">情景模式</string>

    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"管理儲存空間"</string>

    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"儲存空間管理員會從您的裝置移除備份相片和影片，以釋放儲存空間。"</string>

    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"移除相片和影片"</string>

res/values-zh-rTW/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -3211,7 +3211,6 @@ 
    <string name="bluetooth_talkback_headphone" msgid="26580326066627664">"頭戴式耳機"</string>

    <string name="bluetooth_talkback_input_peripheral" msgid="5165842622743212268">"周邊輸入裝置"</string>

    <string name="bluetooth_talkback_bluetooth" msgid="5615463912185280812">"藍牙"</string>

    <string name="profiles_settings_title">情景模式</string>

    <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"管理儲存空間"</string>

    <string name="automatic_storage_manager_text" msgid="4562950476680600604">"儲存空間管理員會將已備份的相片和影片從裝置中移除，藉此釋出儲存空間。"</string>

    <string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"移除相片和影片"</string>