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

Commit 1ed0c12a authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge changes Id1aab629,Idb24dbd4 into nyc-dev 

* changes:
  Fixed a few issues when adapting the dpi
  Fixed a few issues with status bar density changes
parents 3af18caf 3e7592d0

packages/SystemUI/res/layout/brightness_mirror.xml

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2016 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

    android:id="@+id/brightness_mirror"

    android:layout_width="@dimen/notification_panel_width"

    android:layout_height="wrap_content"

    android:layout_gravity="@integer/notification_panel_layout_gravity"

    android:visibility="invisible">

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@drawable/brightness_mirror_background"

        android:elevation="2dp">

        <include layout="@layout/quick_settings_brightness_dialog"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

    </FrameLayout>

</FrameLayout>

packages/SystemUI/res/layout/signal_cluster_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
<!-- extends LinearLayout -->

<com.android.systemui.statusbar.SignalClusterView

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

    android:id="@+id/signal_cluster"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:gravity="center_vertical"

packages/SystemUI/res/layout/super_status_bar.xml

+1 −15
Original line number Diff line number Diff line
@@ -62,21 +62,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/status_bar_height" />



    <FrameLayout android:id="@+id/brightness_mirror"

                 android:layout_width="@dimen/notification_panel_width"

                 android:layout_height="wrap_content"

                 android:layout_gravity="@integer/notification_panel_layout_gravity"

                 android:visibility="invisible">

        <FrameLayout

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:elevation="2dp"

                android:background="@drawable/brightness_mirror_background">

            <include layout="@layout/quick_settings_brightness_dialog"

                     android:layout_width="match_parent"

                     android:layout_height="wrap_content" />

        </FrameLayout>

    </FrameLayout>

    <include layout="@layout/brightness_mirror" />



    <ViewStub android:id="@+id/fullscreen_user_switcher_stub"

              android:layout="@layout/car_fullscreen_user_switcher"

packages/SystemUI/res/layout/system_icons.xml

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
        android:orientation="horizontal"/>



    <include layout="@layout/signal_cluster_view"

        android:id="@+id/signal_cluster"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/signal_cluster_margin_start"/>

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+2 −2
Original line number Diff line number Diff line
@@ -910,7 +910,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
        final float fontScale = newConfig.fontScale;

        final int density = newConfig.densityDpi;

        if (density != mDensity || mFontScale != fontScale) {

            reInflateViews();

            onDensityOrFontScaleChanged();

            mDensity = density;

            mFontScale = fontScale;

        }
@@ -926,7 +926,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
        }

    }



    protected void reInflateViews() {

    protected void onDensityOrFontScaleChanged() {

        ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();

        for (int i = 0; i < activeNotifications.size(); i++) {

            Entry entry = activeNotifications.get(i);