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

Commit e7eadc46 authored by John Spurlock's avatar John Spurlock Committed by android-build-merger
Browse files

am 404658ee: Merge "Update 1-bar status bar / qs icons." into lmp-mr1-dev 

automerge: 44c534d8

* commit '44c534d8':
  Update 1-bar status bar / qs icons.
parents 14deca6d 44c534d8

packages/SystemUI/res/drawable/ic_qs_signal_1.xml

+6 −6
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ Copyright (C) 2014 The Android Open Source Project 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>

        android:pathData="M19.7,20.0l2.0,0.0l0.0,2.0l-2.0,0.0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>

        android:pathData="M19.7,10.0l2.0,0.0l0.0,8.1l-2.0,0.0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>

        android:fillColor="#4DFFFFFF"

        android:pathData="M17.7,8.0l4.299999,0.0 0.0,-6.0 -20.0,20.0 15.700001,0.0z"/>

    <path

        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"

        android:fillColor="#4DFFFFFF"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M10.1,13.9l-8.1,8.1 8.1,0.0z"/>

</vector>

packages/SystemUI/res/drawable/ic_qs_signal_full_1.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ Copyright (C) 2014 The Android Open Source Project 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>

        android:pathData="M2.0,22.0l20.0,0.0 0.0,-20.0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>

        android:pathData="M10.1,13.9l-8.1,8.1 8.1,0.0z"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_signal_1.xml

+6 −6
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ Copyright (C) 2014 The Android Open Source Project 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.700001,20.000000l2.000000,0.000000l0.000000,2.000000l-2.000000,0.000000z"/>

        android:pathData="M19.7,20.0l2.0,0.0l0.0,2.0l-2.0,0.0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M19.700001,10.000000l2.000000,0.000000l0.000000,8.100000l-2.000000,0.000000z"/>

        android:pathData="M19.7,10.0l2.0,0.0l0.0,8.1l-2.0,0.0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>

        android:fillColor="#4DFFFFFF"

        android:pathData="M17.7,8.0l4.299999,0.0 0.0,-6.0 -20.0,20.0 15.700001,0.0z"/>

    <path

        android:pathData="M17.700001,8.000000l4.299999,0.000000 0.000000,-6.000000 -20.000000,20.000000 15.700001,0.000000z"

        android:fillColor="#4DFFFFFF"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M10.1,13.9l-8.1,8.1 8.1,0.0z"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_signal_1_fully.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ Copyright (C) 2014 The Android Open Source Project 
        android:viewportHeight="24.0">

    <path

        android:fillColor="#4DFFFFFF"

        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>

        android:pathData="M2.0,22.0l20.0,0.0 0.0,-20.0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>

        android:pathData="M10.1,13.9l-8.1,8.1 8.1,0.0z"/>

</vector>

packages/SystemUI/src/com/android/systemui/statusbar/phone/DemoStatusIcons.java

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ public class DemoStatusIcons extends LinearLayout implements DemoMode { 
            }

        }

        StatusBarIcon icon = new StatusBarIcon(iconPkg, UserHandle.CURRENT, iconId, 0, 0, "Demo");

        StatusBarIconView v = new StatusBarIconView(getContext(), null);

        StatusBarIconView v = new StatusBarIconView(getContext(), null, null);

        v.setTag(slot);

        v.set(icon);

        addView(v, 0, new LinearLayout.LayoutParams(mIconSize, mIconSize));