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

Commit 790c4fee authored by yinxu's avatar yinxu
Browse files

Show standalone icon R for roaming indication 

clean cherry pick from
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/base/+/13377028

Bug: 175421071
Test: Manual Tests
Change-Id: I59e3a03eedfe5d76e0d33657d17ed70b7c0abd27
parent d39f71e4

packages/SystemUI/res/drawable/stat_sys_roaming_large.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2021 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.

-->

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

        android:width="@dimen/signal_icon_size"

        android:height="@dimen/signal_icon_size"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M14.21,12.81c0.36,-0.16 0.69,-0.36 0.97,-0.61c0.41,-0.38 0.72,-0.83 0.94,-1.37c0.21,-0.54 0.32,-1.14 0.32,-1.79c0,-0.92 -0.16,-1.7 -0.49,-2.33c-0.32,-0.64 -0.79,-1.12 -1.43,-1.45c-0.62,-0.33 -1.4,-0.49 -2.32,-0.49H8.23V19h1.8v-5.76h2.5L15.06,19h1.92v-0.12L14.21,12.81zM10.03,11.71V6.32h2.18c0.59,0 1.06,0.11 1.42,0.34c0.36,0.22 0.62,0.54 0.78,0.95c0.16,0.41 0.24,0.89 0.24,1.44c0,0.49 -0.09,0.93 -0.27,1.34c-0.18,0.4 -0.46,0.73 -0.82,0.97c-0.36,0.23 -0.82,0.35 -1.37,0.35H10.03z"/>

</vector>

packages/SystemUI/res/layout/mobile_signal_group.xml

+7 −0
Original line number Diff line number Diff line
@@ -77,4 +77,11 @@ 
            android:contentDescription="@string/data_connection_roaming"

            android:visibility="gone" />

    </FrameLayout>

    <ImageView

        android:id="@+id/mobile_roaming_large"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:src="@drawable/stat_sys_roaming_large"

        android:contentDescription="@string/data_connection_roaming"

        android:visibility="gone" />

</com.android.keyguard.AlphaOptimizedLinearLayout>

packages/SystemUI/res/layout/status_bar_mobile_signal_group.xml

+7 −0
Original line number Diff line number Diff line
@@ -85,6 +85,13 @@ 
                android:contentDescription="@string/data_connection_roaming"

                android:visibility="gone" />

        </FrameLayout>

        <ImageView

            android:id="@+id/mobile_roaming_large"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:src="@drawable/stat_sys_roaming_large"

            android:contentDescription="@string/data_connection_roaming"

            android:visibility="gone" />

    </com.android.keyguard.AlphaOptimizedLinearLayout>

</com.android.systemui.statusbar.StatusBarMobileView>

packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrier.java

+6 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
import android.content.res.ColorStateList;

import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.FeatureFlagUtils;

import android.view.View;

import android.widget.ImageView;

import android.widget.LinearLayout;
@@ -65,10 +66,13 @@ public class QSCarrier extends LinearLayout { 
        super.onFinishInflate();

        mDualToneHandler = new DualToneHandler(getContext());

        mMobileGroup = findViewById(R.id.mobile_combo);

        mMobileSignal = findViewById(R.id.mobile_signal);

        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {

            mMobileRoaming = findViewById(R.id.mobile_roaming_large);

        } else {

            mMobileRoaming = findViewById(R.id.mobile_roaming);

        }

        mMobileSignal = findViewById(R.id.mobile_signal);

        mCarrierText = findViewById(R.id.qs_carrier_text);



        mMobileSignal.setImageDrawable(new SignalDrawable(mContext));



        int colorForeground = Utils.getColorAttrDefaultColor(mContext,

packages/SystemUI/src/com/android/systemui/qs/carrier/QSCarrierGroupController.java

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class QSCarrierGroupController { 
                        boolean activityIn, boolean activityOut,

                        CharSequence typeContentDescription,

                        CharSequence typeContentDescriptionHtml, CharSequence description,

                        boolean isWide, int subId, boolean roaming) {

                        boolean isWide, int subId, boolean roaming, boolean showTriangle) {

                    int slotIndex = getSlotIndex(subId);

                    if (slotIndex >= SIM_SLOTS) {

                        Log.w(TAG, "setMobileDataIndicators - slot: " + slotIndex);