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

Commit fbcfc4e7 authored by Aravind Sreekumar's avatar Aravind Sreekumar Committed by Colin Cross
Browse files

Migrate SettingsIntelligence to androidx. 

Test: make SettingsIntelligence
Bug: 76692459
Change-Id: Id8ec8fe6365f66493e716d45e6ba3543ef8a3898
Merged-In: Id8ec8fe6365f66493e716d45e6ba3543ef8a3898
(cherry picked from commit 62e15739)
(cherry picked from commit b01cfa12)
parent 6827e4a0

Android.mk

+7 −7
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ LOCAL_SDK_VERSION := system_current 
LOCAL_PRIVILEGED_MODULE := true



LOCAL_STATIC_ANDROID_LIBRARIES := \

    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

    androidx.legacy_legacy-support-v4 \

    androidx.legacy_legacy-support-v13 \

    androidx.appcompat_appcompat \

    androidx.cardview_cardview \

    androidx.preference_preference \

    androidx.recyclerview_recyclerview \

    androidx.legacy_legacy-preference-v14



LOCAL_USE_AAPT2 := true

proguard.cfg

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
}



# Keep annotated classes or class members.

-keep @android.support.annotation.Keep class *

-keep @androidx.annotation.Keep class *

-keepclassmembers class * {

    @android.support.annotation.Keep *;

    @androidx.annotation.Keep *;

}

res/layout/search_panel.xml

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:layout_height="wrap_content"

        android:background="@color/search_panel_background"

        android:elevation="4dp">

        <android.support.v7.widget.CardView

        <androidx.cardview.widget.CardView

            android:id="@+id/search_bar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -51,7 +51,7 @@ 
                    android:imeOptions="actionSearch|flagNoExtractUi"

                    android:searchIcon="@null"/>

            </Toolbar>

        </android.support.v7.widget.CardView>

        </androidx.cardview.widget.CardView>

    </FrameLayout>



    <FrameLayout
@@ -62,7 +62,7 @@ 
        android:orientation="vertical">



        <!-- Padding is included in the background -->

        <android.support.v7.widget.RecyclerView

        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/list_results"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

src/com/android/settings/intelligence/SettingsIntelligenceDumpService.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.os.IBinder;

import android.support.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;



import com.android.settings.intelligence.suggestions.model.SuggestionCategory;

import com.android.settings.intelligence.suggestions.model.SuggestionCategoryRegistry;

src/com/android/settings/intelligence/overlay/FeatureFactoryImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.settings.intelligence.overlay;



import android.content.Context;

import android.support.annotation.Keep;

import androidx.annotation.Keep;



import com.android.settings.intelligence.experiment.ExperimentFeatureProvider;

import com.android.settings.intelligence.instrumentation.MetricsFeatureProvider;