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

Commit e6465942 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[adbwifi] SysUI: Add WifiDebuggingActivity. am: 9a8ddc9c am: f41fdc95 

Change-Id: I8c7592fa41aaeb8633a8e59db04190ecedd34e27
parents f9288a19 f41fdc95

core/res/res/values/config.xml

+12 −0
Original line number Diff line number Diff line
@@ -2721,6 +2721,18 @@ 
    <string name="config_customAdbPublicKeyConfirmationSecondaryUserComponent"

            >com.android.systemui/com.android.systemui.usb.UsbDebuggingSecondaryUserActivity</string>



    <!-- Name of the activity or service that prompts the user to reject, accept, or whitelist

         a wireless network for wireless debugging.

         Can be customized for other product types -->

    <string name="config_customAdbWifiNetworkConfirmationComponent"

            >com.android.systemui/com.android.systemui.wifi.WifiDebuggingActivity</string>



    <!-- Name of the activity that prompts the secondary user to acknowledge she/he needs to

         switch to the primary user to enable wireless debugging.

         Can be customized for other product types -->

    <string name="config_customAdbWifiNetworkConfirmationSecondaryUserComponent"

            >com.android.systemui/com.android.systemui.wifi.WifiDebuggingSecondaryUserActivity</string>



    <!-- Name of the dialog that is used to request the user's consent for a Platform VPN -->

    <string name="config_platformVpnConfirmDialogComponent" translatable="false"

            >com.android.vpndialogs/com.android.vpndialogs.PlatformVpnConfirmDialog</string>

core/res/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -3643,6 +3643,12 @@ 
    <!-- Message of notification shown when ADB is actively connected to the phone. -->

    <string name="adb_active_notification_message">Tap to turn off USB debugging</string>

    <string name="adb_active_notification_message" product="tv">Select to disable USB debugging.</string>

    <!-- Title of notification shown when ADB Wireless is actively connected to the phone. [CHAR LIMIT=NONE] -->

    <string name="adbwifi_active_notification_title">Wireless debugging connected</string>

    <!-- Message of notification shown when ADB Wireless is actively connected to the phone. [CHAR LIMIT=NONE] -->

    <string name="adbwifi_active_notification_message">Tap to turn off wireless debugging</string>

    <!-- Message of notification shown when ADB Wireless is actively connected to the TV. [CHAR LIMIT=NONE] -->

    <string name="adbwifi_active_notification_message" product="tv">Select to disable wireless debugging.</string>



    <!-- Title of notification shown when Test Harness Mode is enabled. [CHAR LIMIT=NONE] -->

    <string name="test_harness_mode_notification_title">Test Harness Mode enabled</string>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -2098,6 +2098,8 @@ 
  <java-symbol type="string" name="accessibility_binding_label" />

  <java-symbol type="string" name="adb_active_notification_message" />

  <java-symbol type="string" name="adb_active_notification_title" />

  <java-symbol type="string" name="adbwifi_active_notification_message" />

  <java-symbol type="string" name="adbwifi_active_notification_title" />

  <java-symbol type="string" name="test_harness_mode_notification_title" />

  <java-symbol type="string" name="test_harness_mode_notification_message" />

  <java-symbol type="string" name="taking_remote_bugreport_notification_title" />
@@ -2240,6 +2242,8 @@ 
  <java-symbol type="fraction" name="config_maximumScreenDimRatio" />

  <java-symbol type="string" name="config_customAdbPublicKeyConfirmationComponent" />

  <java-symbol type="string" name="config_customAdbPublicKeyConfirmationSecondaryUserComponent" />

  <java-symbol type="string" name="config_customAdbWifiNetworkConfirmationComponent" />

  <java-symbol type="string" name="config_customAdbWifiNetworkConfirmationSecondaryUserComponent" />

  <java-symbol type="string" name="config_customVpnConfirmDialogComponent" />

  <java-symbol type="string" name="config_customVpnAlwaysOnDisconnectedDialogComponent" />

  <java-symbol type="string" name="config_platformVpnConfirmDialogComponent" />

packages/SystemUI/AndroidManifest.xml

+19 −0
Original line number Diff line number Diff line
@@ -437,6 +437,25 @@ 
            android:excludeFromRecents="true">

        </activity>



        <!-- started from WirelessDebuggingManager -->

        <activity android:name=".wifi.WifiDebuggingActivity"

            android:permission="android.permission.MANAGE_DEBUGGING"

            android:theme="@style/Theme.SystemUI.Dialog.Alert"

            android:finishOnCloseSystemDialogs="true"

            android:excludeFromRecents="true">

        </activity>

        <activity-alias

            android:name=".WifiDebuggingActivityAlias"

            android:permission="android.permission.DUMP"

            android:targetActivity=".wifi.WifiDebuggingActivity"

            android:exported="true">

        </activity-alias>

        <activity android:name=".wifi.WifiDebuggingSecondaryUserActivity"

            android:theme="@style/Theme.SystemUI.Dialog.Alert"

            android:finishOnCloseSystemDialogs="true"

            android:excludeFromRecents="true">

        </activity>



        <!-- started from NetworkPolicyManagerService -->

        <activity

            android:name=".net.NetworkOverLimitActivity"

packages/SystemUI/res/values/strings.xml

+18 −0
Original line number Diff line number Diff line
@@ -162,6 +162,24 @@ 
    <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->

    <string name="usb_debugging_secondary_user_message">The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user.</string>



    <!-- Title of confirmation dialog for wireless debugging [CHAR LIMIT=NONE] -->

    <string name="wifi_debugging_title">Allow wireless debugging on this network?</string>



    <!-- Message of confirmation dialog for wireless debugging [CHAR LIMIT=NONE] -->

    <string name="wifi_debugging_message">Network Name (SSID)\n<xliff:g id="ssid" example="My wifi">%1$s</xliff:g>\n\nWi\u2011Fi Address (BSSID)\n<xliff:g id="bssid" example="AB:CD:EF:12:34:56">%2$s</xliff:g></string>



    <!-- Option to always allow wireless debugging on this network [CHAR LIMIT=NONE] -->

    <string name="wifi_debugging_always">Always allow on this network</string>



    <!-- Button label for confirming acceptance of enabling wireless debugging [CHAR LIMIT=15] -->

    <string name="wifi_debugging_allow">Allow</string>



    <!-- Title of notification shown when trying to enable wireless debugging but a secondary user is the current foreground user. [CHAR LIMIT=NONE] -->

    <string name="wifi_debugging_secondary_user_title">Wireless debugging not allowed</string>



    <!-- Message of notification shown when trying to enable wireless debugging but a secondary user is the current foreground user. [CHAR LIMIT=NONE] -->

    <string name="wifi_debugging_secondary_user_message">The user currently signed in to this device can\u2019t turn on wireless debugging. To use this feature, switch to the primary user.</string>



    <!-- Title of USB contaminant presence dialog [CHAR LIMIT=NONE] -->

    <string name="usb_contaminant_title">USB port disabled</string>