------------------------------------------------------------------------
###### 8.0去掉电池信息修改：
frameworks/base# diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml index bfa92ad..3d9c62a 100644 --- a/packages/SystemUI/res/layout/system_icons.xml +++ b/packages/SystemUI/res/layout/system_icons.xml @@ -33,6 +33,7 @@ <com.android.systemui.BatteryMeterView android:id="@+id/battery" android:layout_height="match_parent" - android:layout_width="wrap_content" + android:layout_width="0dp" + android:visibility="gone" /> </LinearLayout> \ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java index 77c3bfa..990bfe9 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java @@ -65,7 +65,7 @@ public class QSFactoryImpl implements QSFactory { else if (tileSpec.equals("cast")) return new CastTile(mHost); else if (tileSpec.equals("hotspot")) return new HotspotTile(mHost); else if (tileSpec.equals("user")) return new UserTile(mHost); - else if (tileSpec.equals("battery")) return new BatterySaverTile(mHost); + //else if (tileSpec.equals("battery")) return new BatterySaverTile(mHost); else if (tileSpec.equals("saver")) return new DataSaverTile(mHost); else if (tileSpec.equals("night")) return new NightDisplayTile(mHost); else if (tileSpec.equals("nfc")) return new NfcTile(mHost); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 274244e..a414163 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -123,15 +123,17 @@ public class SignalClusterView extends LinearLayout implements NetworkController public SignalClusterView(Context context) { this(context, null); + Log.d("qhj","SignalClusterView ...1"); } public SignalClusterView(Context context, AttributeSet attrs) { this(context, attrs, 0); + Log.d("qhj","SignalClusterView ...2"); } public SignalClusterView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - +Log.d("qhj","SignalClusterView ...3"); Resources res = getResources(); mMobileSignalGroupEndPadding = res.getDimensionPixelSize(R.dimen.mobile_signal_group_end_padding); @@ -205,6 +207,9 @@ public class SignalClusterView extends LinearLayout implements NetworkController mWifiSignalSpacer = findViewById(R.id.wifi_signal_spacer); mMobileSignalGroup = findViewById(R.id.mobile_signal_group); + mNoSimsCombo.setVisibility(View.GONE); + mNoSims.setVisibility(View.GONE); + Log.d("qhj","onFinishInflate ..."); maybeScaleVpnAndNoSimsIcons(); } @@ -548,7 +553,8 @@ public class SignalClusterView extends LinearLayout implements NetworkController if (mNoSimsVisible) { mIconLogger.onIconShown(SLOT_MOBILE); - mNoSimsCombo.setVisibility(View.VISIBLE); + mNoSimsCombo.setVisibility(View.GONE);//mNoSimsCombo.setVisibility(View.VISIBLE); + mNoSims.setVisibility(View.GONE); if (!Objects.equals(mSimDetected, mNoSimsCombo.getTag())) { mNoSimsCombo.setTag(mSimDetected); if (mSimDetected) { @@ -569,6 +575,7 @@ public class SignalClusterView extends LinearLayout implements NetworkController } else { mIconLogger.onIconHidden(SLOT_MOBILE); mNoSimsCombo.setVisibility(View.GONE); + mNoSims.setVisibility(View.GONE); } boolean anythingVisible = mNoSimsVisible || mWifiVisible || mIsAirplaneMode
packages/apps/Settings#
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index d92d08d..a4d71f0 100755 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1137,7 +1137,7 @@ <string name="device_info_not_available" msgid="8062521887156825182">"无法获取"</string> <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string> <string name="device_status" msgid="607405385799807324">"状态信息"</string> - <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"电池状态、网络状态和其他信息"</string> + <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"网络状态和其他信息"</string> <string name="device_status_summary" product="default" msgid="2599162787451519618">"电话号码、信号等"</string> <string name="storage_settings" msgid="4211799979832404953">"存储"</string> <string name="storage_usb_settings" msgid="7293054033137078060">"存储"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 1fb9592..d30c2b9 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2647,7 +2647,7 @@ <!-- About phone screen, title of the item to go into the Phone status screen --> <string name="device_status">Status</string> <!-- About tablet screen, summary of the item that takes you to tablet status screen --> - <string name="device_status_summary" product="tablet">Status of the battery, network, and other information</string> + <string name="device_status_summary" product="tablet">Status of the network, and other information</string> <!-- About phone screen, summary of the item to go into the phone status screen --> <string name="device_status_summary" product="default">Phone number, signal, etc.</string> <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] --> diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 1873595..9263da3 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -806,7 +806,7 @@ public class SettingsActivity extends SettingsDrawerActivity somethingChanged = setTileEnabled(new ComponentName(packageName, Settings.PowerUsageSummaryActivity.class.getName()), - mBatteryPresent, isAdmin) || somethingChanged; + false, isAdmin) || somethingChanged; somethingChanged = setTileEnabled(new ComponentName(packageName, Settings.UserSettingsActivity.class.getName()), diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index 624103a..b77f964 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -50,6 +50,7 @@ import java.util.List; import static android.content.Context.CONNECTIVITY_SERVICE; import static android.content.Context.WIFI_SERVICE; +import android.util.Log; public class Status extends SettingsPreferenceFragment implements Indexable { @@ -164,6 +165,17 @@ public class Status extends SettingsPreferenceFragment implements Indexable { mBatteryLevel = findPreference(KEY_BATTERY_LEVEL); mBatteryStatus = findPreference(KEY_BATTERY_STATUS); mBtAddress = findPreference(KEY_BT_ADDRESS); + if(mBatteryLevel != null) + { + getPreferenceScreen().removePreference(mBatteryLevel); + Log.d("qhj","............remove mBatteryLevel"); + } + + if(mBatteryStatus !=null){ + getPreferenceScreen().removePreference(mBatteryStatus); + Log.d("qhj","............remove mBatteryStatus"); + } + mWifiMacAddress = findPreference(KEY_WIFI_MAC_ADDRESS); mWimaxMacAddress = findPreference(KEY_WIMAX_MAC_ADDRESS); mIpAddress = findPreference(KEY_IP_ADDRESS);
------------------------------------------------------------------------
###### 7.1_去掉电池信息修改：
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java index d8b95cc..459ba44 100644 --- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java +++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java @@ -54,7 +54,7 @@ public class BatteryMeterView extends ImageView implements mSlotBattery = context.getString( com.android.internal.R.string.status_bar_battery); - setImageDrawable(mDrawable); + setImageDrawable(null); } @Override // 去掉下拉电池信息 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index 82ed3ae..e456e32 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -429,7 +429,7 @@ public class QSTileHost implements QSTile.Host, Tunable { else if (tileSpec.equals("cast")) return new CastTile(this); else if (tileSpec.equals("hotspot")) return new HotspotTile(this); else if (tileSpec.equals("user")) return new UserTile(this); - else if (tileSpec.equals("battery")) return new BatteryTile(this); + // else if (tileSpec.equals("battery")) return new BatteryTile(this); by qhj else if (tileSpec.equals("saver")) return new DataSaverTile(this); else if (tileSpec.equals("night")) return new NightDisplayTile(this); // Intent tiles. commit e52d9614057a08fcbcd6ad3a2fe70d437266b9dc Author: teamViewerServer <teamViewer@xxx.com> Date: Fri Jan 11 16:22:05 2019 +0800
7.1_去掉电池项及电池信息settings_byqhj Change-Id: Ied60332418bef1f5ea97f1406141239f52f708e7
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index c2ffaf3..afb25ce 100755 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1031,7 +1031,7 @@ <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string> <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string> <string name="device_status" msgid="607405385799807324">"状态信息"</string> - <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"电池状态、网络状态和其他信息"</string> + <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"网络状态和其他信息"</string> <string name="device_status_summary" product="default" msgid="2599162787451519618">"电话号码、信号等"</string> <string name="storage_settings" msgid="4211799979832404953">"存储"</string> <string name="storage_usb_settings" msgid="7293054033137078060">"存储"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 43f66f5..6d2f7ee 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2388,7 +2388,7 @@ <!-- About phone screen, title of the item to go into the Phone status screen --> <string name="device_status">Status</string> <!-- About tablet screen, summary of the item that takes you to tablet status screen --> - <string name="device_status_summary" product="tablet">Status of the battery, network, and other information</string> + <string name="device_status_summary" product="tablet">Status of the network, and other information</string> <!-- About phone screen, summary of the item to go into the phone status screen --> <string name="device_status_summary" product="default">Phone number, signal, etc.</string> <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] --> diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 7eccc9e..4f1e67d 100755 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1078,7 +1078,7 @@ public class SettingsActivity extends SettingsDrawerActivity setTileEnabled(new ComponentName(packageName, Settings.PowerUsageSummaryActivity.class.getName()), - mBatteryPresent, isAdmin, pm); + false, isAdmin, pm); setTileEnabled(new ComponentName(packageName, Settings.UserSettingsActivity.class.getName()), diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index 1ba3978..b446764 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -171,6 +171,16 @@ public class Status extends SettingsPreferenceFragment { mWimaxMacAddress = findPreference(KEY_WIMAX_MAC_ADDRESS); mIpAddress = findPreference(KEY_IP_ADDRESS); + if(mBatteryLevel != null) + { + getPreferenceScreen().removePreference(mBatteryLevel); + } + + if(mBatteryStatus !=null){ + getPreferenceScreen().removePreference(mBatteryStatus); + } + getPreferenceScreen(). removePreference(mBtAddress); + mRes = getResources(); mUnknown = mRes.getString(R.string.device_info_default); mUnavailable = mRes.getString(R.string.status_unavailable); ------------------------------------------------------------------------ ###### 6.0去掉电池信息修改：
frameworks/base#
diff --git a/base/packages/SystemUI/res/layout/system_icons.xml b/base/packages/SystemUI/res/layout/system_icons.xml index 30e0862..a53cd57 100755 --- a/base/packages/SystemUI/res/layout/system_icons.xml +++ b/base/packages/SystemUI/res/layout/system_icons.xml @@ -36,6 +36,5 @@ <com.android.systemui.BatteryMeterView android:id="@+id/battery" android:layout_height="14.5dp" android:layout_width="9.5dp" + android:visibility="gone" android:layout_marginBottom="@dimen/battery_margin_bottom"/>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java index 971978d..f61c667 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java @@ -136,6 +136,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL protected void onFinishInflate() { super.onFinishInflate(); mSystemIconsSuperContainer = findViewById(R.id.system_icons_super_container); + mSystemIconsSuperContainer.setVisibility(View.GONE); mSystemIconsContainer = (ViewGroup) findViewById(R.id.system_icons_container); mSystemIconsSuperContainer.setOnClickListener(this); mDateGroup = findViewById(R.id.date_group); packages/apps/Settings#
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 37f8e06..20a1907 100755 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -905,7 +906,7 @@ <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string> <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string> <string name="device_status" msgid="607405385799807324">"状态信息"</string> - <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"电池状态、网络状态和其他信息"</string> + <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"网络状态和其他信息"</string> <string name="device_status_summary" product="default" msgid="2599162787451519618">"电话号码、信号等"</string> <string name="storage_settings" msgid="4211799979832404953">"存储空间"</string> <string name="storage_usb_settings" msgid="642612065405691122">"存储设备和 USB"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml index 06c1f6f..a2ad82a 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2157,7 +2158,7 @@ <!-- About phone screen, title of the item to go into the Phone status screen --> <string name="device_status">Status</string> <!-- About tablet screen, summary of the item that takes you to tablet status screen --> - <string name="device_status_summary" product="tablet">Status of the battery, network, and other information</string> + <string name="device_status_summary" product="tablet">Status of the network, and other information</string> <!-- About phone screen, summary of the item to go into the phone status screen --> <string name="device_status_summary" product="default">Phone number, signal, etc.</string> <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] --> diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index b438880..9032fc0 100755 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -261,7 +261,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements private void updateTimeoutPreferenceDescription(long currentTimeout) { ListPreference preference = mScreenTimeoutPreference; String summary; - if (currentTimeout < 0) { + if (currentTimeout < 0||currentTimeout>1800000) { // Unsupported value summary = ""; } else { @@ -277,10 +277,15 @@ public class DisplaySettings extends SettingsPreferenceFragment implements best = i; } } + if(currentTimeout>1800000){ + summary = preference.getContext().getString(R.string.screen_never_timeout_summary, + entries[best]); + }else{ summary = preference.getContext().getString(R.string.screen_timeout_summary, entries[best]); } } + } preference.setSummary(summary); } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index b7614ea..cfcc477 100755 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1270,9 +1270,9 @@ public class SettingsActivity extends Activity } else if (id == R.id.battery_settings) { // Remove battery settings when battery is not available. (e.g. TV) - if (!mBatteryPresent) { +// if (!mBatteryPresent) { removeTile = true; - } +// } } else if (id == R.id.home_settings) { if (!updateHomeSettingTiles(tile)) { removeTile = true; diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index b52a0ad..1fc9fc8 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -169,6 +169,14 @@ public class Status extends InstrumentedPreferenceActivity { addPreferencesFromResource(R.xml.device_info_status); mBatteryLevel = findPreference(KEY_BATTERY_LEVEL); mBatteryStatus = findPreference(KEY_BATTERY_STATUS); + if(mBatteryLevel != null) + { + getPreferenceScreen().removePreference(mBatteryLevel); + } + + if(mBatteryStatus !=null){ + getPreferenceScreen().removePreference(mBatteryStatus); + }
------------------------------------------------------------------------
###### 5.1去掉电池信息修改： diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml index 98995a8..e6a2790 100644 --- a/packages/SystemUI/res/layout/system_icons.xml +++ b/packages/SystemUI/res/layout/system_icons.xml @@ -44,5 +44,6 @@ <com.android.systemui.BatteryMeterView android:id="@+id/battery" android:layout_height="14.5dp" android:layout_width="9.5dp" + android:visibility="gone" android:layout_marginBottom="@dimen/battery_margin_bottom"/> </LinearLayout>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java index 37de036..8f8cea4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java @@ -260,13 +260,13 @@ public class QSTileHost implements QSTile.Host { if (tileSpec.equals("wifi")) return new WifiTile(this); else if (tileSpec.equals("bt")) return new BluetoothTile(this); else if (tileSpec.equals("inversion")) return new ColorInversionTile(this); - else if (tileSpec.equals("cell")) return new CellularTileForSlot(this, PhoneConstants.SIM_ID_1); - else if (tileSpec.equals("cell2")) return new CellularTileForSlot(this, PhoneConstants.SIM_ID_2); - else if (tileSpec.equals("airplane")) return new AirplaneModeTile(this); +// else if (tileSpec.equals("cell")) return new CellularTileForSlot(this, PhoneConstants.SIM_ID_1); +// else if (tileSpec.equals("cell2")) return new CellularTileForSlot(this, PhoneConstants.SIM_ID_2); +// else if (tileSpec.equals("airplane")) return new AirplaneModeTile(this); else if (tileSpec.equals("rotation")) return new RotationLockTile(this); else if (tileSpec.equals("flashlight")) return new FlashlightTile(this); else if (tileSpec.equals("location")) return new LocationTile(this); - else if (tileSpec.equals("cast")) return new CastTile(this); +// else if (tileSpec.equals("cast")) return new CastTile(this); else if (tileSpec.equals("hotspot")) return new HotspotTile(this); else if (tileSpec.startsWith(IntentTile.PREFIX)) return IntentTile.create(this,tileSpec); else throw new IllegalArgumentException("Bad tile spec: " + tileSpec);
packages/apps/Settings#
--去掉电池信息等相关项--
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 3b735cb..62907ac 100755 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -886,7 +886,8 @@ <string name="device_info_not_available" msgid="8062521887156825182">"不可用"</string> <string name="device_status_activity_title" msgid="1411201799384697904">"状态信息"</string> <string name="device_status" msgid="607405385799807324">"状态信息"</string> - <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"电池状态、网络状态和其他信息"</string> + <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"网络状态和其他信息"</string> + <string name="device_status_summary_nobattery">"网络状态和其他信息"</string> <string name="device_status_summary" product="default" msgid="2599162787451519618">"电话号码、信号等"</string> <string name="storage_settings" msgid="4211799979832404953">"存储"</string> <string name="storage_settings_title" msgid="8746016738388094064">"存储设置"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 28cb97d..4ec846e 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2173,7 +2173,8 @@ <!-- About phone screen, title of the item to go into the Phone status screen --> <string name="device_status">Status</string> <!-- About device screen, summary of the item that takes you to device status screen --> - <string name="device_status_summary" product="tablet">Status of the battery, network, and other information</string> + <string name="device_status_summary" product="tablet"> network, and other information</string> + <string name="device_status_summary_nobattery" >Status of the network, and other information</string> <!-- About phone screen, summary of the item to go into the phone status screen --> <string name="device_status_summary" product="default">Phone number, signal, etc.</string> <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] --> diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml index 6785a50..989ef30 100644 --- a/res/xml/device_info_settings.xml +++ b/res/xml/device_info_settings.xml @@ -35,7 +35,7 @@ <!-- Device status - launches activity --> <PreferenceScreen android:key="status_info" android:title="@string/device_status" - android:summary="@string/device_status_summary"> + android:summary="@string/device_status_summary_nobattery"> <intent android:action="android.intent.action.MAIN" android:targetPackage="com.android.settings" android:targetClass="com.android.settings.deviceinfo.Status" /> diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 5cde3b7..af303e2 100755 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -1244,7 +1244,9 @@ public class SettingsActivity extends Activity if (!"box".equals(SystemProperties.get("ro.target.product", "tablet"))){ removeTile = true; } - } + }else if(id == R.id.power_save_settings){ + removeTile = true; + } if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0 && !ArrayUtils.contains(SETTINGS_FOR_RESTRICTED, id)) { diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index dfcd331..e4bb86f 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -168,11 +168,32 @@ public class Status extends PreferenceActivity { addPreferencesFromResource(R.xml.device_info_status); mBatteryLevel = findPreference(KEY_BATTERY_LEVEL); mBatteryStatus = findPreference(KEY_BATTERY_STATUS); + + + + if(mBatteryLevel != null) +{ +getPreferenceScreen().removePreference(mBatteryLevel); + } + + if(mBatteryStatus !=null){ + getPreferenceScreen().removePreference(mBatteryStatus); + } + mBtAddress = findPreference(KEY_BT_ADDRESS); mWifiMacAddress = findPreference(KEY_WIFI_MAC_ADDRESS); mWimaxMacAddress = findPreference(KEY_WIMAX_MAC_ADDRESS); mIpAddress = findPreference(KEY_IP_ADDRESS); + //qhj + remove mBatteryStatus mBatteryLevel + if(mBatteryLevel!=null){ + getPreferenceScreen().removePreference(mBatteryLevel); + } + if(mBatteryStatus !=null){ + getPreferenceScreen().removePreference(mBatteryStatus); + } + + mRes = getResources(); mUnknown = mRes.getString(R.string.device_info_default); mUnavailable = mRes.getString(R.string.status_unavailable); ------------------------------------------------------------------------
###### 4.4去掉电池信息修改： commit 49a3110a0b5375e35e7bea21b4f4a6239cdac82d Author: huangke <59305882@qq.com> Date: Wed Apr 15 11:13:06 2015 +0800
--隐藏充电图标及去掉下拉菜单的电池项--
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml index eb66908..71aef58 100644 --- a/packages/SystemUI/res/layout/status_bar.xml +++ b/packages/SystemUI/res/layout/status_bar.xml @@ -102,6 +102,7 @@ android:layout_width="10.5dp" android:layout_marginBottom="0.33dp" android:layout_marginStart="4dip" + android:visibility="gone" /> </LinearLayout> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java index c37978a..ff0d450 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettings.java @@ -536,7 +536,7 @@ class QuickSettings { mContext.getString(R.string.accessibility_quick_settings_battery, t)); } }); - parent.addView(batteryTile); + // parent.addView(batteryTile); hide by xq } // Airplane Mode final QuickSettingsBasicTile airplaneTile
