Merge "Add a stylus controller to Bluetooth Device Details." (912284de) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_article.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2022 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:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:tint="?android:attr/colorControlNormal">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M7,17H14V15H7ZM7,13H17V11H7ZM7,9H17V7H7ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/>
		</vector>

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2022 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:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:tint="?android:attr/colorControlNormal">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q15.35,20 17.675,17.675Q20,15.35 20,12Q20,10.65 19.562,9.4Q19.125,8.15 18.3,7.1L7.1,18.3Q8.15,19.125 9.4,19.562Q10.65,20 12,20ZM5.7,16.9 L16.9,5.7Q15.85,4.875 14.6,4.438Q13.35,4 12,4Q8.65,4 6.325,6.325Q4,8.65 4,12Q4,13.35 4.438,14.6Q4.875,15.85 5.7,16.9Z"/>
		</vector>

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2022 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:width="24dp"
		android:height="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24"
		android:tint="?android:attr/colorControlNormal">
		<path
		android:fillColor="#FFFFFFFF"
		android:pathData="M2,21V19H22V21ZM19,17V3H20.5V17ZM4,17 L9.25,3H11.75L17,17H14.6L13.35,13.4H7.7L6.4,17ZM8.4,11.4H12.6L10.55,5.6H10.45Z"/>
		</vector>

+11 −0

Original line number	Diff line number	Diff line
		@@ -228,6 +228,17 @@
		<!-- Title to see all the previous connected devices [CHAR LIMIT=50] -->
		<string name="previous_connected_see_all">See all</string>

		<!-- Title for stylus device details page [CHAR LIMIT=50] -->
		<string name="stylus_device_details_title">Stylus</string>
		<!-- Preference title for setting the default note taking app [CHAR LIMIT=none] -->
		<string name="stylus_default_notes_app">System note taking app</string>
		<!-- Preference title for toggling whether handwriting in textfields is enabled [CHAR LIMIT=none] -->
		<string name="stylus_textfield_handwriting">Stylus writing in textfields</string>
		<!-- Preference title for toggling whether stylus button presses are ignored [CHAR LIMIT=none] -->
		<string name="stylus_ignore_button">Ignore all stylus button presses</string>
		<!-- Name shown in a USI stylus header in device details page [CHAR LIMIT=60] -->
		<string name="stylus_usi_header_title">USI stylus</string>

		<!-- Date & time settings screen title -->
		<string name="date_and_time">Date & time</string>

+5 −2

Original line number	Diff line number	Diff line
		@@ -53,6 +53,9 @@
		android:key="action_buttons"
		settings:allowDividerBelow="true"/>

		<PreferenceCategory
		android:key="device_stylus"/>

		<com.android.settings.slices.SlicePreference
		android:key="bt_extra_control"
		settings:controller="com.android.settings.slices.SlicePreferenceController"