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

Commit df9501ba authored by Paul Chang's avatar Paul Chang Committed by Android (Google) Code Review
Browse files

Merge "Have a setting in Developer Options to choose bug report handler"

parents 361ecac4 6ae4c4d6
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -1974,6 +1974,18 @@
        <activity android:name="Settings$WebViewAppPickerActivity"
                  android:label="@string/select_webview_provider_dialog_title" />

        <activity android:name="Settings$BugReportHandlerPickerActivity"
            android:label="@string/bug_report_handler_title"
            android:exported="true"
            android:excludeFromRecents="true">
            <intent-filter>
                <action android:name="android.settings.BUGREPORT_HANDLER_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.bugreporthandler.BugReportHandlerPicker" />
        </activity>

        <activity android:name=".bluetooth.BluetoothPairingDialog"
                  android:excludeFromRecents="true"
                  android:windowSoftInputMode="stateVisible|adjustResize"
+18 −0
Original line number Diff line number Diff line
@@ -11372,4 +11372,22 @@
    <!-- DSU Loader Loading. Do not translate. -->
    <string name="dsu_loader_loading" translatable="false">Loading...</string>
    <!-- Name of dev option called "Bug report handler" [CHAR LIMIT=NONE] -->
    <string name="bug_report_handler_title">Bug report handler</string>
    <!-- Developer Settings: Footer text for bug report handler picker [CHAR LIMIT=NONE] -->
    <string name="bug_report_handler_picker_footer_text">Determines which app handles the Bug Report shortcut on your device.</string>
    <!-- Label of personal profile app for current setting [CHAR LIMIT=NONE] -->
    <string name="personal_profile_app">(Personal)</string>
    <!-- Label of work profile app for current setting [CHAR LIMIT=NONE] -->
    <string name="work_profile_app">(Work)</string>
    <!-- Title of Shell app for current setting [CHAR LIMIT=NONE] -->
    <string name="shell_app">Android System (Shell)</string>
    <!-- Developer settings: text for the bug report handler selection toast shown if an invalid bug report handler was chosen. [CHAR LIMIT=NONE] -->
    <string name="select_invalid_bug_report_handler_toast_text">This choice is no longer valid. Try again.</string>
</resources>
+23 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2019 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.
  -->

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:settings="http://schemas.android.com/apk/res-auto"
    android:title="@string/bug_report_handler_title"
    settings:staticPreferenceLocation="append" >
</PreferenceScreen>
 No newline at end of file
+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@
            android:title="@*android:string/bugreport_title"
            android:dialogTitle="@*android:string/bugreport_title" />

        <Preference
            android:key="bug_report_handler"
            android:title="@string/bug_report_handler_title"
            android:fragment="com.android.settings.bugreporthandler.BugReportHandlerPicker" />

        <Preference
            android:key="system_server_heap_dump"
            android:title="@string/capture_system_heap_dump_title" />
+4 −0
Original line number Diff line number Diff line
@@ -169,6 +169,10 @@ public class Settings extends SettingsActivity {
    public static class WifiCallingDisclaimerActivity extends SettingsActivity { /* empty */ }
    public static class MobileNetworkListActivity extends SettingsActivity {}
    public static class GlobalActionsPanelSettingsActivity extends SettingsActivity {}
    /**
     * Activity for BugReportHandlerPicker.
     */
    public static class BugReportHandlerPickerActivity extends SettingsActivity { /* empty */ }

    // Top level categories for new IA
    public static class NetworkDashboardActivity extends SettingsActivity {}
Loading