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

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

Merge Android R 

Bug: 168057903
Merged-In: I2c3ca1f0794de3b0079b4715f7ce6d33cd786bdc
Change-Id: Ic98265603b0e54f50c2acfab9e4e4149a090ef69
parents 9c7a808e a4636f52

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ android_app { 
    privileged: true,

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



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

    static_libs: [

        "androidx.legacy_legacy-support-v4",

        "androidx.legacy_legacy-support-v13",
@@ -30,6 +31,7 @@ android_app { 
        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.legacy_legacy-preference-v14",

        "car-ui-lib",

    ],

    resource_dirs: ["res"],

    srcs: [

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />



    <uses-sdk android:targetSdkVersion="29" />



    <application

        android:label="@string/app_name_settings_intelligence"

        android:icon="@mipmap/ic_launcher"

OWNERS

+2 −1
Original line number Diff line number Diff line 
## People who can approve changes



# Android auto

rlagos@google.com

rlagos@google.com # OWNER for SUW related code

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



# TV Settings

leifhendrik@google.com

res/values/themes.xml

+3 −0
Original line number Diff line number Diff line
@@ -21,5 +21,8 @@ 
    <style name="Theme.Settings.NoActionBar">

        <item name="android:windowActionBar">false</item>

        <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

0 → 100644
+21 −0
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"/>