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

Commit 25448d4e authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "remove_fgs_manager_tile"

* changes:
  Create QS footer entry point for fgs manager
  Remove the foreground service manager tile
parents 4f5a4276 5e147cc4
Loading
Loading
Loading
Loading
+0 −42
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    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.
-->

<!-- Remove when Fgs manager tile is removed -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="48dp"
    android:height="48dp"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
        android:pathData="M2,4h4v4h-4z"
        android:fillColor="#000000"/>
    <path
        android:pathData="M8,4h14v4h-14z"
        android:fillColor="#000000"/>
    <path
        android:pathData="M2,10h4v4h-4z"
        android:fillColor="#000000"/>
    <path
        android:pathData="M8,10h14v4h-14z"
        android:fillColor="#000000"/>
    <path
        android:pathData="M2,16h4v4h-4z"
        android:fillColor="#000000"/>
    <path
        android:pathData="M8,16h14v4h-14z"
        android:fillColor="#000000"/>
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@

    <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->
    <string name="quick_settings_tiles_stock" translatable="false">
        internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,fgsmanager,color_correction
        internet,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,qr_code_scanner,onehanded,color_correction
    </string>

    <!-- The tiles to display in QuickSettings -->
+5 −0
Original line number Diff line number Diff line
@@ -2355,6 +2355,11 @@
    <!-- Title for User Switch dialog. [CHAR LIMIT=20] -->
    <string name="qs_user_switch_dialog_title">Select user</string>

    <!-- Label for the entry point to open the dialog which shows currently running applications [CHAR LIMIT=NONE]-->
    <plurals name="fgs_manager_footer_label">
        <item quantity="one"><xliff:g id="count" example="1">%s</xliff:g> app running in the background</item>
        <item quantity="other"><xliff:g id="count" example="2">%s</xliff:g> apps running in the background</item>
    </plurals>
    <!-- Title for dialog listing applications currently running in the backing [CHAR LIMIT=NONE]-->
    <string name="fgs_manager_dialog_title">Apps running in the background</string>
    <!-- Label of the button to stop the app from running in the background [CHAR LIMIT=12]-->
+0 −10
Original line number Diff line number Diff line
@@ -308,14 +308,4 @@
        <item>Off</item>
        <item>On</item>
    </string-array>

    <!-- State names for fgsmanager tile: unavailable, off, on.
         This subtitle is shown when the tile is in that particular state but does not set its own
         subtitle, so some of these may never appear on screen. They should still be translated as
         if they could appear.[CHAR LIMIT=32] -->
    <string-array name="tile_states_fgsmanager">
        <item>Unavailable</item>
        <item>Off</item>
        <item>On</item>
    </string-array>
</resources>
 No newline at end of file
+6 −1
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
    private final QSPanelController mQsPanelController;
    private final QuickQSPanelController mQuickQSPanelController;
    private final QuickStatusBarHeader mQuickStatusBarHeader;
    private final QSFgsManagerFooter mFgsManagerFooter;
    private final QSSecurityFooter mSecurityFooter;
    private final QS mQs;
    private final View mQSFooterActions;
@@ -151,7 +152,8 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
    public QSAnimator(QS qs, QuickQSPanel quickPanel, QuickStatusBarHeader quickStatusBarHeader,
            QSPanelController qsPanelController,
            QuickQSPanelController quickQSPanelController, QSTileHost qsTileHost,
            QSSecurityFooter securityFooter, @Main Executor executor, TunerService tunerService,
            QSFgsManagerFooter fgsManagerFooter, QSSecurityFooter securityFooter,
            @Main Executor executor, TunerService tunerService,
            QSExpansionPathInterpolator qsExpansionPathInterpolator,
            @Named(QS_FOOTER) FooterActionsView qsFooterActionsView,
            @Named(QQS_FOOTER) FooterActionsView qqsFooterActionsView) {
@@ -162,6 +164,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
        mQuickStatusBarHeader = quickStatusBarHeader;
        mQQSFooterActions = qqsFooterActionsView;
        mQSFooterActions = qsFooterActionsView;
        mFgsManagerFooter = fgsManagerFooter;
        mSecurityFooter = securityFooter;
        mHost = qsTileHost;
        mExecutor = executor;
@@ -481,6 +484,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha

            // Fade in the security footer and the divider as we reach the final position
            Builder builder = new Builder().setStartDelay(EXPANDED_TILE_DELAY);
            builder.addFloat(mFgsManagerFooter.getView(), "alpha", 0, 1);
            builder.addFloat(mSecurityFooter.getView(), "alpha", 0, 1);
            if (mQsPanelController.shouldUseHorizontalLayout()
                    && mQsPanelController.mMediaHost.hostView != null) {
@@ -490,6 +494,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
                mQsPanelController.mMediaHost.hostView.setAlpha(1.0f);
            }
            mAllPagesDelayedAnimator = builder.build();
            mAllViews.add(mFgsManagerFooter.getView());
            mAllViews.add(mSecurityFooter.getView());
            translationYBuilder.setInterpolator(mQSExpansionPathInterpolator.getYInterpolator());
            qqsTranslationYBuilder.setInterpolator(mQSExpansionPathInterpolator.getYInterpolator());
Loading