Merge "[adb-wireless] Add Wireless Debugging Switch in Developer options." (317c9dc2) · Commits · e / os / android_packages_apps_Settings

PREUPLOAD.cfg

+1 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,4 @@ checkcolor_hook = ${REPO_ROOT}/prebuilts/checkcolor/checkcolor.py -p .

		strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}

		checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

res/layout/adb_qrcode_scanner_fragment.xml

0 → 100644

+94 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2020 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.
		-->

		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/root"
		android:layout_width="match_parent"
		android:layout_height="match_parent">

		<ScrollView
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:id="@+id/camera_layout">
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:gravity="center_horizontal">

		<include layout="@layout/wifi_dpp_fragment_header"/>

		<ProgressBar
		android:id="@+id/indeterminate_bar"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:indeterminate="true"
		android:paddingStart="16dp"
		android:paddingEnd="16dp"
		android:layout_marginBottom="8dp"
		style="?android:attr/progressBarStyleHorizontal"/>
		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:clipChildren="true">
		<TextureView
		android:id="@+id/preview_view"
		android:layout_width="match_parent"
		android:layout_height="@dimen/qrcode_preview_size"/>
		<com.android.settings.wifi.qrcode.QrDecorateView
		android:id="@+id/decorate_view"
		android:layout_width="match_parent"
		android:layout_height="@dimen/qrcode_preview_size"/>
		</FrameLayout>
		<TextView
		android:id="@+id/error_message"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="16dp"
		android:layout_marginStart="24dp"
		android:layout_marginEnd="24dp"
		android:textAlignment="center"
		android:textColor="?android:attr/colorError"
		android:visibility="invisible"/>
		</LinearLayout>

		</ScrollView>

		<!--
		The spinner indicating that the device is waiting for pairing
		after getting valid QR code
		-->
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/verifying_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:gravity="center"
		android:orientation="vertical"
		android:visibility="gone">
		<ProgressBar
		android:id="@+id/verifying_progress"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"/>
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item_progress_text"
		android:text="@string/adb_wireless_verifying_qrcode_text"/>
		</LinearLayout>
		</LinearLayout>

res/layout/adb_wireless_dialog.xml

0 → 100644

+112 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 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.
		-->

		<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/dialog_scrollview"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:fadeScrollbars="false"
		android:scrollIndicators="top\|bottom">

		<LinearLayout
		android:id="@+id/l_adbwirelessdialog"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:paddingBottom="8dip">

		<LinearLayout android:id="@+id/l_pairing_six_digit"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_section"
		android:visibility="gone">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item" >
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item_label"
		android:text="@string/adb_pairing_device_dialog_pairing_code_label"
		android:textDirection="locale" />

		<TextView
		android:id="@+id/pairing_code"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item_content" />

		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item_label"
		android:text="@string/adb_wireless_ip_addr_preference_title"
		android:textDirection="locale"
		android:paddingTop="8dip"/>

		<TextView
		android:id="@+id/ip_addr"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item_label"
		android:text="@string/summary_placeholder"
		android:textDirection="locale" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout android:id="@+id/l_pairing_failed"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_section"
		android:visibility="gone">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item" >
		<TextView
		android:id="@+id/pairing_failed_label"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item_label"
		android:textDirection="locale" />
		</LinearLayout>
		</LinearLayout>

		<LinearLayout android:id="@+id/l_qrcode_pairing_failed"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_section"
		android:visibility="gone">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item" >
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/adb_wireless_item_label"
		android:textDirection="locale"
		android:text="@string/adb_qrcode_pairing_device_failed_msg"/>
		</LinearLayout>
		</LinearLayout>

		</LinearLayout>
		</ScrollView>

res/values/styles.xml

+38 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,44 @@
		<item name="android:orientation">vertical</item>
		</style>

		<style name="adb_wireless_item">
		<item name="android:layout_marginTop">8dp</item>
		<item name="android:layout_marginStart">8dp</item>
		<item name="android:layout_marginEnd">8dp</item>
		<item name="android:paddingStart">8dp</item>
		<item name="android:paddingEnd">8dp</item>
		<item name="android:orientation">vertical</item>
		<item name="android:gravity">start</item>
		</style>

		<style name="adb_wireless_item_label">
		<item name="android:paddingStart">8dp</item>
		<item name="android:textSize">14sp</item>
		<item name="android:textAlignment">viewStart</item>
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
		<item name="android:textColor">?android:attr/textColorSecondary</item>
		</style>

		<style name="adb_wireless_item_content">
		<item name="android:paddingStart">8dp</item>
		<item name="android:textSize">24sp</item>
		<item name="android:textAlignment">viewStart</item>
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		</style>

		<style name="adb_wireless_item_progress_text">
		<item name="android:paddingTop">16dp</item>
		<item name="android:textSize">18sp</item>
		<item name="android:textAlignment">viewStart</item>
		<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		</style>

		<style name="adb_wireless_section">
		<item name="android:orientation">vertical</item>
		</style>

		<style name="ConfirmDeviceCredentialsAnimationStyle"
		parent="@*android:style/Animation.Material.Activity">
		<item name="android:activityOpenEnterAnimation">@anim/confirm_credential_open_enter</item>

res/xml/adb_device_details_fragment.xml

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2020 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/device_details_title"
		settings:initialExpandedChildrenCount="3">

		<com.android.settingslib.widget.LayoutPreference
		android:key="adb_device_header"
		android:layout="@layout/settings_entity_header"
		android:selectable="false" />

		<!-- Buttons -->
		<com.android.settingslib.widget.ActionButtonsPreference
		android:key="buttons"
		android:selectable="false" />

		<!-- Device Fingerprint Details -->
		<PreferenceCategory
		android:key="fingerprint_category"
		android:layout="@layout/preference_category_no_label">
		</PreferenceCategory>
		</PreferenceScreen>