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

Commit 2cab6225 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Use resource processor for Settings 

Bug: 293810334
Test: m Settings
Test: robotests
Change-Id: Ie515e137648eddfdfcab5e8095f5be99721d9e1b
parent b199f351

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ android_library { 
    ],



    srcs: ["src/**/*.java", "src/**/*.kt"],

    use_resource_processor: true,

    resource_dirs: [

        "res",

        "res-export", // for external usage
@@ -136,6 +137,7 @@ android_app { 
    ],

    static_libs: ["Settings-core"],

    uses_libs: ["org.apache.http.legacy"],

    use_resource_processor: true,

    resource_dirs: [],

    optimize: {

        proguard_flags_files: ["proguard.flags"],

src/com/android/settings/biometrics2/ui/view/FingerprintEnrollIntroFragment.kt

+3 −3
Original line number Diff line number Diff line
@@ -50,9 +50,9 @@ import com.google.android.setupdesign.template.RequireScrollMixin 
import com.google.android.setupdesign.util.DeviceHelper

import com.google.android.setupdesign.util.DynamicColorPalette

import com.google.android.setupdesign.util.DynamicColorPalette.ColorType.ACCENT

import java.util.function.Supplier

import kotlinx.coroutines.flow.first

import kotlinx.coroutines.launch

import java.util.function.Supplier



/**

 * Fingerprint intro onboarding page fragment implementation
@@ -324,6 +324,6 @@ fun FragmentActivity.bindFingerprintEnrollIntroView( 
        )

    }



    view.findViewById<ScrollView>(R.id.sud_scroll_view)?.importantForAccessibility =

        View.IMPORTANT_FOR_ACCESSIBILITY_YES

    view.findViewById<ScrollView>(com.google.android.setupdesign.R.id.sud_scroll_view)

        ?.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES

}

src/com/android/settings/remoteauth/finish/RemoteAuthEnrollFinish.kt

+2 −4
Original line number Diff line number Diff line
@@ -18,12 +18,10 @@ package com.android.settings.remoteauth.finish 


import android.os.Bundle

import android.view.View



import com.airbnb.lottie.LottieAnimationView

import com.android.settings.R

import com.android.settings.remoteauth.RemoteAuthEnrollBase

import com.android.settingslib.widget.LottieColorUtils



import com.airbnb.lottie.LottieAnimationView

import com.google.android.setupcompat.template.FooterButton



/**
@@ -45,7 +43,7 @@ class RemoteAuthEnrollFinish : 
            .setText(R.string.security_settings_remoteauth_enroll_finish_btn_next)

            .setListener(this::onPrimaryFooterButtonClick)

            .setButtonType(FooterButton.ButtonType.NEXT)

            .setTheme(R.style.SudGlifButton_Primary)

            .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)

            .build()

    }

src/com/android/settings/remoteauth/introduction/RemoteAuthEnrollIntroduction.kt

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class RemoteAuthEnrollIntroduction : 
            .setText(R.string.security_settings_remoteauth_enroll_introduction_agree)

            .setListener(::onPrimaryFooterButtonClick)

            .setButtonType(FooterButton.ButtonType.OPT_IN)

            .setTheme(R.style.SudGlifButton_Primary)

            .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)

            .build()

    }
@@ -58,7 +58,7 @@ class RemoteAuthEnrollIntroduction : 
            .setText(R.string.security_settings_remoteauth_enroll_introduction_disagree)

            .setListener(::onSecondaryFooterButtonClick)

            .setButtonType(FooterButton.ButtonType.NEXT)

            .setTheme(R.style.SudGlifButton_Primary)

            .setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)

            .build()

    }

src/com/android/settings/search/actionbar/SearchMenuController.java

+2 −2
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM 
            return;

        }

        final MenuItem searchItem = menu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,

                R.string.search_menu);

        searchItem.setIcon(R.drawable.ic_search_24dp);

                com.android.settingslib.search.R.string.search_menu);

        searchItem.setIcon(com.android.settingslib.search.R.drawable.ic_search_24dp);

        searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);



        searchItem.setOnMenuItemClickListener(target -> {