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

Commit cbeb13d6 authored by thiruram's avatar thiruram
Browse files

[AA+] Log app launches from AA+ search result container. 

This change will update westworld logs for app launches from AA+ search result. Updates log's container info from AllAppsContainer -> AllAppsPlusSearchResultContainer.

Bug: 178562918
Change-Id: I9ffca27fea42951a57640ef36717c04ff0251506
parent aa793ff2

Android.bp

+20 −0
Original line number Diff line number Diff line
@@ -36,17 +36,37 @@ java_library_static { 
    name: "launcher_log_protos_lite",

    srcs: [

        "protos/*.proto",

        "protos_overrides/*.proto",

    ],

    sdk_version: "current",

    proto: {

        type: "lite",

        local_include_dirs:[

            "protos",

            "protos_overrides",

        ],

    },

    static_libs: ["libprotobuf-java-lite"],

}



java_library_static {

    name: "launcher_quickstep_log_protos_lite",

    srcs: [

        "quickstep/protos_overrides/*.proto",

    ],

    sdk_version: "current",

    proto: {

        type: "lite",

        local_include_dirs:[

            "quickstep/protos_overrides",

        ],

    },

    static_libs: [

      "libprotobuf-java-lite",

      "launcher_log_protos_lite"

      ],

}



java_library {

    name: "LauncherPluginLib",

Android.mk

+4 −6
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 


LOCAL_STATIC_JAVA_LIBRARIES := \

    LauncherPluginLib \

    launcher_log_protos_lite \

    launcher_quickstep_log_protos_lite \

    search_ui



LOCAL_SRC_FILES := \
@@ -129,8 +129,7 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_STATIC_JAVA_LIBRARIES := \

    SystemUI-statsd \

    SystemUISharedLib \

    launcher_log_protos_lite

    SystemUISharedLib

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else
@@ -196,8 +195,7 @@ LOCAL_MODULE_TAGS := optional 


LOCAL_STATIC_JAVA_LIBRARIES := \

    SystemUI-statsd \

    SystemUISharedLib \

    launcher_log_protos_lite

    SystemUISharedLib

ifneq (,$(wildcard frameworks/base))

  LOCAL_PRIVATE_PLATFORM_APIS := true

else

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ android { 
            java.srcDirs = ['src', 'src_plugins']

            manifest.srcFile 'AndroidManifest-common.xml'

            proto {

                srcDir 'protos/'

                srcDirs = ['protos/', 'protos_overrides/']

            }

        }

protos/launcher_atom.proto

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ syntax = "proto2"; 
option java_package = "com.android.launcher3.logger";

option java_outer_classname = "LauncherAtom";



import "launcher_atom_extension.proto";



//

// ItemInfos

message ItemInfo {
@@ -55,6 +57,7 @@ message ContainerInfo { 
    SettingsContainer settings_container = 9;

    PredictedHotseatContainer predicted_hotseat_container = 10;

    TaskSwitcherContainer task_switcher_container = 11;

    ExtendedContainers extended_containers = 20;

  }

}

protos_overrides/launcher_atom_extension.proto

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */

syntax = "proto2";



option java_package = "com.android.launcher3.logger";

option java_outer_classname = "LauncherAtomExtensions";





// This proto file contains placeholder messages that can be overridden by

// other Launcher variants.

// Variants could have its own launcher_atom_extension.proto file(should have

// same messages declared here but with different implementation); when building

// variant's apk launcher_atom.proto will reference variant's extension file,

// essentially overriding this file.





// Wrapper message for additional containers used in variants.

message ExtendedContainers {}