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

Commit 11d7d34f authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing unnessary resource split in overview 

Bug: 184169818
Test: Presubmit
Change-Id: Iff5a8510be337472f05acb5629712ec088361471
parent 5bd9ba2a

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ android_library { 
    srcs: [ ],

    resource_dirs: [

        "quickstep/res",

        "quickstep/overview_ui_overrides/res",

    ],

    static_libs: [

        "Launcher3ResLib",

Android.mk

+4 −9
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ LOCAL_SRC_FILES := \ 
    $(call all-java-files-under, quickstep/src) \

    $(call all-java-files-under, src_shortcuts_overrides)



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/quickstep/overview_ui_overrides/res

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res

LOCAL_PROGUARD_ENABLED := disabled
@@ -109,9 +107,7 @@ LOCAL_SYSTEM_EXT_MODULE := true 
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/quickstep/overview_ui_overrides/res

LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res



LOCAL_FULL_LIBS_MANIFEST_FILES := \

    $(LOCAL_PATH)/quickstep/AndroidManifest-launcher.xml \
@@ -148,10 +144,9 @@ LOCAL_SRC_FILES := \ 
    $(call all-java-files-under, go/quickstep/src)



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

    $(LOCAL_PATH)/go/res \

    $(LOCAL_PATH)/go/quickstep/res \

    $(LOCAL_PATH)/go/quickstep/overview_ui_overrides/res

    $(LOCAL_PATH)/go/res \

    $(LOCAL_PATH)/quickstep/res



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROGUARD_ENABLED := full

go/quickstep/overview_ui_overrides/res/values/config.xml

deleted100644 → 0
+0 −22
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.

*/

-->

<resources>

    <string name="task_overlay_factory_class" translatable="false">

        com.android.quickstep.TaskOverlayFactoryGo</string>

</resources>
 
 No newline at end of file

go/quickstep/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -21,4 +21,6 @@ 


    <!-- Feature Flags -->

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



    <string name="task_overlay_factory_class" translatable="false">com.android.quickstep.TaskOverlayFactoryGo</string>

</resources>
 
 No newline at end of file