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

Commit eca7bb35 authored by Shikha Malhotra's avatar Shikha Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Top row of first workspace screen occupied only when QSB is placed at... 

Merge "Top row of first workspace screen occupied only when QSB is placed at the top." into tm-dev am: 763fd21b

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

Change-Id: I11b05218a455b80e2fd1b29398f8540229a7675f
parents 4be5acc2 763fd21b

Android.bp

+15 −0
Original line number Diff line number Diff line
@@ -226,6 +226,21 @@ filegroup { 
    ],

}



// Common source files used to build go launcher

filegroup {

    name: "launcher-go-src-no-build-config",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        "quickstep/src/**/*.java",

        "quickstep/src/**/*.kt",

        "go/src/**/*.java",

        "go/src/**/*.kt",

        "go/quickstep/src/**/*.java",

        "go/quickstep/src/**/*.kt",

    ],

}



// Proguard files for Launcher3

filegroup {

    name: "launcher-proguard-rules",

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public final class FeatureFlags { 
     * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature

     * and should be modified at a project level.

     */

    public static final boolean QSB_ON_FIRST_SCREEN = true;

    public static final boolean QSB_ON_FIRST_SCREEN = BuildConfig.QSB_ON_FIRST_SCREEN;



    /**

     * Feature flag to handle define config changes dynamically instead of killing the process.

src_build_config/com/android/launcher3/BuildConfig.java

+7 −2
Original line number Diff line number Diff line
@@ -19,4 +19,9 @@ package com.android.launcher3; 
public final class BuildConfig {

    public static final String APPLICATION_ID = "com.android.launcher3";

    public static final boolean DEBUG = false;

    /**

     * Flag to state if the QSB is on the first screen and placed on the top,

     * this can be overwritten in other launchers with a different value, if needed.

     */

    public static final boolean QSB_ON_FIRST_SCREEN = true;

}