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

Commit b7cdf167 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Use a different wallpaper fragment title from the preference item."

parents 7485addd a4379d6b

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -1542,6 +1542,8 @@ 
    <string name="screen_timeout_summary">Screen turns off automatically after <xliff:g id="timeout_description">%1$s</xliff:g></string>

    <!-- Wallpaper settings title [CHAR LIMIT=30] -->

    <string name="wallpaper_settings_title">Wallpaper</string>

    <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->

    <string name="wallpaper_settings_fragment_title">Select wallpaper from</string>

    <!-- Display settings screen, trigger for screen saver options -->

    <string name="dream_settings_title">Android Dreams</string>

    <!-- Display settings screen, summary for screen saver options -->
@@ -2739,6 +2741,8 @@ found in the list of installed applications.</string> 
    <string name="power_usage_summary">What has been using the battery</string>

    <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->

    <string name="power_usage_not_available">Battery usage data not available</string>

    <!-- Display the battery level and status [CHAR_LIMIT=30] -->

    <string name="power_usage_level_and_status">Battery level <xliff:g id="level">%1$s</xliff:g> - <xliff:g id="status">%2$s</xliff:g></string>

    <!-- Battery usage since unplugged -->

    <string name="battery_since_unplugged">Battery use since unplugged</string>

    <!-- Battery usage since user reset the stats -->

res/xml/power_usage_summary.xml

+5 −0
Original line number Diff line number Diff line
@@ -17,4 +17,9 @@ 
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/battery_since_unplugged"

        android:key="app_list">

    <Preference

        style="?android:attr/preferenceInformationStyle"

        android:key="battery_status"

        android:persistent="false"

    />

</PreferenceScreen>

res/xml/wallpaper_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,6 +15,6 @@ 
-->



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

        android:title="@string/wallpaper_settings_title">

        android:title="@string/wallpaper_settings_fragment_title">



</PreferenceScreen>

src/com/android/settings/BatteryInfo.java

+1 −20
Original line number Diff line number Diff line
@@ -90,26 +90,7 @@ public class BatteryInfo extends Activity { 
                        + getString(R.string.battery_info_temperature_units));

                mTechnology.setText("" + intent.getStringExtra("technology"));

                

                int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);

                String statusString;

                if (status == BatteryManager.BATTERY_STATUS_CHARGING) {

                    statusString = getString(R.string.battery_info_status_charging);

                    if (plugType > 0) {

                        statusString = statusString + " " + getString(

                                (plugType == BatteryManager.BATTERY_PLUGGED_AC)

                                        ? R.string.battery_info_status_charging_ac

                                        : R.string.battery_info_status_charging_usb);

                    }

                } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {

                    statusString = getString(R.string.battery_info_status_discharging);

                } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {

                    statusString = getString(R.string.battery_info_status_not_charging);

                } else if (status == BatteryManager.BATTERY_STATUS_FULL) {

                    statusString = getString(R.string.battery_info_status_full);

                } else {

                    statusString = getString(R.string.battery_info_status_unknown);

                }

                mStatus.setText(statusString);

                mStatus.setText(Utils.getBatteryStatus(getResources(), intent));



                switch (plugType) {

                    case 0:

src/com/android/settings/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ import android.content.pm.ActivityInfo; 
import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.os.Bundle;

import android.preference.Preference;

import android.preference.PreferenceActivity;

import android.preference.PreferenceFragment;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;
@@ -534,6 +536,17 @@ public class Settings extends PreferenceActivity implements ButtonBarHandler { 
        }

    }



    @Override

    public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {

        // Override the fragment title for Wallpaper settings

        CharSequence title = pref.getTitle();

        if (pref.getFragment().equals(WallpaperTypeSettings.class.getName())) {

            title = getString(R.string.wallpaper_settings_fragment_title);

        }

        startPreferencePanel(pref.getFragment(), pref.getExtras(), 0, title, null, 0);

        return true;

    }



    @Override

    public void setListAdapter(ListAdapter adapter) {

        if (mHeaders == null) {