android10 systemui隐藏电池图标显示

diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/quick_qs_status_icons.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/quick_qs_status_icons.xml index 5b7e7e7d59…75670a9d3b 100644 — a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/quick_qs_status_icons.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/quick_qs_status_icons.xml @@ -49,6 49,7 @@

     <com.android.systemui.BatteryMeterView          android:visibility="gone"          android:id="@ id/batteryRemainingIcon"          android:layout_height="match_parent"          android:layout_width="wrap_content" 

 diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/system_icons.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/system_icons.xml 

index f3b72bf237…886f25f469 100644 — a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/system_icons.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/system_icons.xml @@ -30,6 30,7 @@

     <com.android.systemui.BatteryMeterView android:id="@ id/battery"          android:visibility="gone"          android:layout_height="match_parent"          android:layout_width="wrap_content"          android:clipToPadding="false" 

diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml index 6e6c009dd1…53ebb101e8 100644 — a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/values/config.xml

@@ -60,7  60,8 @@      <bool name="config_showMin3G">false</bool>       <!-- Show rotation lock toggle in System UI--> -    <bool name="config_showRotationLock"span class="token operator">>true</bool>
+   <!--  <bool name="config_showRotationLock">true</bool>-->
+   <bool name="config_showRotationLock">false</bool>

     <!-- Vibration duration for GlowPadView used in SearchPanelView -->
     <integer translatable="false" name="config_vibration_duration">0</integer>
@@ -109,7 +110,7 @@

     <!-- The default tiles to display in QuickSettings -->
     <string name="quick_settings_tiles_default" translatable="false">
-        wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast
+        wifi,bt,flashlight,cell,airplane
     </string>

     <!-- The minimum number of tiles to display in QuickSettings -->
@@ -117,7 +118,7 @@

     <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
     <string name="quick_settings_tiles_stock" translatable="false">
-        wifi,cell,battery,dnd,flashlight,rotation,bt,airplane,location,hotspot,inversion,saver,dark,work,cast,night
+        wifi,cell,flashlight,bt,airplane,location,hotspot,inversion,saver,dark,work,night
     </string>

     <!-- The tiles to display in QuickSettings -->
@@ -125,7 +126,7 @@

     <!-- The tiles to display in QuickSettings in retail mode -->
     <string name="quick_settings_tiles_retail_mode" translatable="false">
-        cell,battery,dnd,flashlight,rotation,location
+        cell,flashlight,location
     </string>

diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/qs_footer_impl.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/qs_footer_impl.xml index a02962e5e1…20ba9948e1 100644 — a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/qs_footer_impl.xml +++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/qs_footer_impl.xml

@@ -44,6 +44,7 @@
             android:gravity="center_vertical|start" >
             <com.android.systemui.statusbar.AlphaOptimizedImageView
                 android:id="@android:id/edit"
+                android:visibility="gone"
                 android:layout_width="@dimen/qs_footer_action_button_size"
                 android:layout_height="@dimen/qs_footer_action_button_size"
                 android:background="?android:attr/selectableItemBackgroundBorderless"

简单的说就是把qs_panel_width和notification_panel_width相关的变量替换成match_parent

diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/brightness_mirror.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/brightness_mirror.xml
index e3440b53d2..a12e9d7998 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/brightness_mirror.xml
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/brightness_mirror.xml
@@ -17,7 +17,7 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/brightness_mirror"
-    android:layout_width="@dimen/qs_panel_width"
+    android:layout_width="match_parent"
     android:layout_height="@dimen/brightness_mirror_height"
     android:layout_gravity="@integer/notification_panel_layout_gravity"
     android:visibility="invisible">
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/notif_half_shelf.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/notif_half_shelf.xml
index 26c8872313..93bc12989e 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/notif_half_shelf.xml
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/notif_half_shelf.xml
@@ -27,7 +27,7 @@

     <LinearLayout
         android:id="@+id/half_shelf"
-        android:layout_width="@dimen/qs_panel_width"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
         android:gravity="bottom"


diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/status_bar_expanded.xml b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/status_bar_expanded.xml
index 7d403b2435..3619e5e8f2 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/status_bar_expanded.xml
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/res/layout/status_bar_expanded.xml
@@ -48,7 +48,7 @@
         <FrameLayout
             android:id="@+id/qs_frame"
             android:layout="@layout/qs_panel"
-            android:layout_width="@dimen/qs_panel_width"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="@integer/notification_panel_layout_gravity"
             android:clipToPadding="false"
@@ -58,7 +58,7 @@
         <com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout
             android:id="@+id/notification_stack_scroller"
             android:layout_marginTop="@dimen/notification_panel_margin_top"
-            android:layout_width="@dimen/notification_panel_width"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="@integer/notification_panel_layout_gravity"
             android:layout_marginBottom="@dimen/close_handle_underlap" />


diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
index 8a9e7de032..2903f6607c 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
@@ -552,7 +552,8 @@ class GlobalScreenshot { 
        
         // determine the optimal preview size
         int panelWidth = 0;
         try { 
        
-            panelWidth = r.getDimensionPixelSize(R.dimen.notification_panel_width);
+            //panelWidth = r.getDimensionPixelSize(R.dimen.notification_panel_width);
+            panelWidth = mDisplayMetrics.widthPixels;
         } catch (Resources.NotFoundException e) { 
        
         }
         if (panelWidth <= 0) { 
        
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java
index 3f1ff33437..2faba1962d 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/HeadsUpStatusBarView.java
@@ -24,6 +24,7 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.view.DisplayCutout;
 import android.view.View;
 import android.widget.TextView;
@@ -90,7 +91,8 @@ public class HeadsUpStatusBarView extends AlphaOptimizedLinearLayout { 
        
     }

     private void updateMaxWidth() { 
        
-        int maxWidth = getResources().getDimensionPixelSize(R.dimen.qs_panel_width);
+        //int maxWidth = getResources().getDimensionPixelSize(R.dimen.qs_panel_width);
+        int maxWidth = getResources().getDisplayMetrics().widthPixels;
         if (maxWidth != mMaxWidth) { 
        
             // maxWidth doesn't work with fill_parent, let's manually make it at most as big as the
             // notification panel


--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -43,6 +43,7 @@ import android.os.PowerManager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.MathUtils;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
@@ -472,7 +473,9 @@ public class NotificationPanelView extends PanelView implements

     public void updateResources() { 
        
         Resources res = getResources();
-        int qsWidth = res.getDimensionPixelSize(R.dimen.qs_panel_width);
+        DisplayMetrics displayMetrics = res.getDisplayMetrics();
+        //int qsWidth = res.getDimensionPixelSize(R.dimen.qs_panel_width);
+        int qsWidth = displayMetrics.widthPixels;
         int panelGravity = getResources().getInteger(R.integer.notification_panel_layout_gravity);
         FrameLayout.LayoutParams lp =
                 (FrameLayout.LayoutParams) mQsFrame.getLayoutParams();
@@ -482,7 +485,8 @@ public class NotificationPanelView extends PanelView implements
             mQsFrame.setLayoutParams(lp);
         }

-        int panelWidth = res.getDimensionPixelSize(R.dimen.notification_panel_width);
+        //int panelWidth = res.getDimensionPixelSize(R.dimen.notification_panel_width);
+        int panelWidth = displayMetrics.widthPixels;

--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/phone/NotificationsQuickSettingsContainer.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
+import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewStub;
 import android.view.ViewStub.OnInflateListener;
@@ -95,7 +96,8 @@ public class NotificationsQuickSettingsContainer extends FrameLayout
      */
     private void reloadWidth(View view, @DimenRes int width) { 
        
         LayoutParams params = (LayoutParams) view.getLayoutParams();
-        params.width = getResources().getDimensionPixelSize(width);
+        //params.width = getResources().getDimensionPixelSize(width);
+        params.width = getResources().getDisplayMetrics().widthPixels;
         view.setLayoutParams(params);
     }


--- a/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/SystemUI/src/com/android/systemui/statusbar/policy/BrightnessMirrorController.java
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.policy;
 import android.annotation.NonNull;
 import android.content.res.Resources;
 import android.util.ArraySet;
+import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
@@ -89,7 +90,8 @@ public class BrightnessMirrorController
         FrameLayout.LayoutParams lp =
                 (FrameLayout.LayoutParams) mBrightnessMirror.getLayoutParams();
         Resources r = mBrightnessMirror.getResources();
-        lp.width = r.getDimensionPixelSize(R.dimen.qs_panel_width);
+        //lp.width = r.getDimensionPixelSize(R.dimen.qs_panel_width);
+        lp.width = r.getDisplayMetrics().widthPixels;
         lp.height = r.getDimensionPixelSize(R.dimen.brightness_mirror_height);
         lp.gravity = r.getInteger(R.integer.notification_panel_layout_gravity);
         mBrightnessMirror.setLayoutParams(lp);