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

Commit 76812ac8 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Add separate roaming icon for status bar + QS" into nyc-mr2-dev

parents 56d29925 f62e8893

packages/SystemUI/res/drawable/ic_qs_signal_r.xml

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

Copyright (C) 2014 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="8.0dp"

        android:height="32dp"

        android:viewportWidth="6.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M2.800000,7.900000l-1.000000,0.000000L1.800000,11.000000L0.200000,11.000000L0.200000,2.500000l2.700000,0.000000c0.900000,0.000000 1.500000,0.200000 2.000000,0.700000s0.700000,1.100000 0.700000,1.900000c0.000000,0.600000 -0.100000,1.100000 -0.300000,1.500000S4.800000,7.200000 4.400000,7.400000l1.500000,3.500000L5.900000,11.000000L4.100000,11.000000L2.800000,7.900000zM1.800000,6.500000l1.100000,0.000000c0.400000,0.000000 0.600000,-0.100000 0.800000,-0.400000S4.000000,5.600000 4.000000,5.200000c0.000000,-0.400000 -0.100000,-0.800000 -0.300000,-1.000000S3.300000,3.800000 2.900000,3.800000L1.800000,3.800000L1.800000,6.500000z"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_data_fully_connected_roam.xml→packages/SystemUI/res/drawable/stat_sys_roaming.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ Copyright (C) 2014 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="4.25dp"

        android:width="8.5dp"

        android:height="17dp"

        android:viewportWidth="6.0"

        android:viewportHeight="24.0">

        android:viewportHeight="12.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M2.800000,7.900000l-1.000000,0.000000L1.800000,11.000000L0.200000,11.000000L0.200000,2.500000l2.700000,0.000000c0.900000,0.000000 1.500000,0.200000 2.000000,0.700000s0.700000,1.100000 0.700000,1.900000c0.000000,0.600000 -0.100000,1.100000 -0.300000,1.500000S4.800000,7.200000 4.400000,7.400000l1.500000,3.500000L5.900000,11.000000L4.100000,11.000000L2.800000,7.900000zM1.800000,6.500000l1.100000,0.000000c0.400000,0.000000 0.600000,-0.100000 0.800000,-0.400000S4.000000,5.600000 4.000000,5.200000c0.000000,-0.400000 -0.100000,-0.800000 -0.300000,-1.000000S3.300000,3.800000 2.900000,3.800000L1.800000,3.800000L1.800000,6.500000z"/>

packages/SystemUI/res/layout/data_usage.xml

+11 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:textAppearance="@style/TextAppearance.QS.DataUsage" />



    </LinearLayout>



    <LinearLayout
@@ -82,4 +83,13 @@ 
            android:textAppearance="@style/TextAppearance.QS.DataUsage.Secondary" />

    </LinearLayout>



    <TextView

        android:id="@+id/roaming_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:paddingTop="16dp"

        android:text="@string/accessibility_data_connection_roaming"

        android:textAppearance="@style/TextAppearance.QS.DataUsage.Secondary"

        android:visibility="gone" />



</com.android.systemui.qs.tiles.DataUsageDetailView>

packages/SystemUI/res/layout/mobile_signal_group.xml

+11 −0
Original line number Diff line number Diff line
@@ -43,4 +43,15 @@ 
        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        />

    <ImageView

        android:id="@+id/mobile_roaming"

        android:layout_width="wrap_content"

        android:layout_height="17dp"

        android:paddingStart="22dp"

        android:paddingTop="1.5dp"

        android:paddingBottom="3dp"

        android:scaleType="fitCenter"

        android:src="@drawable/stat_sys_roaming"

        android:contentDescription="@string/accessibility_data_connection_roaming"

        android:visibility="gone" />

</FrameLayout>

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

+2 −2
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha 
                translationXBuilder.addFloat(label, "translationX", -xDiff, 0);

                translationYBuilder.addFloat(label, "translationY", -yDiff, 0);



                mTopFiveQs.add(tileIcon);

                mAllViews.add(tileIcon);

                mTopFiveQs.add(tileView.getIcon());

                mAllViews.add(tileView.getIcon());

                mAllViews.add(quickTileView);

            } else if (mFullRows && isIconInAnimatedRow(count)) {

                // TODO: Refactor some of this, it shares a lot with the above block.