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

Commit cebf4f78 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12 

Bug: 202323961
Merged-In: I745c30269d26b5bef2e5330b565db0cffa3712f5
Change-Id: I96eb8bfee54e9eea557b016ba1a8cc62baba6d02
parents 99ae46cd 0ebf6db9

Android.bp

+20 −15
Original line number Diff line number Diff line
@@ -29,17 +29,14 @@ license { 
    ],

}



android_app {

    name: "SettingsIntelligence",

    optimize: {

        proguard_flags_files: ["proguard.cfg"],

    },

android_library {

    name: "SettingsIntelligence-core",

    sdk_version: "system_current",

    product_specific: true,

    privileged: true,

    required: ["privapp_whitelist_com.android.settings.intelligence"],

    srcs: [

        "src/**/*.java",

        "proto/**/*.proto",

    ],



    libs: ["android.car-stubs"],

    static_libs: [

        "androidx.legacy_legacy-support-v4",

        "androidx.legacy_legacy-support-v13",
@@ -48,14 +45,22 @@ android_app { 
        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.legacy_legacy-preference-v14",

        "car-ui-lib",

    ],

    resource_dirs: ["res"],

    srcs: [

        "src/**/*.java",

        "proto/**/*.proto",

    ],

    proto: {

        type: "nano",

    },

}



android_app {

    name: "SettingsIntelligence",

    optimize: {

        proguard_flags_files: ["proguard.cfg"],

    },

    sdk_version: "system_current",

    product_specific: true,

    privileged: true,

    required: ["privapp_whitelist_com.android.settings.intelligence"],



    static_libs: ["SettingsIntelligence-core"],

    resource_dirs: [],

}

OWNERS

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


# Android auto

rlagos@google.com # OWNER for SUW related code

ericberglund@google.com # OWNER for Car Settings related code

alexstetson@google.com # OWNER for Car Settings related code



# TV Settings

leifhendrik@google.com

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
    <!-- Applications settings title. If clicked, the user is taken to a screen full of application settings [CHAR_LIMIT=NONE BACKUP_MESSAGE_ID=5281808652705396152] -->

    <string name="applications_settings">App info</string>



    <!-- Class name for AccessibilityServiceResult Task [CHAR_LIMIT=NONE]-->

    <string name="accessibility_settings_classname">com.android.settings.accessibility.AccessibilitySettings</string>



    <!-- Settings title in main settings screen for accessibility settings [CHAR_LIMIT=NONE BACKUP_MESSAGE_ID=3975902491934816215] -->

    <string name="accessibility_settings">Accessibility</string>

res/values/themes.xml

+0 −2
Original line number Diff line number Diff line
@@ -23,6 +23,4 @@ 
        <item name="android:windowNoTitle">true</item>

        <item name="android:windowSoftInputMode">adjustPan</item>

    </style>



    <style name="Theme.CarSettings" parent="@style/Theme.CarUi.WithToolbar"/>

</resources>
 
 No newline at end of file

res/xml/car_search_fragment.xml

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

<!--

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

  -->



<PreferenceScreen

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

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/app_name_settings_intelligence"/>