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

Commit 207f4dda authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Misc fixes in device info page"

parents 66c061a0 1f37d2cc

AndroidManifest.xml

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

                android:resource="@string/about_settings" />

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

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

                android:value="com.android.settings.deviceinfo.DeviceInfoSettings" />

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

                android:value="true" />

        </activity>
@@ -1782,45 +1782,6 @@ 
        <activity android:name=".EncryptionInterstitial"

            android:theme="@style/GlifTheme.Light" />



        <activity android:name=".Settings$StatusActivity"

                android:label="@string/device_status_activity_title"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings$DeviceInfoSettingsActivity">

            <intent-filter>

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

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

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

            </intent-filter>

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

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

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".Settings$SimStatusActivity"

                android:label="@string/sim_status_title"

                android:process="com.android.phone">

            <intent-filter>

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

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

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

            </intent-filter>

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

                android:value="com.android.settings.deviceinfo.SimStatus" />

        </activity>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".Settings$ImeiInformationActivity"

                android:label="@string/imei_information_title"

                android:process="com.android.phone">

            <intent-filter>

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

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

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

            </intent-filter>

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

                android:value="com.android.settings.deviceinfo.ImeiInformation" />

        </activity>



        <activity android:name=".Settings$StorageDashboardActivity"

                android:label="@string/storage_settings"

                android:icon="@drawable/ic_settings_storage"

res/layout/dialog_firmware_version.xml

+3 −1
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ 
            style="@style/device_info_dialog_value"

            android:id="@+id/security_patch_level_value"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content"

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

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



        <TextView

            style="@style/device_info_dialog_label"

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import com.android.settings.ApnEditor; 
import com.android.settings.ApnSettings;

import com.android.settings.DateTimeSettings;

import com.android.settings.DeviceAdminSettings;

import com.android.settings.DeviceInfoSettings;

import com.android.settings.DisplaySettings;

import com.android.settings.IccLockSettings;

import com.android.settings.MasterClear;
@@ -64,6 +63,7 @@ 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.DeviceInfoSettings;

import com.android.settings.deviceinfo.PrivateVolumeForget;

import com.android.settings.deviceinfo.PrivateVolumeSettings;

import com.android.settings.deviceinfo.PublicVolumeSettings;

src/com/android/settings/DeviceInfoSettings.java→src/com/android/settings/deviceinfo/DeviceInfoSettings.java

+13 −23
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings;

package com.android.settings.deviceinfo;



import android.app.Activity;

import android.app.Fragment;
@@ -26,23 +26,13 @@ import android.support.annotation.VisibleForTesting; 
import android.telephony.TelephonyManager;



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

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.dashboard.SummaryLoader;

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.ImsStatusPreferenceController;

import com.android.settings.deviceinfo.IpAddressPreferenceController;

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.WifiMacAddressPreferenceController;

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

import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceControllerV2;

import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceControllerV2;

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

import com.android.settings.deviceinfo.imei.ImeiInfoPreferenceController;

import com.android.settings.deviceinfo.simstatus.SimStatusPreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.core.AbstractPreferenceController;
@@ -84,8 +74,8 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
                || !arguments.containsKey(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY)) {



            // Increase the number of children when the device contains more than 1 sim.

            final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(

                    Context.TELEPHONY_SERVICE);

            final TelephonyManager telephonyManager = (TelephonyManager) getContext()

                    .getSystemService(Context.TELEPHONY_SERVICE);

            final int numberOfChildren = Math.max(SIM_PREFERENCES_COUNT,

                    SIM_PREFERENCES_COUNT * telephonyManager.getPhoneCount())

                    + NON_SIM_PREFERENCES_COUNT;
@@ -110,7 +100,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 


    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.device_info_settings_v2;

        return R.xml.device_info_settings;

    }



    @Override
@@ -148,10 +138,10 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
            Activity activity, Fragment fragment, Lifecycle lifecycle) {

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

        controllers.add(new PhoneNumberPreferenceController(context));

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

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

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

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

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

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

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

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

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

        controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
@@ -176,7 +166,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { 
                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.device_info_settings_v2;

                    sir.xmlResId = R.xml.device_info_settings;

                    return Arrays.asList(sir);

                }