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

Commit 9823f279 authored by Xiyuan Xia's avatar Xiyuan Xia Committed by Android (Google) Code Review
Browse files

Merge "Implement default assist app setting" into mnc-dev

parents 0bd18745 86a55409
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -559,10 +559,10 @@
                android:value="true" />
        </activity>

        <activity android:name="Settings$VoiceInputSettingsActivity"
                android:label="@string/voice_input_settings_title"
        <activity android:name="Settings$ManageAssistActivity"
                android:label="@string/assist_and_voice_input_title"
                android:taskAffinity="com.android.settings"
                android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
                android:parentActivityName="Settings$ManageApplicationsActivity">
            <intent-filter android:priority="1">
                <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -572,9 +572,9 @@
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.voice.VoiceInputSettings" />
                android:value="com.android.settings.applications.ManageAssist" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                android:resource="@id/language_settings" />
                android:resource="@id/application_settings" />
        </activity>

        <activity android:name="Settings$KeyboardLayoutPickerActivity"
+26 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:height="48dp"
    android:width="48dp"
    android:tint="#db4437"
    android:viewportHeight="48"
    android:viewportWidth="48" >
    <path android:fillColor="@android:color/white"
       android:pathData="M24,4C12.95,4,4,12.95,4,24
                         s8.95,20,20,20,20-8.95,20-20
                         S35.05,4,24,4zm10,22H14v-4h20v4z"/>
</vector>
+31 −2
Original line number Diff line number Diff line
@@ -6569,11 +6569,37 @@
    <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
    <string name="default_apps_title">Default Apps</string>

    <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
    <string name="assist_and_voice_input_title">Assist &amp; voice input</string>

    <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
    <string name="default_assist_title">Assist</string>
    <string name="default_assist_title">Assist app</string>

    <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
    <string name="default_assist_none">No default Assist</string>
    <string name="default_assist_none">None</string>

    <!-- Title for Choose Assist dialog [CHAR LIMIT=30] -->
    <string name="choose_assist_title">Choose Assist</string>

    <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
    <string name="assistant_security_warning_title">
        Make <xliff:g id="assistant_app_name">%s</xliff:g> your assistant?
    </string>

    <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
         displayed as a dialog message when the user selects an assistant. -->
    <string name="assistant_security_warning"><xliff:g id="assistant_app_name">%s</xliff:g> will
        be able to read information about apps in use on your system, including information
        visible on your screen or accessible within the apps.</string>

    <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
    <string name="assistant_security_warning_agree">Agree</string>

    <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
    <string name="assistant_security_warning_disagree">Disagree</string>

    <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
    <string name="choose_voice_input_title">Choose voice input</string>

    <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
    <string name="default_browser_title">Browser app</string>
@@ -6791,4 +6817,7 @@

    <!-- Instructions for state when SD card is unmounted [CHAR LIMIT=NONE] -->
    <string name="sdcard_unmounted_description">The SD card is safely ejected, but still available in the SD card slot for this device.\n\nTo use this card, you have to mount it first.</string>

    <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
    <string name="app_list_preference_none">None</string>
</resources>
+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@
        android:key="default_apps">

    <Preference
        android:key="default_assist"
        android:key="assist_and_voice_input"
        android:fragment="com.android.settings.applications.ManageAssist"
        android:title="@string/default_assist_title"
        android:title="@string/assist_and_voice_input_title"
        />

    <com.android.settings.applications.DefaultBrowserPreference
+0 −6
Original line number Diff line number Diff line
@@ -63,12 +63,6 @@
            android:key="voice_category"
            android:title="@string/voice_category" >

        <PreferenceScreen
                android:key="voice_input_settings"
                android:title="@string/voice_input_settings_title"
                android:fragment="com.android.settings.voice.VoiceInputSettings"
                />

        <PreferenceScreen
                android:key="tts_settings"
                android:title="@string/tts_settings_title"
Loading