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

Commit a8deb9e8 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 51d5cdd2 eda205d8

core/java/android/app/IActivityTaskManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -283,6 +283,11 @@ interface IActivityTaskManager { 
     */

    int getLastResumedActivityUserId();



    /**

     * Return the uid of last resumed activity.

     */

    int getLastResumedActivityUid();



    /**

     * Updates global configuration and applies changes to the entire system.

     * @param values Update values for global configuration. If null is passed it will request the

packages/SystemUI/res/drawable/ic_statusbar_firewall.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorControlNormal">

  <path

      android:fillColor="#FFFFFFFF"

      android:pathData="M11,8.17L6.49,3.66C8.07,2.61 9.96,2 12,2c5.52,0 10,4.48 10,10c0,2.04 -0.61,3.93 -1.66,5.51l-1.46,-1.46C19.59,14.87 20,13.48 20,12c0,-3.35 -2.07,-6.22 -5,-7.41V5c0,1.1 -0.9,2 -2,2h-2V8.17zM21.19,21.19l-1.41,1.41l-2.27,-2.27C15.93,21.39 14.04,22 12,22C6.48,22 2,17.52 2,12c0,-2.04 0.61,-3.93 1.66,-5.51L1.39,4.22l1.41,-1.41L21.19,21.19zM11,18c-1.1,0 -2,-0.9 -2,-2v-1l-4.79,-4.79C4.08,10.79 4,11.38 4,12c0,4.08 3.05,7.44 7,7.93V18z"/>

</vector>

packages/SystemUI/res/drawable/stat_sys_firewall.xml

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="#FF000000"

      android:pathData="M11,8.17L6.49,3.66C8.07,2.61 9.96,2 12,2c5.52,0 10,4.48 10,10c0,2.04 -0.61,3.93 -1.66,5.51l-1.46,-1.46C19.59,14.87 20,13.48 20,12c0,-3.35 -2.07,-6.22 -5,-7.41V5c0,1.1 -0.9,2 -2,2h-2V8.17zM21.19,21.19l-1.41,1.41l-2.27,-2.27C15.93,21.39 14.04,22 12,22C6.48,22 2,17.52 2,12c0,-2.04 0.61,-3.93 1.66,-5.51L1.39,4.22l1.41,-1.41L21.19,21.19zM11,18c-1.1,0 -2,-0.9 -2,-2v-1l-4.79,-4.79C4.08,10.79 4,11.38 4,12c0,4.08 3.05,7.44 7,7.93V18z"/>

</vector>

packages/SystemUI/res/layout/qs_footer_impl.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
                    android:layout_width="@dimen/qs_footer_action_button_size"

                    android:layout_height="@dimen/qs_footer_action_button_size"

                    android:layout_gravity="center_vertical|end"

                    android:background="?android:attr/selectableItemBackground"

                    android:background="?android:attr/actionBarItemBackground"

                    android:clickable="true"

                    android:contentDescription="@string/accessibility_quick_settings_edit"

                    android:focusable="true"

packages/SystemUI/res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -108,4 +108,8 @@ 
    <!-- Navigation bar dpad -->

    <string name="accessibility_dpad_left">Cursor left</string>

    <string name="accessibility_dpad_right">Cursor right</string>



    <!-- Name of the firewall status bar icon. -->

    <string name="status_bar_firewall">Firewall</string>

    <string name="status_bar_firewall_slot" translatable="false">firewall</string>

</resources>