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

Commit 7ae929fb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-b613f8ce-05b5-465e-b783-c1b87f3c1e95-for-git_oc-mr1-release-43... 

release-request-b613f8ce-05b5-465e-b783-c1b87f3c1e95-for-git_oc-mr1-release-4332123 snap-temp-L59300000101925107

Change-Id: I80878f5efb06d436ed849c98a4d4641d2f33d867
parents 741e878f 7420c095

res/xml/apn_editor.xml

+20 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
        android:key="apn_name"

        android:singleLine="true"

        android:inputType="text"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_apn"
@@ -29,6 +30,7 @@ 
        android:key="apn_apn"

        android:singleLine="true"

        android:inputType="textEmailAddress"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_http_proxy"
@@ -36,6 +38,7 @@ 
        android:key="apn_http_proxy"

        android:singleLine="true"

        android:inputType="textUri"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_http_port"
@@ -43,6 +46,7 @@ 
        android:key="apn_http_port"

        android:singleLine="true"

        android:inputType="number"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_user"
@@ -50,6 +54,7 @@ 
        android:key="apn_user"

        android:singleLine="true"

        android:inputType="textEmailAddress"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_password"
@@ -57,6 +62,7 @@ 
        android:key="apn_password"

        android:singleLine="true"

        android:inputType="textPassword"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_server"
@@ -64,6 +70,7 @@ 
        android:key="apn_server"

        android:singleLine="true"

        android:inputType="textUri"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_mmsc"
@@ -71,6 +78,7 @@ 
        android:key="apn_mmsc"

        android:singleLine="true"

        android:inputType="textUri"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_mms_proxy"
@@ -78,6 +86,7 @@ 
        android:key="apn_mms_proxy"

        android:singleLine="true"

        android:inputType="textUri"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_mms_port"
@@ -85,6 +94,7 @@ 
        android:key="apn_mms_port"

        android:singleLine="true"

        android:inputType="number"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_mcc"
@@ -92,6 +102,7 @@ 
        android:key="apn_mcc"

        android:singleLine="true"

        android:inputType="number"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_mnc"
@@ -99,12 +110,14 @@ 
        android:key="apn_mnc"

        android:singleLine="true"

        android:inputType="number"

        android:persistent="false"

        />

    <ListPreference

        android:title="@string/apn_auth_type"

        android:key="auth_type"

        android:entries="@array/apn_auth_entries"

        android:entryValues="@array/apn_auth_values"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/apn_type"
@@ -112,6 +125,7 @@ 
        android:key="apn_type"

        android:singleLine="true"

        android:inputType="textNoSuggestions"

        android:persistent="false"

        />

    <ListPreference

        android:title="@string/apn_protocol"
@@ -119,6 +133,7 @@ 
        android:key="apn_protocol"

        android:entries="@array/apn_protocol_entries"

        android:entryValues="@array/apn_protocol_values"

        android:persistent="false"

        />

    <ListPreference

        android:title="@string/apn_roaming_protocol"
@@ -126,6 +141,7 @@ 
        android:key="apn_roaming_protocol"

        android:entries="@array/apn_protocol_entries"

        android:entryValues="@array/apn_protocol_values"

        android:persistent="false"

        />

    <SwitchPreference

        android:title="@string/carrier_enabled"
@@ -133,18 +149,21 @@ 
        android:enabled="false"

        android:summaryOn="@string/carrier_enabled_summaryOn"

        android:summaryOff="@@string/carrier_enabled_summaryOff"

        android:persistent="false"

        />

    <MultiSelectListPreference

        android:title="@string/bearer"

        android:key="bearer_multi"

        android:entries="@array/bearer_entries"

        android:entryValues="@array/bearer_values"

        android:persistent="false"

        />

    <ListPreference

        android:title="@string/mvno_type"

        android:key="mvno_type"

        android:entries="@array/mvno_type_entries"

        android:entryValues="@array/mvno_type_values"

        android:persistent="false"

        />

    <EditTextPreference

        android:title="@string/mvno_match_data"
@@ -152,5 +171,6 @@ 
        android:key="mvno_match_data"

        android:singleLine="true"

        android:inputType="text"

        android:persistent="false"

        />

</PreferenceScreen>

res/xml/device_info_status.xml

+8 −8
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 
        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/battery_status_title"

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

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

    <Preference

        android:key="battery_level"

        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/battery_level_title"

        android:summary="@string/device_info_not_available"

        android:summary="@string/summary_placeholder"

        android:persistent="false" />

    <Preference

        android:key="sim_status"
@@ -52,41 +52,41 @@ 
        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/wifi_advanced_ip_address_title"

        android:summary="@string/device_info_not_available"

        android:summary="@string/summary_placeholder"

        android:persistent="false" />

    <Preference

        android:key="wifi_mac_address"

        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/status_wifi_mac_address"

        android:summary="@string/device_info_not_available"

        android:summary="@string/summary_placeholder"

        android:persistent="false" />

    <Preference

        android:key="bt_address"

        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/status_bt_address"

        android:summary="@string/device_info_not_available"

        android:summary="@string/summary_placeholder"

        android:persistent="false" />

    <Preference

        android:key="serial_number"

        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/status_serial_number"

        android:summary="@string/device_info_not_available"

        android:summary="@string/summary_placeholder"

        android:persistent="false" />

    <Preference

        android:key="up_time"

        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/status_up_time"

        android:summary="@string/device_info_not_available"

        android:summary="@string/summary_placeholder"

        android:persistent="false" />

    <Preference

        android:key="wimax_mac_address"

        android:enabled="false"

        android:shouldDisableView="false"

        android:title="@string/status_wimax_mac_address"

        android:summary="@string/device_info_not_available"

        android:summary="@string/summary_placeholder"

        android:persistent="false" />

</PreferenceScreen>

src/com/android/settings/ApnEditor.java

+5 −0
Original line number Diff line number Diff line
@@ -297,6 +297,11 @@ public class ApnEditor extends SettingsPreferenceFragment 
            getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);

        }



    }



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        fillUi();

    }

src/com/android/settings/deviceinfo/Status.java

+21 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.Message; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserManager;

import android.provider.SearchIndexableResource;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.text.TextUtils;
@@ -40,13 +41,17 @@ import com.android.internal.util.ArrayUtils; 
import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;

import com.android.settings.Utils;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import java.lang.ref.WeakReference;

import java.util.Arrays;

import java.util.List;



import static android.content.Context.CONNECTIVITY_SERVICE;

import static android.content.Context.WIFI_SERVICE;



public class Status extends SettingsPreferenceFragment {

public class Status extends SettingsPreferenceFragment implements Indexable {



    private static final String KEY_BATTERY_STATUS = "battery_status";

    private static final String KEY_BATTERY_LEVEL = "battery_level";
@@ -302,4 +307,19 @@ public class Status extends SettingsPreferenceFragment { 


        return h + ":" + pad(m) + ":" + pad(s);

    }



    /**

     * For Search.

     */

    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider() {



                @Override

                public List<SearchIndexableResource> getXmlResourcesToIndex(

                        Context context, boolean enabled) {

                    final SearchIndexableResource sir = new SearchIndexableResource(context);

                    sir.xmlResId = R.xml.device_info_status;

                    return Arrays.asList(sir);

                }

            };

}

src/com/android/settings/fuelgauge/PowerUsageAdvanced.java

+9 −3
Original line number Diff line number Diff line
@@ -124,6 +124,9 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        mPackageManager = context.getPackageManager();

        mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);

        mBatteryUtils = BatteryUtils.getInstance(context);



        // init the summary so other preferences won't have unnecessary move

        updateHistPrefSummary(context);

    }



    @Override
@@ -175,7 +178,13 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        }

        updatePreference(mHistPref);

        refreshPowerUsageDataList(mStatsHelper, mUsageListGroup);

        updateHistPrefSummary(context);



        BatteryEntry.startRequestQueue();

        BatteryUtils.logRuntime(TAG, "refreshUI", startTime);

    }



    private void updateHistPrefSummary(Context context) {

        Intent batteryIntent =

                context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));

        final boolean plugged = batteryIntent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) != 0;
@@ -186,9 +195,6 @@ public class PowerUsageAdvanced extends PowerUsageBase { 
        } else {

            mHistPref.hideBottomSummary();

        }



        BatteryEntry.startRequestQueue();

        BatteryUtils.logRuntime(TAG, "refreshUI", startTime);

    }



    @VisibleForTesting