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

Commit 75f7bbc1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow grids to specify if we should start align taskbar in 3 button... 

Merge "Allow grids to specify if we should start align taskbar in 3 button nav." into tm-qpr-dev am: 65ac592f am: a2b770b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22361600



Change-Id: I41eea8cf3fa15c9c5c3f3184f2ba75318332f623
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8382546a a2b770b4

quickstep/res/values-sw600dp/config.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

-->

<!-- Applies to large tablet screens portrait -->

<resources>

    <!-- Taskbar -->

    <!-- Align the Taskbar to the start (Left/Right) of the device when 3 button nav is enabled. -->

    <bool name="start_align_taskbar">true</bool>

</resources>
 
 No newline at end of file

quickstep/res/values-sw720dp-land/config.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

-->

<!-- Applies to large tablet screens landscape -->

<resources>

    <!-- Taskbar -->

    <!-- Align the Taskbar to the start (Left/Right) of the device when 3 button nav is enabled. -->

    <bool name="start_align_taskbar">false</bool>

</resources>
 
 No newline at end of file

quickstep/res/values-sw720dp/config.xml

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

-->

<!-- Applies to large tablet screens portrait -->

<resources>

    <!-- Taskbar -->

    <!-- Align the Taskbar to the start (Left/Right) of the device when 3 button nav is enabled. -->

    <bool name="start_align_taskbar">true</bool>

</resources>
 
 No newline at end of file

quickstep/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -52,10 +52,6 @@ 


    <string name="setup_wizard_pkg" translatable="false" />



    <!-- Taskbar -->

    <!-- Align the Taskbar to the start (Left/Right) of the device when 3 button nav is enabled. -->

    <bool name="start_align_taskbar">false</bool>



    <!-- This is a float because it is converted to dp later in DeviceProfile -->

    <item name="taskbar_icon_size" type="dimen" format="float">44</item>

</resources>

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+22 −4
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ import java.util.function.Predicate; 
/**

 * Hosts the Taskbar content such as Hotseat and Recent Apps. Drawn on top of other apps.

 */

public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconParent, Insettable {

public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconParent, Insettable,

        DeviceProfile.OnDeviceProfileChangeListener {

    private static final String TAG = TaskbarView.class.getSimpleName();



    private static final Rect sTmpRect = new Rect();
@@ -92,7 +93,7 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 


    private float mTransientTaskbarAllAppsButtonTranslationXOffset;



    private final boolean mShouldTryStartAlign;

    private boolean mShouldTryStartAlign;



    public TaskbarView(@NonNull Context context) {

        this(context, null);
@@ -121,8 +122,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
                resources.getDimension(isTransientTaskbar

                        ? R.dimen.transient_taskbar_all_apps_button_translation_x_offset

                        : R.dimen.taskbar_all_apps_button_translation_x_offset);

        mShouldTryStartAlign = mActivityContext.isThreeButtonNav()

                && resources.getBoolean(R.bool.start_align_taskbar);



        onDeviceProfileChanged(mActivityContext.getDeviceProfile());



        int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);

        int actualIconSize = mActivityContext.getDeviceProfile().taskbarIconSize;
@@ -161,6 +162,23 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        mQsb = LayoutInflater.from(context).inflate(R.layout.search_container_hotseat, this, false);

    }



    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        mActivityContext.addOnDeviceProfileChangeListener(this);

    }



    @Override

    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();

        mActivityContext.removeOnDeviceProfileChangeListener(this);

    }



    @Override

    public void onDeviceProfileChanged(DeviceProfile dp) {

        mShouldTryStartAlign = mActivityContext.isThreeButtonNav() && dp.startAlignTaskbar;

    }



    @Override

    public boolean performAccessibilityActionInternal(int action, Bundle arguments) {

        if (action == AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS) {