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

Commit 7b6dfa18 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[SB Refactor] Define a new status bar wifi view that can be swapped... 

Merge "[SB Refactor] Define a new status bar wifi view that can be swapped in/out with the old view. Define a skeleton ViewBinder for the new view." into tm-qpr-dev am: 321e58d8 am: 04e7dc8c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19669387



Change-Id: I83a4b2ab13682ee11c3c6ae811182fd34e4c074b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d322d052 04e7dc8c

packages/SystemUI/res/layout/new_status_bar_wifi_group.xml

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

<!--

**

** Copyright 2022, 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.

*/

-->

<com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView

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

    android:id="@+id/wifi_combo"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:gravity="center_vertical" >



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



</com.android.systemui.statusbar.pipeline.wifi.ui.view.ModernStatusBarWifiView>

packages/SystemUI/res/layout/status_bar_wifi_group.xml

+2 −61
Original line number Diff line number Diff line
@@ -18,70 +18,11 @@ 
-->

<com.android.systemui.statusbar.StatusBarWifiView

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

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

    android:id="@+id/wifi_combo"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:gravity="center_vertical" >



    <com.android.keyguard.AlphaOptimizedLinearLayout

        android:id="@+id/wifi_group"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:layout_marginStart="2.5dp"

    >

        <FrameLayout

                android:id="@+id/inout_container"

                android:layout_height="17dp"

                android:layout_width="wrap_content"

                android:gravity="center_vertical" >

            <ImageView

                android:id="@+id/wifi_in"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_down"

                android:visibility="gone"

                android:paddingEnd="2dp"

            />

            <ImageView

                android:id="@+id/wifi_out"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_up"

                android:paddingEnd="2dp"

                android:visibility="gone"

            />

        </FrameLayout>

        <FrameLayout

            android:id="@+id/wifi_combo"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:gravity="center_vertical" >

            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/wifi_signal"

                android:layout_height="@dimen/status_bar_wifi_signal_size"

                android:layout_width="@dimen/status_bar_wifi_signal_size" />

        </FrameLayout>



        <View

            android:id="@+id/wifi_signal_spacer"

            android:layout_width="@dimen/status_bar_wifi_signal_spacer_width"

            android:layout_height="4dp"

            android:visibility="gone" />



        <!-- Looks like CarStatusBar uses this... -->

        <ViewStub

            android:id="@+id/connected_device_signals_stub"

            android:layout="@layout/connected_device_signal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

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



        <View

            android:id="@+id/wifi_airplane_spacer"

            android:layout_width="@dimen/status_bar_airplane_spacer_width"

            android:layout_height="4dp"

            android:visibility="gone"

        />

    </com.android.keyguard.AlphaOptimizedLinearLayout>

</com.android.systemui.statusbar.StatusBarWifiView>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar_wifi_group_inner.xml

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

<!--

**

** Copyright 2022, 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.

*/

-->



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



    <com.android.keyguard.AlphaOptimizedLinearLayout

        android:id="@+id/wifi_group"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:layout_marginStart="2.5dp"

    >

        <FrameLayout

                android:id="@+id/inout_container"

                android:layout_height="17dp"

                android:layout_width="wrap_content"

                android:gravity="center_vertical" >

            <ImageView

                android:id="@+id/wifi_in"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_down"

                android:visibility="gone"

                android:paddingEnd="2dp"

            />

            <ImageView

                android:id="@+id/wifi_out"

                android:layout_height="wrap_content"

                android:layout_width="wrap_content"

                android:src="@drawable/ic_activity_up"

                android:paddingEnd="2dp"

                android:visibility="gone"

            />

        </FrameLayout>

        <FrameLayout

            android:id="@+id/wifi_combo"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:gravity="center_vertical" >

            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/wifi_signal"

                android:layout_height="@dimen/status_bar_wifi_signal_size"

                android:layout_width="@dimen/status_bar_wifi_signal_size" />

        </FrameLayout>



        <View

            android:id="@+id/wifi_signal_spacer"

            android:layout_width="@dimen/status_bar_wifi_signal_spacer_width"

            android:layout_height="4dp"

            android:visibility="gone" />



        <!-- Looks like CarStatusBar uses this... -->

        <ViewStub

            android:id="@+id/connected_device_signals_stub"

            android:layout="@layout/connected_device_signal"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />



        <View

            android:id="@+id/wifi_airplane_spacer"

            android:layout_width="@dimen/status_bar_airplane_spacer_width"

            android:layout_height="4dp"

            android:visibility="gone"

        />

    </com.android.keyguard.AlphaOptimizedLinearLayout>

</merge>

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+5 −1
Original line number Diff line number Diff line
@@ -154,7 +154,11 @@ public class Flags { 
    public static final ReleasedFlag STATUS_BAR_LETTERBOX_APPEARANCE =

            new ReleasedFlag(603, false);



    public static final UnreleasedFlag NEW_STATUS_BAR_PIPELINE = new UnreleasedFlag(604, true);

    public static final UnreleasedFlag NEW_STATUS_BAR_PIPELINE_BACKEND =

            new UnreleasedFlag(604, true);



    public static final UnreleasedFlag NEW_STATUS_BAR_PIPELINE_FRONTEND =

            new UnreleasedFlag(605, true);



    /***************************************/

    // 700 - dialer/calls

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java

+3 −2
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
            FeatureFlags featureFlags,

            VariableDateViewController.Factory variableDateViewControllerFactory,

            BatteryMeterViewController batteryMeterViewController,

            StatusBarContentInsetsProvider statusBarContentInsetsProvider) {

            StatusBarContentInsetsProvider statusBarContentInsetsProvider,

            StatusBarIconController.TintedIconManager.Factory tintedIconManagerFactory) {

        super(view);

        mPrivacyIconsController = headerPrivacyIconsController;

        mStatusBarIconController = statusBarIconController;
@@ -103,7 +104,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
                mView.requireViewById(R.id.date_clock)

        );



        mIconManager = new StatusBarIconController.TintedIconManager(mIconContainer, featureFlags);

        mIconManager = tintedIconManagerFactory.create(mIconContainer);

        mDemoModeReceiver = new ClockDemoModeReceiver(mClockView);

        mColorExtractor = colorExtractor;

        mOnColorsChangedListener = (extractor, which) -> {