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

Commit 4f7d8fc3 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "[Search] make AbstractSlideinView#createColorScrim overridable" into sc-dev

parents 7cf7c31e ac120c9a

quickstep/res/values/strings.xml

+1 −9
Original line number Diff line number Diff line
@@ -91,14 +91,6 @@ 
    <!-- content description for hotseat items -->

    <string name="hotseat_prediction_content_description">Predicted app: <xliff:g id="title" example="Chrome">%1$s</xliff:g></string>



    <!-- primary educational text shown for first time search users -->

    <string name="search_edu_primary">Search your phone for apps, people, settings and more!</string>

    <!-- secondary educational text shown for first time search users -->

    <string name="search_edu_secondary">Tap keyboard search button to launch the first search

        result.</string>



    <!-- Dismiss button string for search education view -->

    <string name="search_edu_dismiss">Got it.</string>

    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is too far from the edge. [CHAR LIMIT=100] -->

    <string name="back_gesture_feedback_swipe_too_far_from_left_edge">Make sure you swipe from the far-left edge.</string>

    <!-- Feedback shown during interactive parts of Back gesture tutorial for left edge when the gesture is cancelled. [CHAR LIMIT=100] -->

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

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ public final class FeatureFlags { 
    public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag(

            "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps");



    public static final BooleanFlag ENABLE_PEOPLE_TILE_PREVIEW = getDebugFlag(

            "ENABLE_PEOPLE_TILE_PREVIEW", false,

            "Experimental: Shows conversation shortcuts on home screen as search results");



    public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag(

            "FOLDER_NAME_SUGGEST", true,

            "Suggests folder names instead of blank text.");

src/com/android/launcher3/views/AbstractSlideInView.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ public abstract class AbstractSlideInView extends AbstractFloatingView 
        return mLauncher.getDragLayer();

    }



    protected static View createColorScrim(Context context, int bgColor) {

    protected View createColorScrim(Context context, int bgColor) {

        View view = new View(context);

        view.forceHasOverlappingRendering(false);

        view.setBackgroundColor(bgColor);