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

Commit 11d2d68e authored by Fan Zhang's avatar Fan Zhang
Browse files

Move developer options related class to development package 

Bug: 34203528
Test: none, purely moving classes around
Change-Id: I3cd1d257f948729fda5c04632e7ce9114c40bd0c
parent 2907f869

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1890,7 +1890,7 @@ 
            <meta-data android:name="com.android.settings.category"

                android:value="com.android.settings.category.ia.system" />

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

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

                android:value="com.android.settings.development.DevelopmentSettings" />

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

                android:value="true" />

        </activity>

res/layout/preference_home_app.xml

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

<!-- Copyright (C) 2013 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:minHeight="?android:attr/listPreferredItemHeight"

    android:gravity="center_vertical"

    android:paddingStart="@*android:dimen/preference_item_padding_side">



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:id="@+id/home_app_pref"

        android:focusable="true"

        android:clickable="true"

        android:gravity="center_vertical"

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



            <RadioButton

                android:id="@+id/home_radio"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_marginStart="10dip"

                android:layout_marginEnd="4dip"

                android:layout_gravity="center_vertical"

                android:orientation="vertical"

                android:clickable="false"

                android:focusable="false" />



            <ImageView

                android:id="@android:id/icon"

                android:layout_width="48dp"

                android:layout_height="48dp"

                android:layout_gravity="center"

                android:minWidth="48dp"

                android:scaleType="centerInside"

                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner" />



            <LinearLayout

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_weight="1"

                android:focusable="true"

                android:clickable="true"

                android:gravity="center_vertical"

                android:orientation="vertical">



                    <TextView

                        android:id="@android:id/title"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:singleLine="true"

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

                        android:ellipsize="end" />



                    <TextView

                        android:id="@android:id/summary"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

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



            </LinearLayout>



    </LinearLayout>



    <View

        android:id="@+id/home_divider"

        android:layout_width="2dip"

        android:layout_height="match_parent"

        android:layout_marginTop="5dip"

        android:layout_marginBottom="5dip"

        android:background="@android:drawable/divider_horizontal_dark" />



    <ImageView

        android:id="@+id/home_app_uninstall"

        android:layout_width="wrap_content"

        android:layout_height="fill_parent"

        android:paddingStart="12dip"

        android:paddingEnd="12dp"

        android:src="@drawable/ic_menu_delete"

        android:contentDescription="@string/home_app_uninstall_button"

        android:layout_gravity="center"

        android:clickable="true"

        android:focusable="true"

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



</LinearLayout>

res/values/strings.xml

+0 −3
Original line number Diff line number Diff line
@@ -5716,9 +5716,6 @@ 
    <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->

    <string name="apps_with_restrictions_settings_button">Expand settings for application</string>









    <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->









    <string name="home_app_uninstall_button">Uninstall this application</string>

















    <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->









    <string name="global_change_warning" product="tablet">This setting affects all users on this tablet.</string>









    <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
































res/xml/development_prefs.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -69,7 +69,7 @@







        android:summary="@string/convert_to_file_encryption_enabled"









        android:fragment="com.android.settings.applications.ConvertToFbe" />



















    <com.android.settings.ColorModePreference









    <com.android.settings.development.ColorModePreference









        android:key="color_mode"









        android:title="@string/picture_color_mode"









        android:summary="@string/picture_color_mode_desc" />
































src/com/android/settings/SettingsActivity.java



+1
−0






























Original line number
Diff line number
Diff line







@@ -60,6 +60,7 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider;







import com.android.settings.core.instrumentation.SharedPreferencesLogger;









import com.android.settings.dashboard.DashboardFeatureProvider;









import com.android.settings.dashboard.DashboardSummary;









import com.android.settings.development.DevelopmentSettings;









import com.android.settings.enterprise.EnterprisePrivacySettings;









import com.android.settings.overlay.FeatureFactory;









import com.android.settings.search.DynamicIndexableContentMonitor;