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

Commit 84a5db7e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update Content Capture strings."

parents 0a214d31 3bfbd1c8
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -11013,11 +11013,11 @@
    <!-- Message for forget passpoint dialog [CHAR LIMIT=none] -->
    <string name="forget_passpoint_dialog_message">You may lose access to any remaining time or data. Check with your provider before removing.</string>
    <!-- Keywords for Content Capture feature [CHAR_LIMIT=32] -->
    <string name="keywords_content_capture">content capture</string>
    <!-- Keywords for Content Capture / Smart Suggestions feature [CHAR_LIMIT=none] -->
    <string name="keywords_content_capture">content capture, smart suggestions</string>
    <!-- Title of the 'Content Capture' feature toggle in the Settings -> Privacy screen [CHAR LIMIT=none]-->
    <string name="content_capture">Content Capture</string>
    <!-- Description of the 'Content Capture' feature toggle in the Settings -> Privacy screen [CHAR LIMIT=NONE]-->
    <string name="content_capture">Smart Suggestions</string>
    <!-- Description of the 'Content Capture / Smart Suggestions' feature toggle in the Settings -> Privacy screen [CHAR LIMIT=NONE]-->
    <string name="content_capture_summary">Allow Android to save information seen on your screen or heard in video or audio content. Android makes helpful suggestions based on your device activity.</string>
    <!-- Title for the button to initiate a heap dump for the system server. [CHAR LIMIT=NONE] -->
+20 −20
Original line number Diff line number Diff line
@@ -62,26 +62,6 @@
        android:summary="@string/summary_placeholder"
        settings:searchable="false"/>

    <!-- Content Capture -->

    <!-- NOTE: content capture has a different preference, depending whether or not the
         ContentCaptureService implementations defines a custom settings activitiy on its manifest.
         Hence, we show both here, but the controller itself will decide if it's available or not.
    -->

    <SwitchPreference
        android:key="content_capture"
        android:title="@string/content_capture"
        android:summary="@string/content_capture_summary"
        settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/>

    <com.android.settings.widget.MasterSwitchPreference
        android:key="content_capture_custom_settings"
        android:title="@string/content_capture"
        android:summary="@string/content_capture_summary"
        settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">
    </com.android.settings.widget.MasterSwitchPreference>

    <!-- Privacy Service -->
    <PreferenceCategory
        android:key="privacy_services"/>
@@ -105,4 +85,24 @@
            settings:searchable="false"/>
    </PreferenceCategory>

    <!-- Content Capture -->

    <!-- NOTE: content capture has a different preference, depending whether or not the
         ContentCaptureService implementations defines a custom settings activitiy on its manifest.
         Hence, we show both here, but the controller itself will decide if it's available or not.
    -->

    <SwitchPreference
        android:key="content_capture"
        android:title="@string/content_capture"
        android:summary="@string/content_capture_summary"
        settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/>

    <com.android.settings.widget.MasterSwitchPreference
        android:key="content_capture_custom_settings"
        android:title="@string/content_capture"
        android:summary="@string/content_capture_summary"
        settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">
    </com.android.settings.widget.MasterSwitchPreference>

</PreferenceScreen>
 No newline at end of file