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

Commit 65b18ae6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Delete about phone v1 code"

parents 854e3e82 7ef47a9c

res/xml/device_info_settings.xml

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

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

        android:key="device_info_pref_screen"

        android:title="@string/about_settings">



        <!-- Device status - launches activity -->

        <Preference android:key="status_info"

                android:title="@string/device_status"

                android:summary="@string/device_status_summary"

                android:fragment="com.android.settings.deviceinfo.Status"/>



        <!-- Manual -->

        <Preference

                android:key="manual"

                android:title="@string/manual">

            <intent android:action="android.settings.SHOW_MANUAL" />

        </Preference>



        <!-- Legal Information -->

        <Preference

                android:key="legal_container"

                android:title="@string/legal_information"

                android:fragment="com.android.settings.LegalSettings" />



        <Preference

                android:key="regulatory_info"

                android:title="@string/regulatory_labels">

            <intent android:action="android.settings.SHOW_REGULATORY_INFO" />

        </Preference>



        <Preference

                android:key="safety_info"

                android:title="@string/safety_and_regulatory_info">

                <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO" />

        </Preference>



        <!-- Feedback on the device -->

        <Preference android:key="device_feedback"

                android:title="@string/device_feedback" />



        <!-- Device hardware model -->

        <Preference

                android:key="device_model"

                android:title="@string/model_info"

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



        <!-- Device firmware version -->

        <Preference android:key="firmware_version"

                android:title="@string/firmware_version"

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



        <!-- Security patch level -->

        <Preference android:key="security_patch"

                android:title="@string/security_patch"

                android:summary="@string/summary_placeholder">

                <intent android:action="android.intent.action.VIEW"

                        android:data="https://source.android.com/security/bulletin/" />

        </Preference>



        <!-- Device FCC equipment id -->

        <Preference

                android:key="fcc_equipment_id"

                android:title="@string/fcc_equipment_id"

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



        <!-- Device Baseband version -->

        <Preference

                android:key="baseband_version"

                android:title="@string/baseband_version"

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



        <!-- Device Kernel version -->

        <Preference

                android:key="kernel_version"

                android:title="@string/kernel_version"

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



        <!-- Detailed build version -->

        <Preference

                android:key="build_number"

                android:title="@string/build_number"

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



</PreferenceScreen>

src/com/android/settings/DeviceInfoSettings.java

+29 −74
Original line number Diff line number Diff line
@@ -16,36 +16,29 @@ 


package com.android.settings;



import static com.android.settings.core.FeatureFlags.DEVICE_INFO_V2;



import android.app.Activity;

import android.app.Fragment;

import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.provider.SearchIndexableResource;

import android.telephony.TelephonyManager;

import android.util.FeatureFlagUtils;

import android.support.annotation.VisibleForTesting;

import android.telephony.TelephonyManager;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.deviceinfo.BasebandVersionPreferenceController;

import com.android.settings.deviceinfo.BluetoothAddressPreferenceController;

import com.android.settings.deviceinfo.BuildNumberPreferenceController;

import com.android.settings.deviceinfo.DeviceModelPreferenceController;

import com.android.settings.deviceinfo.FccEquipmentIdPreferenceController;

import com.android.settings.deviceinfo.FeedbackPreferenceController;

import com.android.settings.deviceinfo.FirmwareVersionPreferenceController;

import com.android.settings.deviceinfo.ImsStatusPreferenceController;

import com.android.settings.deviceinfo.IpAddressPreferenceController;

import com.android.settings.deviceinfo.KernelVersionPreferenceController;

import com.android.settings.deviceinfo.ManualPreferenceController;

import com.android.settings.deviceinfo.PhoneNumberPreferenceController;

import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;

import com.android.settings.deviceinfo.SafetyInfoPreferenceController;

import com.android.settings.deviceinfo.SecurityPatchPreferenceController;

import com.android.settings.deviceinfo.WifiMacAddressPreferenceController;

import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceControllerV2;

import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;
@@ -84,7 +77,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        final Bundle arguments = getArguments();

        if (FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2)) {

        // Do not override initial expand children count if we come from

        // search (EXTRA_FRAGMENT_ARG_KEY is set) - we need to display every if entry point

        // is search.
@@ -100,7 +92,6 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
            getPreferenceScreen().setInitialExpandedChildrenCount(numberOfChildren);

        }

    }

    }



    @Override

    public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -119,8 +110,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 


    @Override

    protected int getPreferenceScreenResId() {

        return FeatureFlagUtils.isEnabled(getContext(), DEVICE_INFO_V2)

                ? R.xml.device_info_settings_v2 : R.xml.device_info_settings;

        return R.xml.device_info_settings_v2;

    }



    @Override
@@ -156,57 +146,23 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 


    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

            Activity activity, Fragment fragment, Lifecycle lifecycle) {

        if (FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2)) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

            // Device name



        controllers.add(new PhoneNumberPreferenceController(context));



        controllers.add(new SimStatusPreferenceControllerV2(context, fragment));



        controllers.add(new DeviceModelPreferenceController(context, fragment));



        controllers.add(new ImeiInfoPreferenceControllerV2(context, fragment));



        controllers.add(new FirmwareVersionPreferenceControllerV2(context, fragment));



        controllers.add(new ImsStatusPreferenceController(context, lifecycle));



        controllers.add(new IpAddressPreferenceController(context, lifecycle));



        controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));



        controllers.add(new BluetoothAddressPreferenceController(context, lifecycle));



        controllers.add(new RegulatoryInfoPreferenceController(context));



        controllers.add(new SafetyInfoPreferenceController(context));



        controllers.add(new ManualPreferenceController(context));



        controllers.add(new FeedbackPreferenceController(fragment, context));



        controllers.add(new FccEquipmentIdPreferenceController(context));



            controllers.add(

                    new BuildNumberPreferenceController(context, activity, fragment, lifecycle));



            return controllers;

        }



        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        controllers.add(

                new BuildNumberPreferenceController(context, activity, fragment, lifecycle));

        controllers.add(new ManualPreferenceController(context));

        controllers.add(new FeedbackPreferenceController(fragment, context));

        controllers.add(new KernelVersionPreferenceController(context));

        controllers.add(new BasebandVersionPreferenceController(context));

        controllers.add(new FirmwareVersionPreferenceController(context, lifecycle));

        controllers.add(new RegulatoryInfoPreferenceController(context));

        controllers.add(new DeviceModelPreferenceController(context, fragment));

        controllers.add(new SecurityPatchPreferenceController(context));

        controllers.add(new FccEquipmentIdPreferenceController(context));

        controllers.add(new SafetyInfoPreferenceController(context));

        return controllers;

    }
@@ -220,8 +176,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = FeatureFlagUtils.isEnabled(context, DEVICE_INFO_V2)

                            ? R.xml.device_info_settings_v2 : R.xml.device_info_settings;

                    sir.xmlResId = R.xml.device_info_settings_v2;

                    return Arrays.asList(sir);

                }

src/com/android/settings/Settings.java

+0 −3
Original line number Diff line number Diff line
@@ -148,9 +148,6 @@ public class Settings extends SettingsActivity { 
    public static class ApnEditorActivity extends SettingsActivity { /* empty */ }

    public static class ChooseAccountActivity extends SettingsActivity { /* empty */ }

    public static class IccLockSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ImeiInformationActivity extends SettingsActivity { /* empty */ }

    public static class SimStatusActivity extends SettingsActivity { /* empty */ }

    public static class StatusActivity extends SettingsActivity { /* empty */ }

    public static class TestingSettingsActivity extends SettingsActivity { /* empty */ }

    public static class WifiAPITestActivity extends SettingsActivity { /* empty */ }

    public static class WifiInfoActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/core/FeatureFlags.java

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package com.android.settings.core; 
 * This class keeps track of all feature flags in Settings.

 */

public class FeatureFlags {

    public static final String DEVICE_INFO_V2 = "device_info_v2";

    public static final String SEARCH_V2 = "settings_search_v2";

    public static final String SUGGESTIONS_V2 = "new_settings_suggestion";

    public static final String APP_INFO_V2 = "settings_app_info_v2";

src/com/android/settings/core/gateway/SettingsGateway.java

+0 −6
Original line number Diff line number Diff line
@@ -65,12 +65,9 @@ import com.android.settings.datausage.DataUsageList; 
import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.deviceinfo.ImeiInformation;

import com.android.settings.deviceinfo.PrivateVolumeForget;

import com.android.settings.deviceinfo.PrivateVolumeSettings;

import com.android.settings.deviceinfo.PublicVolumeSettings;

import com.android.settings.deviceinfo.SimStatus;

import com.android.settings.deviceinfo.Status;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.deviceinfo.StorageSettings;

import com.android.settings.display.NightDisplaySettings;
@@ -235,9 +232,6 @@ public class SettingsGateway { 
            ManagedProfileSettings.class.getName(),

            ChooseAccountActivity.class.getName(),

            IccLockSettings.class.getName(),

            ImeiInformation.class.getName(),

            SimStatus.class.getName(),

            Status.class.getName(),

            TestingSettings.class.getName(),

            WifiAPITest.class.getName(),

            WifiInfo.class.getName(),