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

Commit 7f66dde4 authored by Schneider Victor-tulias's avatar Schneider Victor-tulias
Browse files

Add the ability to control the mock app thumbnail and app icon to TutorialControllers. 

Giving the gesture nav tutorial sandbox environment a more accurate look and feel requires the ability to inject mock drawables. The choice of drawables should go to TutorialControllers.

Bug: 175019879

Change-Id: Ie5b03b3fa07b017c0596a58dedf65d3e866a0727
parent 620c2499

quickstep/res/drawable/default_sandbox_app_icon.xml

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

<!--

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

-->

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

    android:shape="oval">

  <solid android:color="@color/gesture_tutorial_fake_task_view_color" />

</shape>

quickstep/res/drawable/default_sandbox_app_task_thumbnail.xml

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

<!--

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

-->

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

    android:shape="rectangle">

  <solid android:color="@color/gesture_tutorial_fake_task_view_color" />

</shape>

quickstep/res/drawable/default_sandbox_wallpaper.xml

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

<!--

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

-->

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

    android:shape="rectangle">

  <solid android:color="?android:attr/colorBackground" />

</shape>

quickstep/res/layout/gesture_tutorial_fragment.xml

+1 −5
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ 
<com.android.quickstep.interaction.RootSandboxLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="?android:attr/colorBackground">

    android:layout_height="match_parent">



    <View

        android:id="@+id/gesture_tutorial_ripple_view"
@@ -29,15 +28,12 @@ 
        android:id="@+id/gesture_tutorial_fake_icon_view"

        android:layout_width="20dp"

        android:layout_height="20dp"

        android:background="@drawable/bg_circle"

        android:backgroundTint="@color/gesture_tutorial_fake_task_view_color"

        android:visibility="invisible" />



    <View

        android:id="@+id/gesture_tutorial_fake_task_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/gesture_tutorial_fake_task_view_color"

        android:visibility="invisible" />



    <ImageView

quickstep/src/com/android/quickstep/interaction/SandboxModeTutorialController.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class SandboxModeTutorialController extends SwipeUpGestureTutorialControl 
    @Nullable

    @Override

    Integer getActionButtonStringId() {

        return R.string.gesture_tutorial_action_button_label_done;

        return null;

    }



    @Override