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

Commit d0eec417 authored by Fan Zhang's avatar Fan Zhang
Browse files

DO NOT MERGE Snap to latest SettingsIntelligence source 

Bug: 67755462
Test: rebuild
Change-Id: Ib606a68c10f83c3a1479f234af19fe840b3120d0
parent 62731397

Android.mk

+11 −2
Original line number Diff line number Diff line
@@ -24,14 +24,23 @@ LOCAL_SDK_VERSION := system_current 
LOCAL_PRIVILEGED_MODULE := true



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-v4

    android-support-v4 \

    android-support-v13 \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference



LOCAL_USE_AAPT2 := true



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_SRC_FILES := \

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

    $(call all-java-files-under, src) \

    $(call all-proto-files-under, proto)



LOCAL_PROTOC_OPTIMIZE_TYPE := nano



include $(BUILD_PACKAGE)

proto/settings_intelligence_log.proto

0 → 100644
+92 −0
Original line number Diff line number Diff line 
syntax = "proto2";



option java_outer_classname = "SettingsIntelligenceLogProto";



package com.android.settings.intelligence;



// Wrapper for SettingsIntelligence event.

// Next index: 3

message SettingsIntelligenceEvent {



    // Event type for this log.

    enum EventType {

        // Do not use

        UNUSED = 0;



        // Gets suggestion list

        GET_SUGGESTION = 1;



        // Dismisses a suggestion

        DISMISS_SUGGESTION = 2;



        // Launches a suggestion

        LAUNCH_SUGGESTION = 3;



        // Opens search page

        OPEN_SEARCH_PAGE = 4;



        // Leaves search page

        LEAVE_SEARCH_PAGE = 5;



        // User sends a query to settings search

        PERFORM_SEARCH = 6;



        // Clicks a search result

        CLICK_SEARCH_RESULT = 7;



        // Clicks a saved query

        CLICK_SAVED_QUERY = 8;



        // Search service indexes database

        INDEX_SEARCH = 9;



        // Displays the no result image in search

        SHOW_SEARCH_NO_RESULT = 10;



        // Displays some result in search

        SHOW_SEARCH_RESULT = 11;



        // Leaves search page without entering any query

        LEAVE_SEARCH_WITHOUT_QUERY = 12;



        // Queries search data during a search session

        SEARCH_QUERY_DATABASE = 13;



        // Queries installed app list during a search session

        SEARCH_QUERY_INSTALLED_APPS = 14;



        // Queries input device list (keyboards, game controller etc) during

        // a search session

        SEARCH_QUERY_INPUT_DEVICES = 15;



        // Queries accessiblity service list during a search session

        SEARCH_QUERY_ACCESSIBILITY_SERVICES = 16;

    }



    message SearchResultMetadata {

        // The id of the search result row in this event, this is an internally

        // generated key and does not associate with any user data.

        optional string search_result_key = 1;



        // The rank of the search result row in this event.

        optional int32 search_result_rank = 2;



        // The number of results in this query.

        optional int32 result_count = 3;



        // The length of query word.

        optional int32 search_query_length = 4;

    }



    // The type of suggestion event.

    optional EventType event_type = 1;



    // The name/id of the suggestion in this event.

    repeated string suggestion_ids = 2;



    // Data about search results in this event.

    optional SearchResultMetadata search_result_metadata = 3;



    // Latency for the current event.

    optional int64 latency_millis = 4;

}

res/drawable/empty_search_results.xml

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

<!--

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

  -->



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

    android:width="96dp"

    android:height="96dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorControlNormal">



    <path

        android:fillColor="#000000"

        android:pathData="M15.5,14h-0.79l-0.28-0.27c1.2-1.4,1.82-3.31,1.48-5.34c-0.47-2.78-2.79-5-5.59-5.34c-4.23-0.52-7.79,3.04-7.27,7.27

c0.34,2.8,2.56,5.12,5.34,5.59c2.03,0.34,3.94-0.28,5.34-1.48L14,14.71v0.79l5.2,5.19c0.41,0.41,1.07,0.41,1.48,0l0.01-0.01

c0.41-0.41,0.41-1.07,0-1.48L15.5,14z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5S11.99,14,9.5,14z" />

</vector>
 
 No newline at end of file

res/drawable/ic_close_24dp.xml

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

<!--

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



  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>

</vector>

res/drawable/ic_help_24dp.xml

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

<!--

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

  -->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 16.81c-.72

0-1.3-.58-1.3-1.3s.58-1.3 1.3-1.3 1.3 .58 1.3 1.3-.58 1.3-1.3

1.3zm1.07-4.62c-.09 .52 -.59 .87 -1.13 .79 -.57-.08-.94-.66-.83-1.23 .52 -2.61

2.66-2.84 2.87-4.5 .12 -.96-.42-1.87-1.34-2.17-1.04-.33-2.21 .16 -2.55 1.37-.12

.45 -.52 .74 -.97 .74 -.66 0-1.13-.63-.96-1.27 .63 -2.25 2.91-3.38 5.05-2.74

1.71 .51 2.84 2.16 2.78 3.95-.07 2.44-2.49 2.61-2.92 5.06z"

        android:fillColor="#FFFFFFFF"/>

</vector>