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

Commit 702da15a authored by Xin Li's avatar Xin Li
Browse files

Merge Android U (ab/10368041) 

Bug: 291102124
Merged-In: Ib2a68769351e6974b78cd47f1f7967152485c9ba
Change-Id: Ib3a4f4712d811a675418226da8db188a44cac9dd
parents 0220695d 1fe5bc2a

Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ android_library { 
        "androidx.preference_preference",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.recyclerview_recyclerview",

        "androidx.legacy_legacy-preference-v14",

        "androidx.legacy_legacy-preference-v14",

        "SettingsLibActivityEmbedding",

    ],

    ],

    proto: {

    proto: {

        type: "nano",

        type: "nano",

AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,8 @@ 
        <activity

        <activity

            android:name=".search.SearchActivity"

            android:name=".search.SearchActivity"

            android:exported="true"

            android:exported="true"

            android:theme="@style/Theme.Settings.NoActionBar">

            android:theme="@style/Theme.Settings.NoActionBar"

            android:windowSoftInputMode="adjustResize">

            <intent-filter priority="-1">

            <intent-filter priority="-1">

                <action android:name="com.android.settings.action.SETTINGS_SEARCH" />

                <action android:name="com.android.settings.action.SETTINGS_SEARCH" />

                <action android:name="android.settings.APP_SEARCH_SETTINGS" />

                <action android:name="android.settings.APP_SEARCH_SETTINGS" />

res/values-ky/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <string name="accessibility_settings" msgid="1488998032020612740">"Атайын мүмкүнчүлүктөр"</string>

    <string name="accessibility_settings" msgid="1488998032020612740">"Атайын мүмкүнчүлүктөр"</string>

    <string name="physical_keyboard_title" msgid="3955072245281785000">"Аппараттык баскычтоп"</string>

    <string name="physical_keyboard_title" msgid="3955072245281785000">"Аппараттык баскычтоп"</string>

    <string name="add_virtual_keyboard" msgid="542703692821933851">"Баскычтопторду башкаруу"</string>

    <string name="add_virtual_keyboard" msgid="542703692821933851">"Баскычтопторду башкаруу"</string>

    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Параметрлерди сунуштоо"</string>

    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Жөндөөлөрдү сунуштоо"</string>

    <string name="search_clear_history" msgid="6232116698940067519">"Таржымалды тазалоо"</string>

    <string name="search_clear_history" msgid="6232116698940067519">"Таржымалды тазалоо"</string>

    <string name="search_no_results" msgid="6855095945475439835">"Бир да натыйжа жок"</string>

    <string name="search_no_results" msgid="6855095945475439835">"Бир да натыйжа жок"</string>

</resources>
 
</resources>

res/values-uk/strings.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="applications_settings" msgid="3446736638853404682">"Про додаток"</string>

    <string name="applications_settings" msgid="3446736638853404682">"Про додаток"</string>

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

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

    <string name="accessibility_settings" msgid="1488998032020612740">"Доступність"</string>

    <string name="accessibility_settings" msgid="1488998032020612740">"Спеціальні можливості"</string>

    <string name="physical_keyboard_title" msgid="3955072245281785000">"Фізична клавіатура"</string>

    <string name="physical_keyboard_title" msgid="3955072245281785000">"Фізична клавіатура"</string>

    <string name="add_virtual_keyboard" msgid="542703692821933851">"Керувати клавіатурами"</string>

    <string name="add_virtual_keyboard" msgid="542703692821933851">"Керувати клавіатурами"</string>

    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Пропозиції налаштувань"</string>

    <string name="app_name_settings_intelligence" msgid="8701735500346011661">"Пропозиції налаштувань"</string>

src/com/android/settings/intelligence/search/IntentSearchViewHolder.java

+9 −3
Original line number Original line Diff line number Diff line
@@ -16,13 +16,16 @@ 
 */

 */

package com.android.settings.intelligence.search;

package com.android.settings.intelligence.search;





import static com.android.settings.intelligence.search.indexing.DatabaseIndexingUtils.SEARCH_RESULT_TRAMPOLINE_ACTION;



import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import androidx.annotation.VisibleForTesting;

import android.util.Log;

import android.util.Log;

import android.view.View;

import android.view.View;





import androidx.annotation.VisibleForTesting;



import com.android.settings.intelligence.nano.SettingsIntelligenceLogProto;

import com.android.settings.intelligence.nano.SettingsIntelligenceLogProto;





import java.util.List;

import java.util.List;
@@ -59,8 +62,11 @@ public class IntentSearchViewHolder extends SearchViewHolder { 
                final Intent intent = result.payload.getIntent();

                final Intent intent = result.payload.getIntent();

                // Use app user id to support work profile use case.

                // Use app user id to support work profile use case.

                if (result instanceof AppSearchResult) {

                if (result instanceof AppSearchResult) {

                    AppSearchResult appResult = (AppSearchResult) result;

                    if (SEARCH_RESULT_TRAMPOLINE_ACTION.equals(intent.getAction())) {

                    fragment.getActivity().startActivity(intent);

                        fragment.startActivityForResult(intent, REQUEST_CODE_NO_OP);

                    } else {

                        fragment.startActivity(intent);

                    }

                } else {

                } else {

                    final PackageManager pm = fragment.getActivity().getPackageManager();

                    final PackageManager pm = fragment.getActivity().getPackageManager();

                    final List<ResolveInfo> info = pm.queryIntentActivities(intent, 0 /* flags */);

                    final List<ResolveInfo> info = pm.queryIntentActivities(intent, 0 /* flags */);