Merge "Automatic timezone support on non-telephony devices"
diff --git a/res/drawable/ia_settings_communal.xml b/res/drawable/ia_settings_communal.xml
new file mode 100644
index 0000000..14642c9
--- /dev/null
+++ b/res/drawable/ia_settings_communal.xml
@@ -0,0 +1,24 @@
+<!-- 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="48"
+ android:viewportHeight="48"
+ android:tint="?android:attr/colorControlNormal">
+ <path android:fillColor="@android:color/white"
+ android:pathData="M24,38Q19,38 15.5,37.325Q12,36.65 12,35.7V34H7.25Q5.95,34 5.05,33.025Q4.15,32.05 4.25,30.75L5.8,12.75Q5.9,11.6 6.75,10.8Q7.6,10 8.75,10H39.25Q40.4,10 41.25,10.8Q42.1,11.6 42.2,12.75L43.75,30.75Q43.85,32.05 42.95,33.025Q42.05,34 40.75,34H36V35.7Q36,36.65 32.5,37.325Q29,38 24,38ZM7.25,31H40.75Q40.75,31 40.75,31Q40.75,31 40.75,31L39.25,13Q39.25,13 39.25,13Q39.25,13 39.25,13H8.75Q8.75,13 8.75,13Q8.75,13 8.75,13L7.25,31Q7.25,31 7.25,31Q7.25,31 7.25,31Z"/>
+</vector>
diff --git a/res/drawable/ic_settings_trackpad.xml b/res/drawable/ic_settings_trackpad.xml
new file mode 100644
index 0000000..9580e02
--- /dev/null
+++ b/res/drawable/ic_settings_trackpad.xml
@@ -0,0 +1,25 @@
+<!--
+ 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="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="48.0"
+ android:viewportHeight="48.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M5,40Q3.75,40 2.875,39.125Q2,38.25 2,37V11Q2,9.75 2.875,8.875Q3.75,8 5,8H43Q44.25,8 45.125,8.875Q46,9.75 46,11V37Q46,38.25 45.125,39.125Q44.25,40 43,40ZM6.5,11H5Q5,11 5,11Q5,11 5,11V37Q5,37 5,37Q5,37 5,37H6.5ZM9.5,37H38.5V11H9.5ZM41.5,11V37H43Q43,37 43,37Q43,37 43,37V11Q43,11 43,11Q43,11 43,11ZM41.5,11H43Q43,11 43,11Q43,11 43,11Q43,11 43,11Q43,11 43,11H41.5ZM6.5,11H5Q5,11 5,11Q5,11 5,11Q5,11 5,11Q5,11 5,11Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_trackpad_gesture_back.xml b/res/drawable/ic_trackpad_gesture_back.xml
new file mode 100644
index 0000000..b6a80cf
--- /dev/null
+++ b/res/drawable/ic_trackpad_gesture_back.xml
@@ -0,0 +1,26 @@
+<!--
+ 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:autoMirrored="true"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />
+</vector>
diff --git a/res/drawable/ic_trackpad_gesture_home.xml b/res/drawable/ic_trackpad_gesture_home.xml
new file mode 100644
index 0000000..f0e7232
--- /dev/null
+++ b/res/drawable/ic_trackpad_gesture_home.xml
@@ -0,0 +1,25 @@
+<!--
+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="48"
+ android:viewportHeight="48"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M11,39H18.5V26.5H29.5V39H37V19.5L24,9.75L11,19.5ZM8,42V18L24,6L40,18V42H26.5V29.5H21.5V42ZM24,24.35Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_trackpad_gesture_notifications.xml b/res/drawable/ic_trackpad_gesture_notifications.xml
new file mode 100644
index 0000000..37d77d8
--- /dev/null
+++ b/res/drawable/ic_trackpad_gesture_notifications.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2017 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.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="M18,17V11C18,7.93 16.37,5.36 13.5,4.68V4C13.5,3.17 12.83,2.5 12,2.5C11.17,2.5 10.5,3.17 10.5,4V4.68C7.64,5.36 6,7.92 6,11V17H4V19H14H14.38H20V17H18ZM16,17H8V11C8,8.52 9.51,6.5 12,6.5C14.49,6.5 16,8.52 16,11V17ZM14,20C14,21.1 13.1,22 12,22C10.9,22 10,21.1 10,20H14Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
+</vector>
diff --git a/res/drawable/ic_trackpad_gesture_recent_apps.xml b/res/drawable/ic_trackpad_gesture_recent_apps.xml
new file mode 100644
index 0000000..76ba829
--- /dev/null
+++ b/res/drawable/ic_trackpad_gesture_recent_apps.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2017 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.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:pathData="M16,6C16,7.1 16.9,8 18,8C19.1,8 20,7.1 20,6C20,4.9 19.1,4 18,4C16.9,4 16,4.9 16,6ZM6,8C7.1,8 8,7.1 8,6C8,4.9 7.1,4 6,4C4.9,4 4,4.9 4,6C4,7.1 4.9,8 6,8ZM12.001,20C13.101,20 14.001,19.1 14.001,18C14.001,16.9 13.101,16 12.001,16C10.901,16 10.001,16.9 10.001,18C10.001,19.1 10.901,20 12.001,20ZM8.001,18C8.001,19.1 7.101,20 6.001,20C4.901,20 4.001,19.1 4.001,18C4.001,16.9 4.901,16 6.001,16C7.101,16 8.001,16.9 8.001,18ZM6.001,14C7.101,14 8.001,13.1 8.001,12C8.001,10.9 7.101,10 6.001,10C4.901,10 4.001,10.9 4.001,12C4.001,13.1 4.901,14 6.001,14ZM14.001,12C14.001,13.1 13.101,14 12.001,14C10.901,14 10.001,13.1 10.001,12C10.001,10.9 10.901,10 12.001,10C13.101,10 14.001,10.9 14.001,12ZM14.001,6C14.001,7.1 13.101,8 12.001,8C10.901,8 10.001,7.1 10.001,6C10.001,4.9 10.901,4 12.001,4C13.101,4 14.001,4.9 14.001,6ZM18,14C19.1,14 20,13.1 20,12C20,10.9 19.1,10 18,10C16.9,10 16,10.9 16,12C16,13.1 16.9,14 18,14ZM20,18C20,19.1 19.1,20 18,20C16.9,20 16,19.1 16,18C16,16.9 16.9,16 18,16C19.1,16 20,16.9 20,18Z"
+ android:fillType="evenOdd"
+ android:fillColor="?android:attr/colorPrimary"/>
+</vector>
diff --git a/res/drawable/ic_trackpad_gesture_switch_apps.xml b/res/drawable/ic_trackpad_gesture_switch_apps.xml
new file mode 100644
index 0000000..3d18d1c
--- /dev/null
+++ b/res/drawable/ic_trackpad_gesture_switch_apps.xml
@@ -0,0 +1,26 @@
+<!--
+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="48"
+ android:viewportHeight="48"
+ android:tint="?android:attr/colorControlNormal"
+ android:autoMirrored="true">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M15.85,40 L13.75,37.9 19.8,31.85H4V28.85H19.8L13.75,22.8L15.85,20.7L25.5,30.35ZM32.15,27.3 L22.5,17.65 32.15,8 34.25,10.1 28.2,16.15H44V19.15H28.2L34.25,25.2Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_trackpad_pointer_speed.xml b/res/drawable/ic_trackpad_pointer_speed.xml
new file mode 100644
index 0000000..4e9abeb
--- /dev/null
+++ b/res/drawable/ic_trackpad_pointer_speed.xml
@@ -0,0 +1,25 @@
+<!--
+ 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="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="48.0"
+ android:viewportHeight="48.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M6.05,24.35V21.35H12.35V24.35ZM11.75,35.9 L9.75,33.9 14.15,29.5 16.15,31.5ZM14.15,16.05 L9.75,11.65 11.75,9.65 16.15,14.05ZM37,40.05 L27.6,30.65 25.4,37.45 20.2,19.45 37.8,25 30.9,27.45 40.25,36.8ZM21.85,12.3V6H24.85V12.3ZM32.55,16.05 L30.55,14.05 34.95,9.65 36.95,11.65Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_trackpad_reverse_scrolling.xml b/res/drawable/ic_trackpad_reverse_scrolling.xml
new file mode 100644
index 0000000..a62f904
--- /dev/null
+++ b/res/drawable/ic_trackpad_reverse_scrolling.xml
@@ -0,0 +1,25 @@
+<!--
+ 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="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="48.0"
+ android:viewportHeight="48.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M16.1,25.5V9.7L10.1,15.7L8,13.6L17.65,3.95L27.3,13.6L25.2,15.7L19.1,9.65V25.5ZM30.35,43.95 L20.7,34.25 22.8,32.2 28.8,38.2V22.4H31.8V38.25L37.9,32.2L40,34.3Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_trackpad_tap_to_click.xml b/res/drawable/ic_trackpad_tap_to_click.xml
new file mode 100644
index 0000000..7db0454
--- /dev/null
+++ b/res/drawable/ic_trackpad_tap_to_click.xml
@@ -0,0 +1,25 @@
+<!--
+ 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="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="48.0"
+ android:viewportHeight="48.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M23.25,2Q27.8,2 31.025,5.175Q34.25,8.35 34.25,12.9Q34.25,15.5 33.125,17.8Q32,20.1 29.95,21.7H28.25V19.2Q29.7,18.05 30.475,16.4Q31.25,14.75 31.25,12.9Q31.25,9.6 28.9,7.3Q26.55,5 23.25,5Q19.95,5 17.6,7.3Q15.25,9.6 15.25,12.9Q15.25,14.75 16.025,16.4Q16.8,18.05 18.25,19.2V22.8Q15.45,21.35 13.85,18.7Q12.25,16.05 12.25,12.9Q12.25,8.35 15.475,5.175Q18.7,2 23.25,2ZM21.35,44Q20.5,44 19.75,43.675Q19,43.35 18.45,42.8L8.15,32.5L10.95,29.6Q11.65,28.9 12.525,28.525Q13.4,28.15 14.35,28.4L18.25,29.3V13Q18.25,10.9 19.7,9.45Q21.15,8 23.25,8Q25.35,8 26.8,9.45Q28.25,10.9 28.25,13V21.6H29.55Q29.8,21.6 30,21.7Q30.2,21.8 30.45,21.9L37.85,25.5Q39.05,26.05 39.625,27.275Q40.2,28.5 39.95,29.8L38.15,40.7Q37.9,42.15 36.75,43.075Q35.6,44 34.15,44ZM20.95,41H35L37.15,28.55Q37.15,28.55 37.15,28.55Q37.15,28.55 37.15,28.55L28,24H25.25V13Q25.25,12.1 24.7,11.55Q24.15,11 23.25,11Q22.35,11 21.8,11.55Q21.25,12.1 21.25,13V32.95L13.55,31.3L12.4,32.45ZM35,41H20.95H21.25Q21.25,41 21.8,41Q22.35,41 23.25,41Q24.15,41 24.7,41Q25.25,41 25.25,41H28H35Q35,41 35,41Q35,41 35,41Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_trackpad_touch_gestures_inverse.xml b/res/drawable/ic_trackpad_touch_gestures_inverse.xml
new file mode 100644
index 0000000..d663572
--- /dev/null
+++ b/res/drawable/ic_trackpad_touch_gestures_inverse.xml
@@ -0,0 +1,25 @@
+<!--
+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="48"
+ android:viewportHeight="48"
+ android:tint="?android:attr/textColorPrimaryInverse">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M40.15,47 L38.2,43.1 34.3,41.15 38.2,39.3 40.15,35.3 42,39.3 46,41.15 42,43.1ZM28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4ZM23.05,48H30.4L29.75,45H23.05Q22,45 20.975,44.8Q19.95,44.6 19.25,43.9L6.5,30.65L7.85,29.4L19.75,35.85V9.15Q19.75,8.6 20.1,8.25Q20.45,7.9 21,7.9Q21.55,7.9 21.9,8.25Q22.25,8.6 22.25,9.15V24H26V4.25Q26,3.7 26.35,3.35Q26.7,3 27.25,3Q27.8,3 28.15,3.35Q28.5,3.7 28.5,4.25V24H32.25V6.1Q32.25,5.55 32.6,5.2Q32.95,4.85 33.5,4.85Q34.05,4.85 34.4,5.2Q34.75,5.55 34.75,6.1V24H38.5V12.45Q38.5,11.9 38.85,11.55Q39.2,11.2 39.75,11.2Q40.3,11.2 40.65,11.55Q41,11.9 41,12.45V31.4H44V12.45Q44,10.7 42.75,9.45Q41.5,8.2 39.75,8.2Q39.2,8.2 38.675,8.3Q38.15,8.4 37.75,8.75V6.45Q37.75,4.55 36.525,3.2Q35.3,1.85 33.5,1.85Q32.85,1.85 32.25,2.025Q31.65,2.2 31.1,2.6Q30.65,1.4 29.625,0.7Q28.6,0 27.3,0Q25.55,0 24.275,1.25Q23,2.5 23,4.25V5.55Q22.6,5.2 22.075,5.05Q21.55,4.9 21,4.9Q19.25,4.9 18,6.15Q16.75,7.4 16.75,9.15V30.95L8.85,26.5Q8,26.05 7.1,26.325Q6.2,26.6 5.5,27.25L2,30.3L16.85,45.7Q18.05,46.95 19.675,47.475Q21.3,48 23.05,48ZM6.85,14.8 L5.15,11.15 1.5,9.45 5.15,7.75 6.85,4.1 8.55,7.7 12.2,9.6 8.6,11.15Z"/>
+</vector>
diff --git a/res/drawable/ic_trackpad_touch_gestures_normal.xml b/res/drawable/ic_trackpad_touch_gestures_normal.xml
new file mode 100644
index 0000000..34619c8
--- /dev/null
+++ b/res/drawable/ic_trackpad_touch_gestures_normal.xml
@@ -0,0 +1,25 @@
+<!--
+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="48"
+ android:viewportHeight="48"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M40.15,47 L38.2,43.1 34.3,41.15 38.2,39.3 40.15,35.3 42,39.3 46,41.15 42,43.1ZM28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4Q28.5,31.4 28.5,31.4ZM23.05,48H30.4L29.75,45H23.05Q22,45 20.975,44.8Q19.95,44.6 19.25,43.9L6.5,30.65L7.85,29.4L19.75,35.85V9.15Q19.75,8.6 20.1,8.25Q20.45,7.9 21,7.9Q21.55,7.9 21.9,8.25Q22.25,8.6 22.25,9.15V24H26V4.25Q26,3.7 26.35,3.35Q26.7,3 27.25,3Q27.8,3 28.15,3.35Q28.5,3.7 28.5,4.25V24H32.25V6.1Q32.25,5.55 32.6,5.2Q32.95,4.85 33.5,4.85Q34.05,4.85 34.4,5.2Q34.75,5.55 34.75,6.1V24H38.5V12.45Q38.5,11.9 38.85,11.55Q39.2,11.2 39.75,11.2Q40.3,11.2 40.65,11.55Q41,11.9 41,12.45V31.4H44V12.45Q44,10.7 42.75,9.45Q41.5,8.2 39.75,8.2Q39.2,8.2 38.675,8.3Q38.15,8.4 37.75,8.75V6.45Q37.75,4.55 36.525,3.2Q35.3,1.85 33.5,1.85Q32.85,1.85 32.25,2.025Q31.65,2.2 31.1,2.6Q30.65,1.4 29.625,0.7Q28.6,0 27.3,0Q25.55,0 24.275,1.25Q23,2.5 23,4.25V5.55Q22.6,5.2 22.075,5.05Q21.55,4.9 21,4.9Q19.25,4.9 18,6.15Q16.75,7.4 16.75,9.15V30.95L8.85,26.5Q8,26.05 7.1,26.325Q6.2,26.6 5.5,27.25L2,30.3L16.85,45.7Q18.05,46.95 19.675,47.475Q21.3,48 23.05,48ZM6.85,14.8 L5.15,11.15 1.5,9.45 5.15,7.75 6.85,4.1 8.55,7.7 12.2,9.6 8.6,11.15Z"/>
+</vector>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 970261f..bbacc5c 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -600,6 +600,9 @@
<!-- Whether the dream setup activity should be enabled as part of setupwizard -->
<bool name="dream_setup_supported">false</bool>
+ <!-- Whether to show communal settings at the top level. -->
+ <bool name="config_show_communal_settings">false</bool>
+
<!-- Whether to put the apps with system UID into system component bucket or not -->
<bool name="config_battery_combine_system_components">false</bool>
diff --git a/res/values/menu_keys.xml b/res/values/menu_keys.xml
index 2841b69..27e9639 100755
--- a/res/values/menu_keys.xml
+++ b/res/values/menu_keys.xml
@@ -17,6 +17,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="menu_key_network" translatable="false">top_level_network</string>
+ <string name="menu_key_communal" translatable="false">top_level_communal</string>
<string name="menu_key_connected_devices" translatable="false">top_level_connected_devices</string>
<string name="menu_key_apps" translatable="false">top_level_apps</string>
<string name="menu_key_notifications" translatable="false">top_level_notifications</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 201c7ae..e61dab0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -256,8 +256,8 @@
<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>
+ <!-- Name shown in the title of individual stylus preference in the connected devices page [CHAR LIMIT=60] -->
+ <string name="stylus_connected_devices_title">Stylus</string>
<!-- Date & time settings screen title -->
<string name="date_and_time">Date & time</string>
@@ -2639,6 +2639,12 @@
<!-- Phone info screen, section titles: -->
<string name="battery_level_title">Battery level</string>
+ <!-- Communal Settings -->
+ <!-- Title of the communal settings under Settings > Communal [CHAR LIMIT=30] -->
+ <string name="communal_settings_title">Communal</string>
+ <!-- Summary of the communal settings under Settings > Communal [CHAR LIMIT=50] -->
+ <string name="communal_settings_summary">Communal settings</string>
+
<!-- APN Settings -->
<!-- APN settings screen title -->
<string name="apn_settings">APNs</string>
@@ -3676,6 +3682,53 @@
<!-- Title for the 'Virtual keyboards for work' preference. [CHAR LIMIT=45] -->
<string name="virtual_keyboards_for_work_title">On-screen keyboard for work</string>
+ <!-- Title for the button to trigger the 'trackpad settings' page if only connect with a touchpad. [CHAR LIMIT=35] -->
+ <string name="trackpad_settings">Touchpad</string>
+ <!-- Title for the button to trigger the 'trackpad settings' page if connect with a touchpad and a mouse. [CHAR LIMIT=35] -->
+ <string name="trackpad_mouse_settings">Touchpad & mouse</string>
+ <!-- Summary text for the 'trackpad settings' page. [CHAR LIMIT=100] -->
+ <string name="trackpad_settings_summary">Pointer speed, gestures</string>
+
+ <!-- Title text for 'Tap to click'. [CHAR LIMIT=35] -->
+ <string name="trackpad_tap_to_click">Tap to click</string>
+ <!-- Title text for 'Touchpad gestures' [CHAR LIMIT=35] -->
+ <string name="trackpad_touchpad_gesture_title">Touchpad gestures</string>
+ <!-- Summary text for 'Touchpad gestures' [CHAR LIMIT=60] -->
+ <string name="trackpad_touchpad_gesture_summary">Customize individual touchpad navigation gestures</string>
+ <!-- Title text for 'Reverse scrolling' [CHAR LIMIT=35] -->
+ <string name="trackpad_reverse_scrolling_title">Reverse scrolling</string>
+ <!-- Summary text for 'Reverse scrolling' [CHAR LIMIT=60] -->
+ <string name="trackpad_reverse_scrolling_summary">Content moves up when you scroll down</string>
+ <!-- Title text for 'Bottom-right tap' [CHAR LIMIT=35] -->
+ <string name="trackpad_bottom_right_tap_title">Bottom-right tap</string>
+ <!-- Summary text for 'Bottom-right tap' [CHAR LIMIT=60] -->
+ <string name="trackpad_bottom_right_tap_summary">Tap the bottom right corner of the touchpad for more options</string>
+ <!-- Title text for 'Pointer speed'. [CHAR LIMIT=35] -->
+ <string name="trackpad_pointer_speed">Pointer speed</string>
+ <!-- Title for the button to trigger the 'touch gesture' education. [CHAR LIMIT=35] -->
+ <string name="trackpad_touch_gesture">Learn touchpad gestures</string>
+
+ <!-- Title text for 'Go back' [CHAR LIMIT=35] -->
+ <string name="trackpad_go_back_title">Go back</string>
+ <!-- Summary text for 'Go back' [CHAR LIMIT=60] -->
+ <string name="trackpad_go_back_summary">Swipe left or right with three fingers</string>
+ <!-- Title text for 'Go home' [CHAR LIMIT=35] -->
+ <string name="trackpad_go_home_title">Go home</string>
+ <!-- Summary text for 'Go home' [CHAR LIMIT=60] -->
+ <string name="trackpad_go_home_summary">Swipe up with three fingers</string>
+ <!-- Title text for 'Recent apps' [CHAR LIMIT=35] -->
+ <string name="trackpad_recent_apps_title">Recent apps</string>
+ <!-- Summary text for 'Recent apps' [CHAR LIMIT=60] -->
+ <string name="trackpad_recent_apps_summary">Swipe up with three fingers, then hold</string>
+ <!-- Title text for 'Notifications' [CHAR LIMIT=35] -->
+ <string name="trackpad_notifications_title">Notifications</string>
+ <!-- Summary text for 'Notifications' [CHAR LIMIT=60] -->
+ <string name="trackpad_notifications_summary">Swipe down with three fingers</string>
+ <!-- Title text for 'Switch apps' [CHAR LIMIT=35] -->
+ <string name="trackpad_switch_apps_title">Switch apps</string>
+ <!-- Summary text for 'Switch apps' [CHAR LIMIT=60] -->
+ <string name="trackpad_switch_apps_summary">Swipe left or right with four fingers</string>
+
<!-- Summary text for keyboards when no layout has been selected. [CHAR LIMIT=35] -->
<string name="default_keyboard_layout">Default</string>
@@ -11383,4 +11436,29 @@
<!-- [CHAR LIMIT=NONE] Title for preference: Transfer eSIM to another device -->
<string name="transfer_esim_to_another_device_title">Transfer eSIM to another device</string>
+ <!-- Background Install Control UI -->
+ <!-- [CHAR LIMIT=NONE] Preference Feature Summary -->
+ <string name="background_install_preference_summary">{count, plural,
+ =1 {# app}
+ other {# apps}
+ }</string>
+
+ <!-- [CHAR LIMIT=NONE] Feature Title -->
+ <string name="background_install_title">Apps installed in the background</string>
+ <!-- [CHAR LIMIT=NONE] Feature summary -->
+ <string name="background_install_summary">Your device manufacturer may install apps on your device in the background, or allow your carrier and other partners to do so.\u000a\u000aAny apps listed here aren\u0027t required for your device to function normally. You can uninstall apps you don\u0027t want. </string>
+ <!-- [CHAR LIMIT=NONE] Group list no entry -->
+ <string name="background_install_feature_list_no_entry">No apps installed in the background</string>
+ <!-- [CHAR LIMIT=NONE] Uninstall app button content description -->
+ <string name="background_install_uninstall_button_description">Uninstall app</string>
+ <!-- [CHAR LIMIT=NONE] Before time period group list title -->
+ <string name="background_install_before">{count, plural,
+ =1 {Apps installed in the last # month}
+ other {Apps installed in the last # months}
+ }</string>
+ <!-- [CHAR LIMIT=NONE] After time period group list title -->
+ <string name="background_install_after">{count, plural,
+ =1 {Apps installed more than # month ago}
+ other {Apps installed more than # months ago}
+ }</string>
</resources>
diff --git a/res/xml/communal_settings.xml b/res/xml/communal_settings.xml
new file mode 100644
index 0000000..1a7938f
--- /dev/null
+++ b/res/xml/communal_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="communal_preference_screen"
+ android:title="@string/communal_settings_title" />
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 1b5e6c0..ad5236e 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -146,7 +146,8 @@
android:key="screensaver"
android:title="@string/screensaver_settings_title"
android:fragment="com.android.settings.dream.DreamSettings"
- settings:keywords="@string/keywords_screensaver"/>
+ settings:keywords="@string/keywords_screensaver"
+ settings:controller="com.android.settings.display.ScreenSaverPreferenceController"/>
<SwitchPreference
android:key="camera_gesture"
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 3b24203..1f5559f 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -46,6 +46,15 @@
settings:controller="com.android.settings.inputmethod.KeyboardPreferenceController"/>
<Preference
+ android:key="trackpad_settings"
+ android:title="@string/trackpad_settings"
+ android:summary="@string/trackpad_settings_summary"
+ android:icon="@drawable/ic_settings_trackpad"
+ android:order="-254"
+ android:fragment="com.android.settings.inputmethod.TrackpadSettings"
+ settings:controller="com.android.settings.inputmethod.TrackpadSettingsController"/>
+
+ <Preference
android:key="gesture_settings"
android:title="@string/gesture_preference_title"
android:icon="@drawable/ic_settings_gestures"
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 5fbc735..8c82b67 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -31,6 +31,16 @@
settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
<com.android.settings.widget.HomepagePreference
+ android:fragment="com.android.settings.communal.CommunalDashboardFragment"
+ android:icon="@drawable/ia_settings_communal"
+ android:key="top_level_communal"
+ android:order="-145"
+ android:title="@string/communal_settings_title"
+ android:summary="@string/communal_settings_summary"
+ settings:highlightableMenuKey="@string/menu_key_communal"
+ settings:controller="com.android.settings.communal.CommunalPreferenceController"/>
+
+ <com.android.settings.widget.HomepagePreference
android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
android:icon="@drawable/ic_devices_other"
android:key="top_level_connected_devices"
diff --git a/res/xml/trackpad_gesture_settings.xml b/res/xml/trackpad_gesture_settings.xml
new file mode 100644
index 0000000..dfc4199
--- /dev/null
+++ b/res/xml/trackpad_gesture_settings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/trackpad_touchpad_gesture_title">
+ <SwitchPreference
+ android:key="gesture_go_back"
+ android:title="@string/trackpad_go_back_title"
+ android:summary="@string/trackpad_go_back_summary"
+ android:icon="@drawable/ic_trackpad_gesture_back"
+ android:order="10"/>
+
+ <SwitchPreference
+ android:key="gesture_go_home"
+ android:title="@string/trackpad_go_home_title"
+ android:summary="@string/trackpad_go_home_summary"
+ android:icon="@drawable/ic_trackpad_gesture_home"
+ android:order="20"/>
+
+ <SwitchPreference
+ android:key="gesture_recent_apps"
+ android:title="@string/trackpad_recent_apps_title"
+ android:summary="@string/trackpad_recent_apps_summary"
+ android:icon="@drawable/ic_trackpad_gesture_recent_apps"
+ android:order="30"/>
+
+ <SwitchPreference
+ android:key="gesture_notifications"
+ android:title="@string/trackpad_notifications_title"
+ android:summary="@string/trackpad_notifications_summary"
+ android:icon="@drawable/ic_trackpad_gesture_notifications"
+ android:order="40"/>
+
+ <SwitchPreference
+ android:key="gesture_switch_apps"
+ android:title="@string/trackpad_switch_apps_title"
+ android:summary="@string/trackpad_switch_apps_summary"
+ android:icon="@drawable/ic_trackpad_gesture_switch_apps"
+ android:order="50"/>
+
+ <com.android.settingslib.widget.ButtonPreference
+ android:key="trackpad_touch_gesture_developer_mode"
+ android:title="@string/trackpad_touch_gesture"
+ android:icon="@drawable/ic_trackpad_touch_gestures_inverse"
+ settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/trackpad_settings.xml b/res/xml/trackpad_settings.xml
new file mode 100644
index 0000000..6401fb8
--- /dev/null
+++ b/res/xml/trackpad_settings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/trackpad_settings">
+ <Preference
+ android:key="trackpad_gesture_settings"
+ android:title="@string/trackpad_touchpad_gesture_title"
+ android:summary="@string/trackpad_touchpad_gesture_summary"
+ android:icon="@drawable/ic_trackpad_touch_gestures_normal"
+ android:order="-10"
+ android:fragment="com.android.settings.inputmethod.TrackpadTouchGestureSettings"
+ settings:controller="com.android.settings.inputmethod.TrackpadTouchGestureSettingsController"/>
+
+ <SwitchPreference
+ android:key="trackpad_tap_to_click"
+ android:title="@string/trackpad_tap_to_click"
+ android:icon="@drawable/ic_trackpad_tap_to_click"
+ android:order="10"/>
+
+ <SwitchPreference
+ android:key="trackpad_reverse_scrolling"
+ android:title="@string/trackpad_reverse_scrolling_title"
+ android:summary="@string/trackpad_reverse_scrolling_summary"
+ android:icon="@drawable/ic_trackpad_reverse_scrolling"
+ android:order="20"/>
+
+ <SwitchPreference
+ android:key="trackpad_bottom_right_tap"
+ android:title="@string/trackpad_bottom_right_tap_title"
+ android:summary="@string/trackpad_bottom_right_tap_summary"
+ android:icon="@drawable/ic_trackpad_reverse_scrolling"
+ android:order="30"/>
+
+ <com.android.settings.widget.SeekBarPreference
+ android:key="trackpad_pointer_speed"
+ android:title="@string/trackpad_pointer_speed"
+ android:icon="@drawable/ic_trackpad_pointer_speed"
+ android:order="40"
+ android:selectable="false"
+ android:max="100"
+ android:min="0"
+ android:defaultValue="50"/>
+
+ <com.android.settingslib.widget.ButtonPreference
+ android:key="trackpad_touch_gesture"
+ android:title="@string/trackpad_touch_gesture"
+ android:icon="@drawable/ic_trackpad_touch_gestures_inverse"
+ settings:controller="com.android.settings.inputmethod.TouchGesturesButtonPreferenceController"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 9a62412..97b9aae 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -24,7 +24,6 @@
import com.android.settings.display.BrightnessLevelPreferenceController;
import com.android.settings.display.CameraGesturePreferenceController;
import com.android.settings.display.LiftToWakePreferenceController;
-import com.android.settings.display.ScreenSaverPreferenceController;
import com.android.settings.display.ShowOperatorNamePreferenceController;
import com.android.settings.display.TapToWakePreferenceController;
import com.android.settings.display.ThemePreferenceController;
@@ -76,7 +75,6 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new CameraGesturePreferenceController(context));
controllers.add(new LiftToWakePreferenceController(context));
- controllers.add(new ScreenSaverPreferenceController(context));
controllers.add(new TapToWakePreferenceController(context));
controllers.add(new VrDisplayPreferenceController(context));
controllers.add(new ShowOperatorNamePreferenceController(context));
diff --git a/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java b/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
index 51a775e..851797e 100644
--- a/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
+++ b/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
@@ -48,7 +48,9 @@
final ProgressInteractionListener interactionListener =
mInteractionListener.get();
- interactionListener.notifyPreferenceChanged();
+ // Avoid timing issues to update the corresponding preview fail when clicking
+ // the increase/decrease button.
+ seekBar.post(interactionListener::notifyPreferenceChanged);
if (!mSeekByTouch) {
interactionListener.onProgressChanged();
diff --git a/src/com/android/settings/communal/CommunalDashboardFragment.java b/src/com/android/settings/communal/CommunalDashboardFragment.java
new file mode 100644
index 0000000..64f87b5
--- /dev/null
+++ b/src/com/android/settings/communal/CommunalDashboardFragment.java
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.communal;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+
+/**
+ * Dashboard fragment for the top-level Communal settings.
+ */
+public class CommunalDashboardFragment extends DashboardFragment {
+ private static final String TAG = "CommunalFragment";
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.COMMUNAL_MODE_SETTINGS;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.communal_settings;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+}
diff --git a/src/com/android/settings/communal/CommunalPreferenceController.java b/src/com/android/settings/communal/CommunalPreferenceController.java
new file mode 100644
index 0000000..e16dcc3
--- /dev/null
+++ b/src/com/android/settings/communal/CommunalPreferenceController.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.communal;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Controls the top-level Communal settings preference.
+ */
+public class CommunalPreferenceController extends BasePreferenceController {
+ public CommunalPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mContext.getResources().getBoolean(R.bool.config_show_communal_settings)
+ ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
index 61195c9..0d51ebe 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@ -17,6 +17,9 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import android.hardware.input.InputManager;
+import android.util.FeatureFlagUtils;
+import android.view.InputDevice;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -26,6 +29,7 @@
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
+import com.android.settings.connecteddevice.stylus.StylusDeviceUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
@@ -51,11 +55,14 @@
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
private ConnectedUsbDeviceUpdater mConnectedUsbDeviceUpdater;
private DockUpdater mConnectedDockUpdater;
+ private StylusDeviceUpdater mStylusDeviceUpdater;
private final PackageManager mPackageManager;
+ private final InputManager mInputManager;
public ConnectedDeviceGroupController(Context context) {
super(context, KEY);
mPackageManager = context.getPackageManager();
+ mInputManager = context.getSystemService(InputManager.class);
}
@Override
@@ -69,7 +76,13 @@
mConnectedUsbDeviceUpdater.registerCallback();
}
- mConnectedDockUpdater.registerCallback();
+ if (mConnectedDockUpdater != null) {
+ mConnectedDockUpdater.registerCallback();
+ }
+
+ if (mStylusDeviceUpdater != null) {
+ mStylusDeviceUpdater.registerCallback();
+ }
}
@Override
@@ -82,7 +95,13 @@
mConnectedUsbDeviceUpdater.unregisterCallback();
}
- mConnectedDockUpdater.unregisterCallback();
+ if (mConnectedDockUpdater != null) {
+ mConnectedDockUpdater.unregisterCallback();
+ }
+
+ if (mStylusDeviceUpdater != null) {
+ mStylusDeviceUpdater.unregisterCallback();
+ }
}
@Override
@@ -103,8 +122,15 @@
mConnectedUsbDeviceUpdater.initUsbPreference(context);
}
- mConnectedDockUpdater.setPreferenceContext(context);
- mConnectedDockUpdater.forceUpdate();
+ if (mConnectedDockUpdater != null) {
+ mConnectedDockUpdater.setPreferenceContext(context);
+ mConnectedDockUpdater.forceUpdate();
+ }
+
+ if (mStylusDeviceUpdater != null) {
+ mStylusDeviceUpdater.setPreferenceContext(context);
+ mStylusDeviceUpdater.forceUpdate();
+ }
}
}
@@ -112,6 +138,7 @@
public int getAvailabilityStatus() {
return (hasBluetoothFeature()
|| hasUsbFeature()
+ || hasUsiStylusFeature()
|| mConnectedDockUpdater != null)
? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
@@ -141,11 +168,13 @@
@VisibleForTesting
void init(BluetoothDeviceUpdater bluetoothDeviceUpdater,
ConnectedUsbDeviceUpdater connectedUsbDeviceUpdater,
- DockUpdater connectedDockUpdater) {
+ DockUpdater connectedDockUpdater,
+ StylusDeviceUpdater connectedStylusDeviceUpdater) {
mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
mConnectedUsbDeviceUpdater = connectedUsbDeviceUpdater;
mConnectedDockUpdater = connectedDockUpdater;
+ mStylusDeviceUpdater = connectedStylusDeviceUpdater;
}
public void init(DashboardFragment fragment) {
@@ -160,7 +189,10 @@
hasUsbFeature()
? new ConnectedUsbDeviceUpdater(context, fragment, this)
: null,
- connectedDockUpdater);
+ connectedDockUpdater,
+ hasUsiStylusFeature()
+ ? new StylusDeviceUpdater(context, fragment, this)
+ : null);
}
private boolean hasBluetoothFeature() {
@@ -171,4 +203,21 @@
return mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)
|| mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST);
}
+
+ private boolean hasUsiStylusFeature() {
+ if (!FeatureFlagUtils.isEnabled(mContext,
+ FeatureFlagUtils.SETTINGS_SHOW_STYLUS_PREFERENCES)) {
+ return false;
+ }
+
+ for (int deviceId : mInputManager.getInputDeviceIds()) {
+ InputDevice device = mInputManager.getInputDevice(deviceId);
+ if (device != null
+ && device.supportsSource(InputDevice.SOURCE_STYLUS)
+ && !device.isExternal()) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java b/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java
new file mode 100644
index 0000000..575c526
--- /dev/null
+++ b/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdater.java
@@ -0,0 +1,225 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.connecteddevice.stylus;
+
+import android.content.Context;
+import android.hardware.BatteryState;
+import android.hardware.input.InputManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.util.Log;
+import android.view.InputDevice;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Controller to maintain available USI stylus devices. Listens to bluetooth
+ * stylus connection to determine whether to show the USI preference.
+ */
+public class StylusDeviceUpdater implements InputManager.InputDeviceListener,
+ InputManager.InputDeviceBatteryListener {
+
+ private static final String TAG = "StylusDeviceUpdater";
+ private static final String PREF_KEY = "stylus_usi_device";
+ private static final String INPUT_ID_ARG = "device_input_id";
+
+ private final DevicePreferenceCallback mDevicePreferenceCallback;
+ private final List<Integer> mRegisteredBatteryCallbackIds;
+ private final DashboardFragment mFragment;
+ private final InputManager mInputManager;
+ private final MetricsFeatureProvider mMetricsFeatureProvider;
+
+ private long mLastUsiSeenTime = 0;
+ private Context mContext;
+
+ @VisibleForTesting
+ Integer mLastDetectedUsiId;
+
+ @VisibleForTesting
+ Preference mUsiPreference;
+
+
+ public StylusDeviceUpdater(Context context, DashboardFragment fragment,
+ DevicePreferenceCallback devicePreferenceCallback) {
+ mFragment = fragment;
+ mRegisteredBatteryCallbackIds = new ArrayList<>();
+ mDevicePreferenceCallback = devicePreferenceCallback;
+ mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+ mContext = context;
+ mInputManager = context.getSystemService(InputManager.class);
+
+ }
+
+ /**
+ * Register the stylus event callback and update the list
+ */
+ public void registerCallback() {
+ for (int deviceId : mInputManager.getInputDeviceIds()) {
+ onInputDeviceAdded(deviceId);
+ }
+ mInputManager.registerInputDeviceListener(this, new Handler(Looper.myLooper()));
+ forceUpdate();
+ }
+
+ /**
+ * Unregister the stylus event callback
+ */
+ public void unregisterCallback() {
+ for (int deviceId : mRegisteredBatteryCallbackIds) {
+ mInputManager.removeInputDeviceBatteryListener(deviceId, this);
+ }
+ mInputManager.unregisterInputDeviceListener(this);
+ }
+
+ @Override
+ public void onInputDeviceAdded(int deviceId) {
+ InputDevice inputDevice = mInputManager.getInputDevice(deviceId);
+ if (inputDevice.supportsSource(InputDevice.SOURCE_STYLUS)
+ && !inputDevice.isExternal()) {
+ try {
+ mInputManager.addInputDeviceBatteryListener(deviceId,
+ mContext.getMainExecutor(), this);
+ mRegisteredBatteryCallbackIds.add(deviceId);
+ } catch (IllegalArgumentException e) {
+ Log.e(TAG, e.getMessage());
+ }
+ }
+ forceUpdate();
+ }
+
+ @Override
+ public void onInputDeviceRemoved(int deviceId) {
+ Log.d(TAG, String.format("Input device removed %d", deviceId));
+ forceUpdate();
+ }
+
+ @Override
+ public void onInputDeviceChanged(int deviceId) {
+ if (mInputManager.getInputDevice(deviceId).supportsSource(InputDevice.SOURCE_STYLUS)) {
+ forceUpdate();
+ }
+ }
+
+
+ @Override
+ public void onBatteryStateChanged(int deviceId, long eventTimeMillis,
+ @NonNull BatteryState batteryState) {
+ if (batteryState.isPresent()) {
+ mLastUsiSeenTime = eventTimeMillis;
+ mLastDetectedUsiId = deviceId;
+ } else {
+ mLastUsiSeenTime = -1;
+ mLastDetectedUsiId = null;
+ }
+ forceUpdate();
+ }
+
+ /**
+ * Set the context to generate the {@link Preference}, so it could get the correct theme.
+ */
+ public void setPreferenceContext(Context context) {
+ mContext = context;
+ }
+
+ /**
+ * Force update to add or remove stylus preference
+ */
+ public void forceUpdate() {
+ if (shouldShowUsiPreference()) {
+ addOrUpdateUsiPreference();
+ } else {
+ removeUsiPreference();
+ }
+ }
+
+ private synchronized void addOrUpdateUsiPreference() {
+ if (mUsiPreference == null) {
+ mUsiPreference = new Preference(mContext);
+ mDevicePreferenceCallback.onDeviceAdded(mUsiPreference);
+ }
+ mUsiPreference.setKey(PREF_KEY);
+ mUsiPreference.setTitle(R.string.stylus_connected_devices_title);
+ // TODO(b/250909304): pending actual icon visD
+ mUsiPreference.setIcon(R.drawable.circle);
+ mUsiPreference.setOnPreferenceClickListener((Preference p) -> {
+ mMetricsFeatureProvider.logClickedPreference(p, mFragment.getMetricsCategory());
+ launchDeviceDetails();
+ return true;
+ });
+ }
+
+ private synchronized void removeUsiPreference() {
+ if (mUsiPreference != null) {
+ mDevicePreferenceCallback.onDeviceRemoved(mUsiPreference);
+ mUsiPreference = null;
+ }
+ }
+
+ private boolean shouldShowUsiPreference() {
+ return isUsiConnectionValid() && !hasConnectedBluetoothStylusDevice();
+ }
+
+ @VisibleForTesting
+ public Preference getPreference() {
+ return mUsiPreference;
+ }
+
+ @VisibleForTesting
+ boolean hasConnectedBluetoothStylusDevice() {
+ for (int deviceId : mInputManager.getInputDeviceIds()) {
+ InputDevice device = mInputManager.getInputDevice(deviceId);
+ if (device.supportsSource(InputDevice.SOURCE_STYLUS)
+ && mInputManager.getInputDeviceBluetoothAddress(deviceId) != null) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ @VisibleForTesting
+ boolean isUsiConnectionValid() {
+ // battery listener uses uptimeMillis as its eventTime
+ long currentTime = SystemClock.uptimeMillis();
+ long usiValidityDuration = 60 * 60 * 1000; // 1 hour
+ return mLastUsiSeenTime > 0 && currentTime - usiValidityDuration <= mLastUsiSeenTime;
+ }
+
+ private void launchDeviceDetails() {
+ final Bundle args = new Bundle();
+ args.putInt(INPUT_ID_ARG, mLastDetectedUsiId);
+
+ new SubSettingLauncher(mFragment.getContext())
+ .setDestination(StylusUsiDetailsFragment.class.getName())
+ .setArguments(args)
+ .setSourceMetricsCategory(mFragment.getMetricsCategory()).launch();
+ }
+}
diff --git a/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java b/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java
index 826cc1f..13d7b57 100644
--- a/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java
+++ b/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderController.java
@@ -66,7 +66,7 @@
mHeaderPreference = screen.findPreference(getPreferenceKey());
View view = mHeaderPreference.findViewById(R.id.entity_header);
TextView titleView = view.findViewById(R.id.entity_header_title);
- titleView.setText(R.string.stylus_usi_header_title);
+ titleView.setText(R.string.stylus_connected_devices_title);
ImageView iconView = mHeaderPreference.findViewById(R.id.entity_header_icon);
if (iconView != null) {
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index da81f6e..db23c43 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -83,6 +83,7 @@
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.NfcAndPaymentFragment;
import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment;
+import com.android.settings.connecteddevice.stylus.StylusUsiDetailsFragment;
import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
import com.android.settings.datausage.DataSaverSummary;
import com.android.settings.datausage.DataUsageList;
@@ -123,6 +124,7 @@
import com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment;
import com.android.settings.inputmethod.PhysicalKeyboardFragment;
import com.android.settings.inputmethod.SpellCheckersSettings;
+import com.android.settings.inputmethod.TrackpadSettings;
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.inputmethod.UserDictionarySettings;
import com.android.settings.language.LanguageAndInputSettings;
@@ -216,6 +218,7 @@
LanguageSettings.class.getName(),
KeyboardSettings.class.getName(),
NewKeyboardLayoutEnabledLocalesFragment.class.getName(),
+ TrackpadSettings.class.getName(),
SpellCheckersSettings.class.getName(),
UserDictionaryList.class.getName(),
UserDictionarySettings.class.getName(),
@@ -336,6 +339,7 @@
BluetoothDeviceDetailsFragment.class.getName(),
BluetoothBroadcastDialog.class.getName(),
BluetoothFindBroadcastsFragment.class.getName(),
+ StylusUsiDetailsFragment.class.getName(),
DataUsageList.class.getName(),
ToggleBackupSettingFragment.class.getName(),
PreviouslyConnectedDeviceDashboardFragment.class.getName(),
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index a2b1454..565a3e0 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -23,6 +23,7 @@
import com.android.settings.accounts.AccountDashboardFragment;
import com.android.settings.accounts.AccountDetailDashboardFragment;
import com.android.settings.applications.AppDashboardFragment;
+import com.android.settings.communal.CommunalDashboardFragment;
import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment;
import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
import com.android.settings.development.DevelopmentSettingsDashboardFragment;
@@ -126,6 +127,8 @@
CategoryKey.CATEGORY_BATTERY_SAVER_SETTINGS);
PARENT_TO_CATEGORY_KEY_MAP.put(SmartBatterySettings.class.getName(),
CategoryKey.CATEGORY_SMART_BATTERY_SETTINGS);
+ PARENT_TO_CATEGORY_KEY_MAP.put(CommunalDashboardFragment.class.getName(),
+ CategoryKey.CATEGORY_COMMUNAL_SETTINGS);
CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 691cbd6..22b38d6 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -109,7 +109,9 @@
final ExecutorService executor = (fragment == null) ? null :
Executors.newSingleThreadExecutor();
- final SlotSimStatus slotSimStatus = new SlotSimStatus(context, executor);
+ androidx.lifecycle.Lifecycle lifecycleObject = (fragment == null) ? null :
+ fragment.getLifecycle();
+ final SlotSimStatus slotSimStatus = new SlotSimStatus(context, executor, lifecycleObject);
controllers.add(new IpAddressPreferenceController(context, lifecycle));
controllers.add(new WifiMacAddressPreferenceController(context, lifecycle));
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
index 16f04df..00819b5 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
@@ -17,12 +17,14 @@
package com.android.settings.deviceinfo.simstatus;
import android.content.Context;
+import android.os.UserManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.os.UserManager;
+import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@@ -40,16 +42,12 @@
private static final String KEY_PREFERENCE_CATEGORY = "device_detail_category";
- private final SubscriptionManager mSubscriptionManager;
- private final List<Preference> mPreferenceList = new ArrayList<>();
-
private Fragment mFragment;
private SlotSimStatus mSlotSimStatus;
+ private Observer mSimChangeObserver;
public SimStatusPreferenceController(Context context, String prefKey) {
super(context, prefKey);
-
- mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
}
/**
@@ -103,26 +101,36 @@
// Add additional preferences for each sim in the device
for (int simSlotNumber = 0; simSlotNumber < mSlotSimStatus.size(); simSlotNumber++) {
final Preference multiSimPreference = createNewPreference(screen.getContext());
- multiSimPreference.setCopyingEnabled(true);
multiSimPreference.setOrder(mSlotSimStatus.getPreferenceOrdering(simSlotNumber));
multiSimPreference.setKey(mSlotSimStatus.getPreferenceKey(simSlotNumber));
category.addPreference(multiSimPreference);
- mPreferenceList.add(multiSimPreference);
}
}
@Override
public void updateState(Preference preference) {
- for (int simSlotNumber = 0; simSlotNumber < mPreferenceList.size(); simSlotNumber++) {
- final Preference simStatusPreference = mPreferenceList.get(simSlotNumber);
- simStatusPreference.setTitle(getPreferenceTitle(simSlotNumber /* sim slot */));
- simStatusPreference.setSummary(getCarrierName(simSlotNumber /* sim slot */));
+ final int simSlot = getSimSlotIndex();
+ if (mSimChangeObserver == null) {
+ mSimChangeObserver = x -> updateStateBySlot(preference, simSlot);
+ mSlotSimStatus.observe(mFragment.getViewLifecycleOwner(), mSimChangeObserver);
}
+ updateStateBySlot(preference, simSlot);
+ }
+
+ protected void updateStateBySlot(Preference preference, int simSlot) {
+ SubscriptionInfo subInfo = getSubscriptionInfo(simSlot);
+ preference.setEnabled(subInfo != null);
+ preference.setCopyingEnabled(subInfo != null);
+ preference.setTitle(getPreferenceTitle(simSlot));
+ preference.setSummary(getCarrierName(simSlot));
}
@Override
public boolean handlePreferenceTreeClick(Preference preference) {
- final int simSlot = mPreferenceList.indexOf(preference);
+ if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ return false;
+ }
+ final int simSlot = getSimSlotIndex();
if (simSlot == -1) {
return false;
}
@@ -138,16 +146,7 @@
}
private SubscriptionInfo getSubscriptionInfo(int simSlot) {
- final List<SubscriptionInfo> subscriptionInfoList =
- mSubscriptionManager.getActiveSubscriptionInfoList();
- if (subscriptionInfoList != null) {
- for (SubscriptionInfo info : subscriptionInfoList) {
- if (info.getSimSlotIndex() == simSlot) {
- return info;
- }
- }
- }
- return null;
+ return (mSlotSimStatus == null) ? null : mSlotSimStatus.getSubscriptionInfo(simSlot);
}
private CharSequence getCarrierName(int simSlot) {
diff --git a/src/com/android/settings/deviceinfo/simstatus/SlotSimStatus.java b/src/com/android/settings/deviceinfo/simstatus/SlotSimStatus.java
index 033222a..b3aca97 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SlotSimStatus.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SlotSimStatus.java
@@ -17,24 +17,43 @@
package com.android.settings.deviceinfo.simstatus;
import android.content.Context;
-import android.telephony.TelephonyManager;
+import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
import android.util.Log;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+
+import com.android.settings.network.SubscriptionsChangeListener;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executor;
import java.util.concurrent.Phaser;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
/**
* A class for showing a summary of status of sim slots.
*/
-public class SlotSimStatus {
+public class SlotSimStatus extends LiveData<Long>
+ implements DefaultLifecycleObserver,
+ SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
private static final String TAG = "SlotSimStatus";
private final AtomicInteger mNumberOfSlots = new AtomicInteger(0);
+ private final ConcurrentHashMap<Integer, SubscriptionInfo> mSubscriptionMap =
+ new ConcurrentHashMap<Integer, SubscriptionInfo>();
private final Phaser mBlocker = new Phaser(1);
+ private final AtomicLong mDataVersion = new AtomicLong(0);
+
+ private Context mContext;
private int mBasePreferenceOrdering;
+ private SubscriptionsChangeListener mSubscriptionsChangeListener;
private static final String KEY_SIM_STATUS = "sim_status";
@@ -43,28 +62,71 @@
* @param context Context
*/
public SlotSimStatus(Context context) {
- this(context, null);
+ this(context, null, null);
}
/**
* Construct of class.
* @param context Context
* @param executor executor for offload to thread
+ * @param lifecycle Lifecycle
*/
- public SlotSimStatus(Context context, Executor executor) {
+ public SlotSimStatus(Context context, Executor executor, Lifecycle lifecycle) {
+ mContext = context;
if (executor == null) {
queryRecords(context);
} else {
- executor.execute(() -> queryRecords(context));
+ executor.execute(() -> asyncQueryRecords(context));
+ }
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ mSubscriptionsChangeListener = new SubscriptionsChangeListener(context, this);
+ mSubscriptionsChangeListener.start();
}
}
protected void queryRecords(Context context) {
+ queryDetails(context);
+ setValue(mDataVersion.incrementAndGet());
+ mBlocker.arrive();
+ }
+
+ protected void asyncQueryRecords(Context context) {
+ queryDetails(context);
+ postValue(mDataVersion.incrementAndGet());
+ mBlocker.arrive();
+ }
+
+ protected void updateRecords() {
+ queryDetails(mContext);
+ setValue(mDataVersion.incrementAndGet());
+ }
+
+ protected void queryDetails(Context context) {
TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
if (telMgr != null) {
mNumberOfSlots.set(telMgr.getPhoneCount());
}
- mBlocker.arrive();
+
+ SubscriptionManager subMgr = context.getSystemService(SubscriptionManager.class);
+ if (subMgr == null) {
+ mSubscriptionMap.clear();
+ return;
+ }
+
+ List<SubscriptionInfo> subInfoList = subMgr.getActiveSubscriptionInfoList();
+ if ((subInfoList == null) || (subInfoList.size() <= 0)) {
+ mSubscriptionMap.clear();
+ Log.d(TAG, "No active SIM.");
+ return;
+ }
+
+ mSubscriptionMap.clear();
+ subInfoList.forEach(subInfo -> {
+ int slotIndex = subInfo.getSimSlotIndex();
+ mSubscriptionMap.put(slotIndex, subInfo);
+ });
+ Log.d(TAG, "Number of active SIM: " + subInfoList.size());
}
protected void waitForResult() {
@@ -110,6 +172,19 @@
}
/**
+ * Get subscription based on slot index.
+ * @param slotIndex index of slot (starting from 0)
+ * @return SubscriptionInfo based on index of slot.
+ * {@code null} means no subscription on slot.
+ */
+ public SubscriptionInfo getSubscriptionInfo(int slotIndex) {
+ if (slotIndex >= size()) {
+ return null;
+ }
+ return mSubscriptionMap.get(slotIndex);
+ }
+
+ /**
* Get slot index based on Preference key
* @param prefKey is the preference key
* @return slot index.
@@ -124,4 +199,28 @@
}
return simSlotIndex - 1;
}
+
+ @Override
+ public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
+ if (airplaneModeEnabled) {
+ /**
+ * Only perform update when airplane mode ON.
+ * Relay on #onSubscriptionsChanged() when airplane mode OFF.
+ */
+ updateRecords();
+ }
+ }
+
+ @Override
+ public void onSubscriptionsChanged() {
+ updateRecords();
+ }
+
+ @Override
+ public void onDestroy(LifecycleOwner lifecycleOwner) {
+ if (mSubscriptionsChangeListener != null) {
+ mSubscriptionsChangeListener.stop();
+ }
+ lifecycleOwner.getLifecycle().removeObserver(this);
+ }
}
diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java
index d6fef11..db4bc37 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -16,47 +16,41 @@
import android.content.Context;
import android.os.UserManager;
-import androidx.preference.Preference;
-
import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dream.DreamSettings;
-import com.android.settingslib.core.AbstractPreferenceController;
-public class ScreenSaverPreferenceController extends AbstractPreferenceController implements
+public class ScreenSaverPreferenceController extends BasePreferenceController implements
PreferenceControllerMixin {
- private static final String KEY_SCREEN_SAVER = "screensaver";
private final boolean mDreamsDisabledByAmbientModeSuppression;
- public ScreenSaverPreferenceController(Context context) {
- super(context);
+ public ScreenSaverPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+
mDreamsDisabledByAmbientModeSuppression = context.getResources().getBoolean(
com.android.internal.R.bool.config_dreamsDisabledByAmbientModeSuppressionConfig);
}
@Override
- public boolean isAvailable() {
+ public int getAvailabilityStatus() {
final boolean dreamsSupported = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_dreamsSupported);
final boolean dreamsOnlyEnabledForDockUser = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser);
// TODO(b/257333623): Allow the Dock User to be non-SystemUser user in HSUM.
- return dreamsSupported && (!dreamsOnlyEnabledForDockUser || isSystemUser());
+ return (dreamsSupported && (!dreamsOnlyEnabledForDockUser || isSystemUser()))
+ ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
- public String getPreferenceKey() {
- return KEY_SCREEN_SAVER;
- }
-
- @Override
- public void updateState(Preference preference) {
+ public CharSequence getSummary() {
if (mDreamsDisabledByAmbientModeSuppression
&& AmbientDisplayAlwaysOnPreferenceController.isAodSuppressedByBedtime(mContext)) {
- preference.setSummary(R.string.screensaver_settings_when_to_dream_bedtime);
+ return mContext.getString(R.string.screensaver_settings_when_to_dream_bedtime);
} else {
- preference.setSummary(DreamSettings.getSummaryTextWithDreamName(mContext));
+ return DreamSettings.getSummaryTextWithDreamName(mContext);
}
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
index c2eab57..b048dbc 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceController.java
@@ -209,7 +209,7 @@
// Ensure the battery chart group is visible for users.
animateBatteryChartViewGroup();
final BatteryLevelData batteryLevelData =
- DataProcessor.getBatteryLevelData(mContext, mHandler, batteryHistoryMap,
+ DataProcessManager.getBatteryLevelData(mContext, mHandler, batteryHistoryMap,
batteryUsageMap -> {
mBatteryUsageMap = batteryUsageMap;
refreshUi();
diff --git a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
index 2e977fd..c1b7818 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/ConvertUtils.java
@@ -17,7 +17,9 @@
import android.annotation.IntDef;
import android.annotation.Nullable;
+import android.app.usage.IUsageStatsManager;
import android.app.usage.UsageEvents.Event;
+import android.app.usage.UsageStatsManager;
import android.content.ContentValues;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -25,7 +27,9 @@
import android.os.BatteryUsageStats;
import android.os.Build;
import android.os.LocaleList;
+import android.os.RemoteException;
import android.os.UserHandle;
+import android.text.TextUtils;
import android.text.format.DateFormat;
import android.util.Base64;
import android.util.Log;
@@ -167,8 +171,10 @@
/** Converts to {@link AppUsageEvent} from {@link Event} */
@Nullable
public static AppUsageEvent convertToAppUsageEvent(
- Context context, final Event event, final long userId) {
- if (event.getPackageName() == null) {
+ Context context, final IUsageStatsManager usageStatsManager, final Event event,
+ final long userId) {
+ final String packageName = event.getPackageName();
+ if (packageName == null) {
// See b/190609174: Event package names should never be null, but sometimes they are.
// Note that system events like device shutting down should still come with the android
// package name.
@@ -182,13 +188,20 @@
appUsageEventBuilder
.setTimestamp(event.getTimeStamp())
.setType(getAppUsageEventType(event.getEventType()))
- .setPackageName(event.getPackageName())
+ .setPackageName(packageName)
.setUserId(userId);
+ final String taskRootPackageName = getTaskRootPackageName(event);
+ if (taskRootPackageName != null) {
+ appUsageEventBuilder.setTaskRootPackageName(taskRootPackageName);
+ }
+
+ final String effectivePackageName =
+ getEffectivePackageName(usageStatsManager, packageName, taskRootPackageName);
try {
final long uid = context
.getPackageManager()
- .getPackageUidAsUser(event.getPackageName(), (int) userId);
+ .getPackageUidAsUser(effectivePackageName, (int) userId);
appUsageEventBuilder.setUid(uid);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, String.format(
@@ -201,10 +214,6 @@
} catch (NoClassDefFoundError | NoSuchMethodError e) {
Log.w(TAG, "UsageEvent instance ID API error");
}
- String taskRootPackageName = getTaskRootPackageName(event);
- if (taskRootPackageName != null) {
- appUsageEventBuilder.setTaskRootPackageName(taskRootPackageName);
- }
return appUsageEventBuilder.build();
}
@@ -268,6 +277,35 @@
}
/**
+ * Returns the package name the app usage should be attributed to.
+ *
+ * <ul>
+ * <li>If {@link UsageStatsManager#getUsageSource()} returns {@link
+ * UsageStatsManager#USAGE_SOURCE_CURRENT_ACTIVITY}, this method will return packageName.
+ * <li>If {@link UsageStatsManager#getUsageSource()} returns {@link
+ * UsageStatsManager#USAGE_SOURCE_TASK_ROOT_ACTIVITY}, this method will return
+ * taskRootPackageName if it exists, or packageName otherwise.
+ * </ul>
+ */
+ @VisibleForTesting
+ static String getEffectivePackageName(
+ final IUsageStatsManager usageStatsManager, final String packageName,
+ final String taskRootPackageName) {
+ int usageSource = getUsageSource(usageStatsManager);
+ switch (usageSource) {
+ case UsageStatsManager.USAGE_SOURCE_TASK_ROOT_ACTIVITY:
+ return !TextUtils.isEmpty(taskRootPackageName)
+ ? taskRootPackageName
+ : packageName;
+ case UsageStatsManager.USAGE_SOURCE_CURRENT_ACTIVITY:
+ return packageName;
+ default:
+ Log.e(TAG, "Unexpected usage source: " + usageSource);
+ return packageName;
+ }
+ }
+
+ /**
* Returns the package name of the task root when this event was reported when {@code event} is
* one of:
*
@@ -298,6 +336,20 @@
}
}
+ /**
+ * Returns what App Usage Observers will consider the source of usage for an activity.
+ *
+ * @see UsageStatsManager#getUsageSource()
+ */
+ private static int getUsageSource(final IUsageStatsManager usageStatsManager) {
+ try {
+ return usageStatsManager.getUsageSource();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to getUsageSource", e);
+ return UsageStatsManager.USAGE_SOURCE_CURRENT_ACTIVITY;
+ }
+ }
+
private static AppUsageEventType getAppUsageEventType(final int eventType) {
switch (eventType) {
case Event.ACTIVITY_RESUMED:
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
index 784f64f..dd6b9d9 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java
@@ -20,11 +20,13 @@
import android.content.Context;
import android.os.AsyncTask;
import android.os.Handler;
+import android.os.Looper;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.Utils;
@@ -39,7 +41,7 @@
/**
* Manages the async tasks to process battery and app usage data.
*
- * For now, there exist 3 async tasks in this manager:
+ * For now, there exist 4 async tasks in this manager:
* <ul>
* <li>loadCurrentBatteryHistoryMap: load the latest battery history data from battery stats
* service.</li>
@@ -47,9 +49,11 @@
* from usage stats service.</li>
* <li>loadDatabaseAppUsageList: load the necessary app usage data (after last full charge) from
* database</li>
+ * <li>loadAndApplyBatteryMapFromServiceOnly: load all the battery history data (should be after
+ * last full charge) from battery stats service and apply the callback function directly</li>
* </ul>
*
- * The 3 async tasks will be started at the same time.
+ * If there is battery level data, the first 3 async tasks will be started at the same time.
* <ul>
* <li>After loadCurrentAppUsageList and loadDatabaseAppUsageList complete, which means all app
* usage data has been loaded, the intermediate usage result will be generated.</li>
@@ -59,6 +63,9 @@
* <li>If current user is locked, which means we couldn't get the latest app usage data,
* screen-on time will not be shown in the UI and empty screen-on time data will be returned.</li>
* </ul>
+ *
+ * If there is no battery level data, the 4th async task will be started only and the usage map
+ * callback function will be applied directly to show the app list on the UI.
*/
public class DataProcessManager {
private static final String TAG = "DataProcessManager";
@@ -74,23 +81,25 @@
// The start timestamp of battery level data. As we don't know when is the full charge cycle
// start time when loading app usage data, this value is used as the start time of querying app
// usage data.
- private long mStartTimestampOfLevelData = 0;
+ private long mStartTimestampOfLevelData;
private boolean mIsCurrentBatteryHistoryLoaded = false;
private boolean mIsCurrentAppUsageLoaded = false;
private boolean mIsDatabaseAppUsageLoaded = false;
// Used to identify whether screen-on time data should be shown in the UI.
private boolean mShowScreenOnTime = true;
+ // Used to identify whether battery level data should be shown in the UI.
+ private boolean mShowBatteryLevel = true;
private List<AppUsageEvent> mAppUsageEventList = new ArrayList<>();
/**
- * Constructor when this exists battery level data.
+ * Constructor when there exists battery level data.
*/
DataProcessManager(
Context context,
Handler handler,
- final DataProcessor.UsageMapAsyncResponse callbackFunction,
+ @NonNull final DataProcessor.UsageMapAsyncResponse callbackFunction,
@NonNull final List<BatteryLevelData.PeriodBatteryLevelData> hourlyBatteryLevelsPerDay,
@NonNull final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap) {
mContext = context.getApplicationContext();
@@ -103,15 +112,39 @@
}
/**
+ * Constructor when there is no battery level data.
+ */
+ DataProcessManager(
+ Context context,
+ Handler handler,
+ @NonNull final DataProcessor.UsageMapAsyncResponse callbackFunction) {
+ mContext = context.getApplicationContext();
+ mHandler = handler;
+ mUserManager = mContext.getSystemService(UserManager.class);
+ mCallbackFunction = callbackFunction;
+ // When there is no battery level data, don't show screen-on time and battery level chart on
+ // the UI.
+ mShowScreenOnTime = false;
+ mShowBatteryLevel = false;
+ }
+
+ /**
* Starts the async tasks to load battery history data and app usage data.
*/
public void start() {
- // Load the latest battery history data from the service.
- loadCurrentBatteryHistoryMap();
- // Load app usage list from database.
- loadDatabaseAppUsageList();
- // Load the latest app usage list from the service.
- loadCurrentAppUsageList();
+ // If we have battery level data, load the battery history map and app usage simultaneously.
+ if (mShowBatteryLevel) {
+ // Loads the latest battery history data from the service.
+ loadCurrentBatteryHistoryMap();
+ // Loads app usage list from database.
+ loadDatabaseAppUsageList();
+ // Loads the latest app usage list from the service.
+ loadCurrentAppUsageList();
+ } else {
+ // If there is no battery level data, only load the battery history data from service
+ // and show it as the app list directly.
+ loadAndApplyBatteryMapFromServiceOnly();
+ }
}
@VisibleForTesting
@@ -154,6 +187,11 @@
return mShowScreenOnTime;
}
+ @VisibleForTesting
+ boolean getShowBatteryLevel() {
+ return mShowBatteryLevel;
+ }
+
private void loadCurrentBatteryHistoryMap() {
new AsyncTask<Void, Void, Map<String, BatteryHistEntry>>() {
@Override
@@ -279,6 +317,35 @@
}.execute();
}
+ private void loadAndApplyBatteryMapFromServiceOnly() {
+ new AsyncTask<Void, Void, Map<Integer, Map<Integer, BatteryDiffData>>>() {
+ @Override
+ protected Map<Integer, Map<Integer, BatteryDiffData>> doInBackground(Void... voids) {
+ final long startTime = System.currentTimeMillis();
+ final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap =
+ DataProcessor.getBatteryUsageMapFromStatsService(mContext);
+ DataProcessor.loadLabelAndIcon(batteryUsageMap);
+ Log.d(TAG, String.format(
+ "execute loadAndApplyBatteryMapFromServiceOnly size=%d in %d/ms",
+ batteryUsageMap.size(), (System.currentTimeMillis() - startTime)));
+ return batteryUsageMap;
+ }
+
+ @Override
+ protected void onPostExecute(
+ final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap) {
+ // Set the unused variables to null.
+ mContext = null;
+ // Post results back to main thread to refresh UI.
+ if (mHandler != null && mCallbackFunction != null) {
+ mHandler.post(() -> {
+ mCallbackFunction.onBatteryUsageMapLoaded(batteryUsageMap);
+ });
+ }
+ }
+ }.execute();
+ }
+
private void tryToProcessAppUsageData() {
// Only when all app usage events has been loaded, start processing app usage data to an
// intermediate result for further use.
@@ -313,6 +380,10 @@
private void generateFinalDataAndApplyCallback() {
// TODO: generate the final data including battery usage map and device screen-on time and
// then apply the callback function.
+ // Set the unused variables to null.
+ mContext = null;
+ mHourlyBatteryLevelsPerDay = null;
+ mBatteryHistoryMap = null;
}
// Whether we should load app usage data from service or database.
@@ -350,4 +421,47 @@
Utils.getManagedProfile(mUserManager);
return userHandle != null ? userHandle.getIdentifier() : Integer.MIN_VALUE;
}
+
+ /**
+ * @return Returns battery level data and start async task to compute battery diff usage data
+ * and load app labels + icons.
+ * Returns null if the input is invalid or not having at least 2 hours data.
+ */
+ @Nullable
+ public static BatteryLevelData getBatteryLevelData(
+ Context context,
+ @Nullable Handler handler,
+ @Nullable final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap,
+ final DataProcessor.UsageMapAsyncResponse asyncResponseDelegate) {
+ if (batteryHistoryMap == null || batteryHistoryMap.isEmpty()) {
+ Log.d(TAG, "batteryHistoryMap is null in getBatteryLevelData()");
+ new DataProcessManager(context, handler, asyncResponseDelegate).start();
+ return null;
+ }
+ handler = handler != null ? handler : new Handler(Looper.getMainLooper());
+ // Process raw history map data into hourly timestamps.
+ final Map<Long, Map<String, BatteryHistEntry>> processedBatteryHistoryMap =
+ DataProcessor.getHistoryMapWithExpectedTimestamps(context, batteryHistoryMap);
+ // Wrap and processed history map into easy-to-use format for UI rendering.
+ final BatteryLevelData batteryLevelData =
+ DataProcessor.getLevelDataThroughProcessedHistoryMap(
+ context, processedBatteryHistoryMap);
+ if (batteryLevelData == null) {
+ new DataProcessManager(context, handler, asyncResponseDelegate).start();
+ Log.d(TAG, "getBatteryLevelData() returns null");
+ return null;
+ }
+
+ // TODO: replace the task below with new DataProcessManager(...).start() after
+ // DataProcessManager is completed;
+ // Start the async task to compute diff usage data and load labels and icons.
+ new DataProcessor.ComputeUsageMapAndLoadItemsTask(
+ context,
+ handler,
+ asyncResponseDelegate,
+ batteryLevelData.getHourlyBatteryLevelsPerDay(),
+ processedBatteryHistoryMap).execute();
+
+ return batteryLevelData;
+ }
}
diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
index bfedeab..c33e0a3 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessor.java
@@ -32,7 +32,6 @@
import android.os.BatteryUsageStats;
import android.os.BatteryUsageStatsQuery;
import android.os.Handler;
-import android.os.Looper;
import android.os.Process;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -114,48 +113,6 @@
}
/**
- * @return Returns battery level data and start async task to compute battery diff usage data
- * and load app labels + icons.
- * Returns null if the input is invalid or not having at least 2 hours data.
- */
- @Nullable
- public static BatteryLevelData getBatteryLevelData(
- Context context,
- @Nullable Handler handler,
- @Nullable final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap,
- final UsageMapAsyncResponse asyncResponseDelegate) {
- if (batteryHistoryMap == null || batteryHistoryMap.isEmpty()) {
- Log.d(TAG, "batteryHistoryMap is null in getBatteryLevelData()");
- loadBatteryUsageDataFromBatteryStatsService(
- context, handler, asyncResponseDelegate);
- return null;
- }
- handler = handler != null ? handler : new Handler(Looper.getMainLooper());
- // Process raw history map data into hourly timestamps.
- final Map<Long, Map<String, BatteryHistEntry>> processedBatteryHistoryMap =
- getHistoryMapWithExpectedTimestamps(context, batteryHistoryMap);
- // Wrap and processed history map into easy-to-use format for UI rendering.
- final BatteryLevelData batteryLevelData =
- getLevelDataThroughProcessedHistoryMap(context, processedBatteryHistoryMap);
- if (batteryLevelData == null) {
- loadBatteryUsageDataFromBatteryStatsService(
- context, handler, asyncResponseDelegate);
- Log.d(TAG, "getBatteryLevelData() returns null");
- return null;
- }
-
- // Start the async task to compute diff usage data and load labels and icons.
- new ComputeUsageMapAndLoadItemsTask(
- context,
- handler,
- asyncResponseDelegate,
- batteryLevelData.getHourlyBatteryLevelsPerDay(),
- processedBatteryHistoryMap).execute();
-
- return batteryLevelData;
- }
-
- /**
* @return Returns battery usage data of different entries.
* Returns null if the input is invalid or there is no enough data.
*/
@@ -299,7 +256,8 @@
break;
}
final AppUsageEvent appUsageEvent =
- ConvertUtils.convertToAppUsageEvent(context, event, userId);
+ ConvertUtils.convertToAppUsageEvent(
+ context, sUsageStatsManager, event, userId);
if (appUsageEvent != null) {
numEventsFetched++;
appUsageEventList.add(appUsageEvent);
@@ -361,7 +319,6 @@
* The keys of processed history map should contain every hour between the start and end
* timestamp. If there's no data in some key, the value will be the empty hashmap.
*/
- @VisibleForTesting
static Map<Long, Map<String, BatteryHistEntry>> getHistoryMapWithExpectedTimestamps(
Context context,
final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap) {
@@ -385,7 +342,6 @@
return resultMap;
}
- @VisibleForTesting
@Nullable
static BatteryLevelData getLevelDataThroughProcessedHistoryMap(
Context context,
@@ -624,16 +580,37 @@
}
/**
- * Starts the async task to load battery diff usage data and load app labels + icons.
+ * @return Returns the overall battery usage data from battery stats service directly.
+ *
+ * The returned value should be always a 2d map and composed by only 1 part:
+ * - [SELECTED_INDEX_ALL][SELECTED_INDEX_ALL]
*/
- private static void loadBatteryUsageDataFromBatteryStatsService(
- Context context,
- @Nullable Handler handler,
- final UsageMapAsyncResponse asyncResponseDelegate) {
- new LoadUsageMapFromBatteryStatsServiceTask(
- context,
- handler,
- asyncResponseDelegate).execute();
+ static Map<Integer, Map<Integer, BatteryDiffData>> getBatteryUsageMapFromStatsService(
+ final Context context) {
+ final Map<Integer, Map<Integer, BatteryDiffData>> resultMap = new HashMap<>();
+ final Map<Integer, BatteryDiffData> allUsageMap = new HashMap<>();
+ // Always construct the map whether the value is null or not.
+ allUsageMap.put(SELECTED_INDEX_ALL,
+ generateBatteryDiffData(context, getBatteryHistListFromFromStatsService(context)));
+ resultMap.put(SELECTED_INDEX_ALL, allUsageMap);
+ processBatteryDiffData(context, resultMap);
+ return resultMap;
+ }
+
+ static void loadLabelAndIcon(
+ @Nullable final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap) {
+ if (batteryUsageMap == null) {
+ return;
+ }
+ // Pre-loads each BatteryDiffEntry relative icon and label for all slots.
+ final BatteryDiffData batteryUsageMapForAll =
+ batteryUsageMap.get(SELECTED_INDEX_ALL).get(SELECTED_INDEX_ALL);
+ if (batteryUsageMapForAll != null) {
+ batteryUsageMapForAll.getAppDiffEntryList().forEach(
+ entry -> entry.loadLabelAndIcon());
+ batteryUsageMapForAll.getSystemDiffEntryList().forEach(
+ entry -> entry.loadLabelAndIcon());
+ }
}
@Nullable
@@ -672,24 +649,6 @@
return events;
}
- /**
- * @return Returns the overall battery usage data from battery stats service directly.
- *
- * The returned value should be always a 2d map and composed by only 1 part:
- * - [SELECTED_INDEX_ALL][SELECTED_INDEX_ALL]
- */
- private static Map<Integer, Map<Integer, BatteryDiffData>> getBatteryUsageMapFromStatsService(
- final Context context) {
- final Map<Integer, Map<Integer, BatteryDiffData>> resultMap = new HashMap<>();
- final Map<Integer, BatteryDiffData> allUsageMap = new HashMap<>();
- // Always construct the map whether the value is null or not.
- allUsageMap.put(SELECTED_INDEX_ALL,
- generateBatteryDiffData(context, getBatteryHistListFromFromStatsService(context)));
- resultMap.put(SELECTED_INDEX_ALL, allUsageMap);
- processBatteryDiffData(context, resultMap);
- return resultMap;
- }
-
@Nullable
private static List<BatteryHistEntry> getBatteryHistListFromFromStatsService(
final Context context) {
@@ -1469,22 +1428,6 @@
return true;
}
- private static void loadLabelAndIcon(
- @Nullable final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap) {
- if (batteryUsageMap == null) {
- return;
- }
- // Pre-loads each BatteryDiffEntry relative icon and label for all slots.
- final BatteryDiffData batteryUsageMapForAll =
- batteryUsageMap.get(SELECTED_INDEX_ALL).get(SELECTED_INDEX_ALL);
- if (batteryUsageMapForAll != null) {
- batteryUsageMapForAll.getAppDiffEntryList().forEach(
- entry -> entry.loadLabelAndIcon());
- batteryUsageMapForAll.getSystemDiffEntryList().forEach(
- entry -> entry.loadLabelAndIcon());
- }
- }
-
private static long getTimestampWithDayDiff(final long timestamp, final int dayDiff) {
final Calendar calendar = Calendar.getInstance();
calendar.setTimeInMillis(timestamp);
@@ -1527,7 +1470,7 @@
}
// Compute diff map and loads all items (icon and label) in the background.
- private static class ComputeUsageMapAndLoadItemsTask
+ static class ComputeUsageMapAndLoadItemsTask
extends AsyncTask<Void, Void, Map<Integer, Map<Integer, BatteryDiffData>>> {
Context mApplicationContext;
@@ -1536,7 +1479,7 @@
private List<BatteryLevelData.PeriodBatteryLevelData> mHourlyBatteryLevelsPerDay;
private Map<Long, Map<String, BatteryHistEntry>> mBatteryHistoryMap;
- private ComputeUsageMapAndLoadItemsTask(
+ ComputeUsageMapAndLoadItemsTask(
Context context,
Handler handler,
final UsageMapAsyncResponse asyncResponseDelegate,
@@ -1594,35 +1537,4 @@
}
}
}
-
- // Loads battery usage data from battery stats service directly and loads all items (icon and
- // label) in the background.
- private static final class LoadUsageMapFromBatteryStatsServiceTask
- extends ComputeUsageMapAndLoadItemsTask {
-
- private LoadUsageMapFromBatteryStatsServiceTask(
- Context context,
- Handler handler,
- final UsageMapAsyncResponse asyncResponseDelegate) {
- super(context, handler, asyncResponseDelegate, /*hourlyBatteryLevelsPerDay=*/ null,
- /*batteryHistoryMap=*/ null);
- }
-
- @Override
- protected Map<Integer, Map<Integer, BatteryDiffData>> doInBackground(Void... voids) {
- if (mApplicationContext == null
- || mHandler == null
- || mAsyncResponseDelegate == null) {
- Log.e(TAG, "invalid input for ComputeUsageMapAndLoadItemsTask()");
- return null;
- }
- final long startTime = System.currentTimeMillis();
- final Map<Integer, Map<Integer, BatteryDiffData>> batteryUsageMap =
- getBatteryUsageMapFromStatsService(mApplicationContext);
- loadLabelAndIcon(batteryUsageMap);
- Log.d(TAG, String.format("execute LoadUsageMapFromBatteryStatsServiceTask in %d/ms",
- (System.currentTimeMillis() - startTime)));
- return batteryUsageMap;
- }
- }
}
diff --git a/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
new file mode 100644
index 0000000..6e54689
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TouchGesturesButtonPreferenceController.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.ButtonPreference;
+
+public class TouchGesturesButtonPreferenceController extends BasePreferenceController {
+
+ private static final int ORDER_TOP = 0;
+ private static final int ORDER_BOTTOM = 100;
+ private static final String PREFERENCE_KEY = "trackpad_touch_gesture";
+
+ public TouchGesturesButtonPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ ButtonPreference buttonPreference =
+ (ButtonPreference) screen.findPreference(getPreferenceKey());
+ boolean touchGestureDeveloperMode = FeatureFlagUtils
+ .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
+ if (getPreferenceKey().equals(PREFERENCE_KEY)) {
+ if (touchGestureDeveloperMode) {
+ buttonPreference.setOrder(ORDER_TOP);
+ } else {
+ buttonPreference.setOrder(ORDER_BOTTOM);
+ }
+ }
+ buttonPreference.setOnClickListener(v -> {
+ showTouchpadGestureEducation();
+ });
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ private void showTouchpadGestureEducation() {
+ // TODO: Waiting for the education UX design.
+ /* For example:
+ FragmentManager fragmentManager = mParent.getActivity().getSupportFragmentManager();
+ FragmentTransaction transaction = fragmentManager.beginTransaction();
+ TrackpadGestureDialogFragment fragment = new TrackpadGestureDialogFragment();
+ fragment.show(transaction, GESTURE_DIALOG_TAG);
+ */
+ }
+}
diff --git a/src/com/android/settings/inputmethod/TrackpadSettings.java b/src/com/android/settings/inputmethod/TrackpadSettings.java
new file mode 100644
index 0000000..436e3e6
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TrackpadSettings.java
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+
+public class TrackpadSettings extends DashboardFragment {
+
+ private static final String TAG = "TrackpadSettings";
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.SETTINGS_KEYBOARDS_TOUCHPAD;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.trackpad_settings;
+ }
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.trackpad_settings) {
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return FeatureFlagUtils
+ .isEnabled(context, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD);
+ }
+ };
+}
diff --git a/src/com/android/settings/inputmethod/TrackpadSettingsController.java b/src/com/android/settings/inputmethod/TrackpadSettingsController.java
new file mode 100644
index 0000000..41be395
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TrackpadSettingsController.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class TrackpadSettingsController extends BasePreferenceController {
+
+ public TrackpadSettingsController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ // TODO: Need to detect if trackpad is connected with device.
+ boolean isFeatureOn = FeatureFlagUtils
+ .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD);
+ return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
new file mode 100644
index 0000000..9884862
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettings.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+
+public class TrackpadTouchGestureSettings extends DashboardFragment {
+
+ private static final String TAG = "TrackpadTouchGestureSettings";
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.SETTINGS_KEYBOARDS_TOUCHPAD_GESTURE;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.trackpad_gesture_settings;
+ }
+
+ public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider(R.xml.trackpad_settings) {
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return FeatureFlagUtils
+ .isEnabled(
+ context,
+ FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
+ }
+ };
+}
diff --git a/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
new file mode 100644
index 0000000..8f04aee
--- /dev/null
+++ b/src/com/android/settings/inputmethod/TrackpadTouchGestureSettingsController.java
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.inputmethod;
+
+import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class TrackpadTouchGestureSettingsController extends BasePreferenceController {
+
+ public TrackpadTouchGestureSettingsController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ boolean isFeatureOn = FeatureFlagUtils
+ .isEnabled(mContext, FeatureFlagUtils.SETTINGS_NEW_KEYBOARD_TRACKPAD_GESTURE);
+ return isFeatureOn ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/spa/SettingsSpaEnvironment.kt b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
index bf15ddf..9eab400 100644
--- a/src/com/android/settings/spa/SettingsSpaEnvironment.kt
+++ b/src/com/android/settings/spa/SettingsSpaEnvironment.kt
@@ -20,6 +20,7 @@
import com.android.settings.spa.app.AllAppListPageProvider
import com.android.settings.spa.app.AppsMainPageProvider
import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
+import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPageProvider
import com.android.settings.spa.app.specialaccess.AlarmsAndRemindersAppListProvider
import com.android.settings.spa.app.specialaccess.AllFilesAccessAppListProvider
import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListProvider
@@ -66,6 +67,7 @@
LanguageAndInputPageProvider,
AppLanguagesPageProvider,
UsageStatsPageProvider,
+ BackgroundInstalledAppsPageProvider,
) + togglePermissionAppListTemplate.createPageProviders(),
rootPages = listOf(
SettingsPage.create(HomePageProvider.name),
diff --git a/src/com/android/settings/spa/app/AppsMain.kt b/src/com/android/settings/spa/app/AppsMain.kt
index 4b47278..e9eca1f 100644
--- a/src/com/android/settings/spa/app/AppsMain.kt
+++ b/src/com/android/settings/spa/app/AppsMain.kt
@@ -22,7 +22,9 @@
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import com.android.settings.R
+import com.android.settings.spa.app.backgroundinstall.BackgroundInstalledAppsPageProvider
import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider
+import com.android.settings.spa.home.HomePageProvider
import com.android.settingslib.spa.framework.common.SettingsEntry
import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
import com.android.settingslib.spa.framework.common.SettingsPage
@@ -45,6 +47,7 @@
RegularScaffold(title = getTitle(arguments)) {
AllAppListPageProvider.buildInjectEntry().build().UiLayout()
SpecialAppAccessPageProvider.EntryItem()
+ BackgroundInstalledAppsPageProvider.EntryItem()
}
}
@@ -70,6 +73,7 @@
return listOf(
AllAppListPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
SpecialAppAccessPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
+ BackgroundInstalledAppsPageProvider.buildInjectEntry().setLink(fromPage = owner).build(),
)
}
}
diff --git a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
index 3a4d3f6..1f7cc4d 100644
--- a/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
+++ b/src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt
@@ -95,7 +95,7 @@
AppSettingsPreference(app)
AppAllServicesPreference(app)
- // TODO: notification_settings
+ AppNotificationPreference(app)
AppPermissionPreference(app)
AppStoragePreference(app)
InstantAppDomainsPreference(app)
diff --git a/src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt b/src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt
new file mode 100644
index 0000000..e1792a9
--- /dev/null
+++ b/src/com/android/settings/spa/app/appinfo/AppNotificationPreference.kt
@@ -0,0 +1,67 @@
+/*
+* 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.
+*/
+
+package com.android.settings.spa.app.appinfo
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.android.settings.R
+import com.android.settings.applications.appinfo.AppInfoDashboardFragment
+import com.android.settings.notification.app.AppNotificationSettings
+import com.android.settings.spa.notification.AppNotificationRepository
+import com.android.settings.spa.notification.IAppNotificationRepository
+import com.android.settingslib.spa.framework.compose.rememberContext
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+
+@OptIn(ExperimentalLifecycleComposeApi::class)
+@Composable
+fun AppNotificationPreference(
+ app: ApplicationInfo,
+ repository: IAppNotificationRepository = rememberContext(::AppNotificationRepository),
+) {
+ val context = LocalContext.current
+ val summaryFlow = remember(app) {
+ flow {
+ emit(repository.getNotificationSummary(app))
+ }.flowOn(Dispatchers.IO)
+ }
+ Preference(object : PreferenceModel {
+ override val title = stringResource(R.string.notifications_label)
+ override val summary = summaryFlow.collectAsStateWithLifecycle(
+ initialValue = stringResource(R.string.summary_placeholder)
+ )
+ override val onClick = { navigateToAppNotificationSettings(context, app) }
+ })
+}
+
+private fun navigateToAppNotificationSettings(context: Context, app: ApplicationInfo) {
+ AppInfoDashboardFragment.startAppInfoFragment(
+ AppNotificationSettings::class.java,
+ app,
+ context,
+ AppInfoSettingsProvider.METRICS_CATEGORY,
+ )
+}
\ No newline at end of file
diff --git a/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt b/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt
new file mode 100644
index 0000000..9cf9516
--- /dev/null
+++ b/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProvider.kt
@@ -0,0 +1,264 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.spa.app.backgroundinstall
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.IBackgroundInstallControlService
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.ParceledListSlice
+import android.net.Uri
+import android.os.Bundle
+import android.os.ServiceManager
+import android.provider.DeviceConfig
+import android.util.Log
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Delete
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.produceState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.android.settings.R
+import com.android.settings.spa.app.appinfo.AppInfoSettingsProvider
+import com.android.settingslib.spa.framework.common.SettingsEntryBuilder
+import com.android.settingslib.spa.framework.common.SettingsPage
+import com.android.settingslib.spa.framework.common.SettingsPageProvider
+import com.android.settingslib.spa.framework.compose.navigator
+import com.android.settingslib.spa.framework.compose.rememberContext
+import com.android.settingslib.spa.framework.theme.SettingsDimension
+import com.android.settingslib.spa.framework.util.asyncMap
+import com.android.settingslib.spa.framework.util.formatString
+import com.android.settingslib.spa.widget.preference.Preference
+import com.android.settingslib.spa.widget.preference.PreferenceModel
+import com.android.settingslib.spa.widget.ui.SettingsBody
+import com.android.settingslib.spaprivileged.model.app.AppEntry
+import com.android.settingslib.spaprivileged.model.app.AppListModel
+import com.android.settingslib.spaprivileged.model.app.AppRecord
+import com.android.settingslib.spaprivileged.template.app.AppList
+import com.android.settingslib.spaprivileged.template.app.AppListButtonItem
+import com.android.settingslib.spaprivileged.template.app.AppListInput
+import com.android.settingslib.spaprivileged.template.app.AppListItemModel
+import com.android.settingslib.spaprivileged.template.app.AppListPage
+import com.google.common.annotations.VisibleForTesting
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.withContext
+
+private const val KEY_GROUPING_MONTH = "key_grouping_by_month"
+const val DEFAULT_GROUPING_MONTH_VALUE = 6
+const val MONTH_IN_MILLIS = 2629800000L
+const val KEY_BIC_UI_ENABLED = "key_bic_ui_enabled"
+const val BACKGROUND_INSTALL_CONTROL_FLAG = PackageManager.MATCH_ALL.toLong()
+
+object BackgroundInstalledAppsPageProvider : SettingsPageProvider {
+ override val name = "BackgroundInstalledAppsPage"
+ private var backgroundInstallService = IBackgroundInstallControlService.Stub.asInterface(
+ ServiceManager.getService(Context.BACKGROUND_INSTALL_CONTROL_SERVICE))
+ private var featureIsDisabled = featureIsDisabled()
+
+ @Composable
+ override fun Page(arguments: Bundle?) {
+ if(featureIsDisabled) return
+ BackgroundInstalledAppList()
+ }
+
+ @Composable
+ fun EntryItem() {
+ if(featureIsDisabled) return
+ Preference(object : PreferenceModel {
+ override val title = stringResource(R.string.background_install_title)
+ override val summary = generatePreferenceSummary()
+ override val onClick = navigator(name)
+ })
+ }
+
+ fun buildInjectEntry() = SettingsEntryBuilder
+ .createInject(owner = SettingsPage.create(name))
+ .setSearchDataFn { null }
+ .setUiLayoutFn { EntryItem() }
+
+ private fun featureIsDisabled() = !DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SETTINGS_UI,
+ KEY_BIC_UI_ENABLED, false)
+
+ @Composable
+ private fun generatePreferenceSummary(): State<String> {
+ val context = LocalContext.current
+ return produceState(initialValue = stringResource(R.string.summary_placeholder)) {
+ withContext(Dispatchers.IO) {
+ val backgroundInstalledApps =
+ backgroundInstallService.getBackgroundInstalledPackages(
+ BACKGROUND_INSTALL_CONTROL_FLAG, context.user.identifier
+ ).list.size
+ value = context.formatString(
+ R.string.background_install_preference_summary,
+ "count" to backgroundInstalledApps
+ )
+ }
+ }
+ }
+
+ @VisibleForTesting
+ fun setDisableFeature(disableFeature : Boolean): BackgroundInstalledAppsPageProvider {
+ featureIsDisabled = disableFeature
+ return this
+ }
+
+ @VisibleForTesting
+ fun setBackgroundInstallControlService(bic: IBackgroundInstallControlService):
+ BackgroundInstalledAppsPageProvider {
+ backgroundInstallService = bic
+ return this
+ }
+}
+
+@Composable
+fun BackgroundInstalledAppList(
+ appList: @Composable AppListInput<BackgroundInstalledAppListWithGroupingAppRecord>.() -> Unit
+ = { AppList() },
+) {
+ AppListPage(
+ title = stringResource(R.string.background_install_title),
+ listModel = rememberContext(::BackgroundInstalledAppsWithGroupingListModel),
+ noItemMessage = stringResource(R.string.background_install_feature_list_no_entry),
+ appList = appList,
+ header = {
+ Box(Modifier.padding(SettingsDimension.itemPadding)) {
+ SettingsBody(stringResource(R.string.background_install_summary))
+ }
+ }
+ )
+}
+/*
+Based on PackageManagerService design, and it looks like the suggested replacement in the deprecate
+notes suggest that we use PackageInstaller.uninstall which does not guarantee a pop up would open
+and depends on the calling application. Seems like further investigation is needed before we can
+move over to the new API.
+ */
+@Suppress
+@VisibleForTesting
+fun startUninstallActivity(context: Context,
+ packageName: String,
+ forAllUsers: Boolean = false) {
+ val packageUri = Uri.parse("package:${packageName}")
+ val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri).apply {
+ putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, forAllUsers)
+ }
+ context.startActivityAsUser(intent, context.user)
+}
+
+data class BackgroundInstalledAppListWithGroupingAppRecord(
+ override val app: ApplicationInfo,
+ val dateOfInstall: Long,
+) : AppRecord
+
+class BackgroundInstalledAppsWithGroupingListModel(private val context: Context)
+ : AppListModel<BackgroundInstalledAppListWithGroupingAppRecord> {
+
+ companion object {
+ private const val tag = "AppListModel<BackgroundInstalledAppListWithGroupingAppRecord>"
+ }
+
+ private var backgroundInstallService = IBackgroundInstallControlService.Stub.asInterface(
+ ServiceManager.getService(Context.BACKGROUND_INSTALL_CONTROL_SERVICE))
+
+ @VisibleForTesting
+ fun setBackgroundInstallControlService(bic: IBackgroundInstallControlService) {
+ backgroundInstallService = bic
+ }
+ @Composable
+ override fun AppListItemModel<BackgroundInstalledAppListWithGroupingAppRecord>.AppItem() {
+ val context = LocalContext.current
+ AppListButtonItem(
+ onClick = AppInfoSettingsProvider.navigator(app = record.app),
+ onButtonClick = { startUninstallActivity(context, record.app.packageName) },
+ buttonIcon = Icons.Outlined.Delete,
+ buttonIconDescription = stringResource(
+ R.string.background_install_uninstall_button_description))
+ }
+
+ override fun transform(userIdFlow: Flow<Int>, appListFlow: Flow<List<ApplicationInfo>>) =
+ userIdFlow.combine(appListFlow) { userId, appList ->
+ appList.asyncMap { app ->
+ BackgroundInstalledAppListWithGroupingAppRecord(
+ app = app,
+ dateOfInstall = context.packageManager.getPackageInfoAsUser(app.packageName,
+ PackageManager.PackageInfoFlags.of(0), userId).firstInstallTime
+ )
+ }
+ }
+
+ @Composable
+ override fun getSummary(option: Int, record: BackgroundInstalledAppListWithGroupingAppRecord)
+ = null
+
+ @Suppress
+ override fun filter(
+ userIdFlow: Flow<Int>,
+ option: Int,
+ recordListFlow: Flow<List<BackgroundInstalledAppListWithGroupingAppRecord>>
+ ): Flow<List<BackgroundInstalledAppListWithGroupingAppRecord>> {
+ if(backgroundInstallService == null) {
+ Log.e(tag, "Failed to retrieve Background Install Control Service")
+ return flowOf()
+ }
+ return userIdFlow.combine(recordListFlow) { userId, recordList ->
+ val appList = (backgroundInstallService.getBackgroundInstalledPackages(
+ PackageManager.MATCH_ALL.toLong(), userId) as ParceledListSlice<PackageInfo>).list
+ val appNameList = appList.map { it.packageName }
+ recordList.filter { record -> record.app.packageName in appNameList }
+ }
+ }
+
+ override fun getComparator(
+ option: Int,
+ ): Comparator<AppEntry<BackgroundInstalledAppListWithGroupingAppRecord>> =
+ compareByDescending { it.record.dateOfInstall }
+
+ override fun getGroupTitle(option: Int, record: BackgroundInstalledAppListWithGroupingAppRecord)
+ : String {
+ val groupByMonth = getGroupSeparationByMonth()
+ return when (record.dateOfInstall > System.currentTimeMillis()
+ - (groupByMonth * MONTH_IN_MILLIS)) {
+ true -> context.formatString(R.string.background_install_before, "count" to groupByMonth)
+ else -> context.formatString(R.string.background_install_after, "count" to groupByMonth)
+ }
+ }
+}
+
+private fun getGroupSeparationByMonth(): Int {
+ val month = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_SETTINGS_UI, KEY_GROUPING_MONTH)
+ return try {
+ if (month.isNullOrBlank()) {
+ DEFAULT_GROUPING_MONTH_VALUE
+ } else {
+ month.toInt()
+ }
+ } catch (e: Exception) {
+ Log.d(
+ BackgroundInstalledAppsPageProvider.name, "Error parsing list grouping value: " +
+ "${e.message} falling back to default value: $DEFAULT_GROUPING_MONTH_VALUE")
+ DEFAULT_GROUPING_MONTH_VALUE
+ }
+}
diff --git a/src/com/android/settings/spa/notification/AppNotificationRepository.kt b/src/com/android/settings/spa/notification/AppNotificationRepository.kt
index 7ec5d3e..fe8babb 100644
--- a/src/com/android/settings/spa/notification/AppNotificationRepository.kt
+++ b/src/com/android/settings/spa/notification/AppNotificationRepository.kt
@@ -31,8 +31,10 @@
import android.os.ServiceManager
import android.util.Log
import com.android.settings.R
+import com.android.settingslib.spa.framework.util.formatString
import com.android.settingslib.spaprivileged.model.app.IPackageManagers
import com.android.settingslib.spaprivileged.model.app.PackageManagers
+import com.android.settingslib.spaprivileged.model.app.userId
import java.util.concurrent.TimeUnit
import kotlin.math.max
import kotlin.math.roundToInt
@@ -50,6 +52,11 @@
var sentCount: Int = 0,
)
+interface IAppNotificationRepository {
+ /** Gets the notification summary for the given application. */
+ fun getNotificationSummary(app: ApplicationInfo): String
+}
+
class AppNotificationRepository(
private val context: Context,
private val packageManagers: IPackageManagers = PackageManagers,
@@ -59,7 +66,7 @@
private val notificationManager: INotificationManager = INotificationManager.Stub.asInterface(
ServiceManager.getService(Context.NOTIFICATION_SERVICE)
),
-) {
+) : IAppNotificationRepository {
fun getAggregatedUsageEvents(userIdFlow: Flow<Int>): Flow<Map<String, NotificationSentState>> =
userIdFlow.map { userId ->
val aggregatedStats = mutableMapOf<String, NotificationSentState>()
@@ -115,6 +122,58 @@
}
}
+ override fun getNotificationSummary(app: ApplicationInfo): String {
+ if (!isEnabled(app)) return context.getString(R.string.off)
+ val channelCount = getChannelCount(app)
+ if (channelCount == 0) {
+ return calculateFrequencySummary(getSentCount(app))
+ }
+ val blockedChannelCount = getBlockedChannelCount(app)
+ if (channelCount == blockedChannelCount) return context.getString(R.string.off)
+ val frequencySummary = calculateFrequencySummary(getSentCount(app))
+ if (blockedChannelCount == 0) return frequencySummary
+ return context.getString(
+ R.string.notifications_enabled_with_info,
+ frequencySummary,
+ context.formatString(
+ R.string.notifications_categories_off, "count" to blockedChannelCount
+ )
+ )
+ }
+
+ private fun getSentCount(app: ApplicationInfo): Int {
+ var sentCount = 0
+ queryEventsForPackageForUser(app).forEachNotificationEvent { sentCount++ }
+ return sentCount
+ }
+
+ private fun queryEventsForPackageForUser(app: ApplicationInfo): UsageEvents? {
+ val now = System.currentTimeMillis()
+ val startTime = now - TimeUnit.DAYS.toMillis(DAYS_TO_CHECK)
+ return try {
+ usageStatsManager.queryEventsForPackageForUser(
+ startTime, now, app.userId, app.packageName, context.packageName
+ )
+ } catch (e: RemoteException) {
+ Log.e(TAG, "Failed IUsageStatsManager.queryEventsForPackageForUser(): ", e)
+ null
+ }
+ }
+
+ private fun getChannelCount(app: ApplicationInfo): Int = try {
+ notificationManager.getNumNotificationChannelsForPackage(app.packageName, app.uid, false)
+ } catch (e: Exception) {
+ Log.w(TAG, "Error calling INotificationManager", e)
+ 0
+ }
+
+ private fun getBlockedChannelCount(app: ApplicationInfo): Int = try {
+ notificationManager.getBlockedChannelCount(app.packageName, app.uid)
+ } catch (e: Exception) {
+ Log.w(TAG, "Error calling INotificationManager", e)
+ 0
+ }
+
fun calculateFrequencySummary(sentCount: Int): String {
val dailyFrequency = (sentCount.toFloat() / DAYS_TO_CHECK).roundToInt()
return if (dailyFrequency > 0) {
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 44b41d0..7728b3e 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -127,7 +127,12 @@
@Override
public boolean onPreferenceClick(Preference preference) {
+ if (preference != null && preference.getKey() != null) {
+ mMetricsFeatureProvider.logSettingsTileClick(preference.getKey(), getMetricsCategory());
+ }
if (preference == mRemoveUserPref) {
+ mMetricsFeatureProvider.action(getActivity(),
+ UserMetricsUtils.getRemoveUserMetricCategory(mUserInfo));
if (canDeleteUser()) {
if (mUserInfo.isGuest()) {
showDialog(DIALOG_CONFIRM_RESET_GUEST);
@@ -137,6 +142,8 @@
return true;
}
} else if (preference == mSwitchUserPref) {
+ mMetricsFeatureProvider.action(getActivity(),
+ UserMetricsUtils.getSwitchUserMetricCategory(mUserInfo));
if (canSwitchUserNow()) {
if (shouldShowSetupPromptDialog()) {
showDialog(DIALOG_SETUP_USER);
@@ -164,9 +171,13 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mPhonePref) {
if (Boolean.TRUE.equals(newValue)) {
+ mMetricsFeatureProvider.action(getActivity(),
+ SettingsEnums.ACTION_ENABLE_USER_CALL);
showDialog(DIALOG_CONFIRM_ENABLE_CALLING_AND_SMS);
return false;
}
+ mMetricsFeatureProvider.action(getActivity(),
+ SettingsEnums.ACTION_DISABLE_USER_CALL);
enableCallsAndSms(false);
}
return true;
@@ -364,9 +375,6 @@
void switchUser() {
Trace.beginSection("UserDetailSettings.switchUser");
try {
- if (mUserInfo.isGuest()) {
- mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_SWITCH_TO_GUEST);
- }
if (mUserCaps.mIsGuest && mUserCaps.mIsEphemeral) {
int guestUserId = UserHandle.myUserId();
// Using markGuestForDeletion allows us to create a new guest before this one is
diff --git a/src/com/android/settings/users/UserMetricsUtils.java b/src/com/android/settings/users/UserMetricsUtils.java
new file mode 100644
index 0000000..bcbc01b
--- /dev/null
+++ b/src/com/android/settings/users/UserMetricsUtils.java
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.users;
+
+import android.app.settings.SettingsEnums;
+import android.content.pm.UserInfo;
+
+/**
+ * Utils class for metrics to avoid user characteristics checks in code
+ */
+public class UserMetricsUtils {
+
+ /**
+ * Returns relevant remove SettingsEnum key depending on UserInfo
+ * @param userInfo information about user
+ * @return list of RestrictionEntry objects with user-visible text.
+ */
+ public static int getRemoveUserMetricCategory(UserInfo userInfo) {
+ if (userInfo.isGuest()) {
+ return SettingsEnums.ACTION_REMOVE_GUEST_USER;
+ }
+ if (userInfo.isRestricted()) {
+ return SettingsEnums.ACTION_REMOVE_RESTRICTED_USER;
+ }
+ return SettingsEnums.ACTION_REMOVE_USER;
+ }
+
+ /**
+ * Returns relevant switch user SettingsEnum key depending on UserInfo
+ * @param userInfo information about user
+ * @return SettingsEnums.
+ */
+ public static int getSwitchUserMetricCategory(UserInfo userInfo) {
+ if (userInfo.isGuest()) {
+ return SettingsEnums.ACTION_SWITCH_TO_GUEST;
+ }
+ if (userInfo.isRestricted()) {
+ return SettingsEnums.ACTION_SWITCH_TO_RESTRICTED_USER;
+ }
+ return SettingsEnums.ACTION_SWITCH_TO_USER;
+ }
+}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index ac2b26b..da6339b 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -1568,6 +1568,7 @@
@Override
public boolean onPreferenceClick(Preference pref) {
+ mMetricsFeatureProvider.logSettingsTileClick(pref.getKey(), getMetricsCategory());
if (isCurrentUserGuest()) {
if (mGuestResetPreference != null && pref == mGuestResetPreference) {
showDialog(DIALOG_CONFIRM_RESET_AND_RESTART_GUEST);
diff --git a/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
index 31e0782..52ccb37 100644
--- a/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
@@ -24,6 +24,7 @@
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.widget.SeekBar;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
@@ -111,4 +112,15 @@
verify(mInteractionListener).onProgressChanged();
}
+
+ @Test
+ public void onProgressChanged_verifyNotifyPreferenceChanged() {
+ mSeekBarController.displayPreference(mPreferenceScreen);
+
+ mSeekBarPreference.setProgress(mSeekBarPreference.getMax());
+ mSeekBarPreference.onProgressChanged(new SeekBar(mContext), /* progress= */
+ 0, /* fromUser= */ false);
+
+ verify(mInteractionListener).notifyPreferenceChanged();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index 40e6494..a35ef45 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -29,6 +29,9 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import android.hardware.input.InputManager;
+import android.util.FeatureFlagUtils;
+import android.view.InputDevice;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
@@ -37,6 +40,7 @@
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
+import com.android.settings.connecteddevice.stylus.StylusDeviceUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -68,9 +72,13 @@
@Mock
private DockUpdater mConnectedDockUpdater;
@Mock
+ private StylusDeviceUpdater mStylusDeviceUpdater;
+ @Mock
private PreferenceScreen mPreferenceScreen;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceManager mPreferenceManager;
+ @Mock
+ private InputManager mInputManager;
private ShadowApplicationPackageManager mPackageManager;
private PreferenceGroup mPreferenceGroup;
@@ -82,7 +90,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
mPreference = new Preference(mContext);
mPreference.setKey(PREFERENCE_KEY_1);
mPackageManager = (ShadowApplicationPackageManager) Shadows.shadowOf(
@@ -91,11 +99,16 @@
when(mPreferenceGroup.getPreferenceManager()).thenReturn(mPreferenceManager);
doReturn(mContext).when(mDashboardFragment).getContext();
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
+ when(mContext.getSystemService(InputManager.class)).thenReturn(mInputManager);
+ when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{});
mConnectedDeviceGroupController = new ConnectedDeviceGroupController(mContext);
mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
- mConnectedUsbDeviceUpdater, mConnectedDockUpdater);
+ mConnectedUsbDeviceUpdater, mConnectedDockUpdater, mStylusDeviceUpdater);
mConnectedDeviceGroupController.mPreferenceGroup = mPreferenceGroup;
+
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_SHOW_STYLUS_PREFERENCES,
+ true);
}
@Test
@@ -146,6 +159,7 @@
verify(mConnectedUsbDeviceUpdater).registerCallback();
verify(mConnectedDockUpdater).registerCallback();
verify(mConnectedBluetoothDeviceUpdater).refreshPreference();
+ verify(mStylusDeviceUpdater).registerCallback();
}
@Test
@@ -155,6 +169,7 @@
verify(mConnectedBluetoothDeviceUpdater).unregisterCallback();
verify(mConnectedUsbDeviceUpdater).unregisterCallback();
verify(mConnectedDockUpdater).unregisterCallback();
+ verify(mStylusDeviceUpdater).unregisterCallback();
}
@Test
@@ -163,7 +178,7 @@
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
- mConnectedUsbDeviceUpdater, null);
+ mConnectedUsbDeviceUpdater, null, null);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
UNSUPPORTED_ON_DEVICE);
@@ -175,7 +190,7 @@
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
- mConnectedUsbDeviceUpdater, null);
+ mConnectedUsbDeviceUpdater, null, null);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
AVAILABLE_UNSEARCHABLE);
@@ -187,7 +202,7 @@
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, true);
mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
- mConnectedUsbDeviceUpdater, null);
+ mConnectedUsbDeviceUpdater, null, null);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
AVAILABLE_UNSEARCHABLE);
@@ -199,7 +214,40 @@
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
- mConnectedUsbDeviceUpdater, mConnectedDockUpdater);
+ mConnectedUsbDeviceUpdater, mConnectedDockUpdater, null);
+
+ assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
+ AVAILABLE_UNSEARCHABLE);
+ }
+
+
+ @Test
+ public void getAvailabilityStatus_noUsiStylusFeature_returnUnSupported() {
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
+ when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{0});
+ when(mInputManager.getInputDevice(0)).thenReturn(new InputDevice.Builder().setSources(
+ InputDevice.SOURCE_DPAD).setExternal(false).build());
+
+ mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedUsbDeviceUpdater, null, mStylusDeviceUpdater);
+
+ assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
+ UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_haveUsiStylusFeature_returnSupported() {
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_ACCESSORY, false);
+ mPackageManager.setSystemFeature(PackageManager.FEATURE_USB_HOST, false);
+ when(mInputManager.getInputDeviceIds()).thenReturn(new int[]{0});
+ when(mInputManager.getInputDevice(0)).thenReturn(new InputDevice.Builder().setSources(
+ InputDevice.SOURCE_STYLUS).setExternal(false).build());
+
+ mConnectedDeviceGroupController.init(mConnectedBluetoothDeviceUpdater,
+ mConnectedUsbDeviceUpdater, mConnectedDockUpdater, mStylusDeviceUpdater);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
AVAILABLE_UNSEARCHABLE);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java
new file mode 100644
index 0000000..10f3727
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDeviceUpdaterTest.java
@@ -0,0 +1,268 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.connecteddevice.stylus;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.content.Intent;
+import android.hardware.BatteryState;
+import android.hardware.input.InputManager;
+import android.os.SystemClock;
+import android.view.InputDevice;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothAdapter.class})
+public class StylusDeviceUpdaterTest {
+
+ private Context mContext;
+ private StylusDeviceUpdater mStylusDeviceUpdater;
+ private InputDevice mStylusDevice;
+ private InputDevice mOtherDevice;
+
+ @Mock
+ private SettingsActivity mSettingsActivity;
+ @Mock
+ private DashboardFragment mDashboardFragment;
+ @Mock
+ private DevicePreferenceCallback mDevicePreferenceCallback;
+ @Mock
+ private InputManager mInputManager;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+
+ doReturn(mContext).when(mDashboardFragment).getContext();
+ doReturn(mInputManager).when(mContext).getSystemService(InputManager.class);
+ doReturn(new int[]{}).when(mInputManager).getInputDeviceIds();
+
+ mStylusDeviceUpdater = spy(
+ new StylusDeviceUpdater(mContext, mDashboardFragment, mDevicePreferenceCallback));
+ mStylusDeviceUpdater.setPreferenceContext(mContext);
+
+ doReturn(new int[]{0, 1}).when(mInputManager).getInputDeviceIds();
+ mOtherDevice = new InputDevice.Builder().setId(0).setName("other").setSources(
+ InputDevice.SOURCE_DPAD).build();
+ doReturn(mOtherDevice).when(mInputManager).getInputDevice(0);
+ mStylusDevice = new InputDevice.Builder().setId(1).setName("Pen").setExternal(
+ false).setSources(
+ InputDevice.SOURCE_STYLUS).build();
+ doReturn(mStylusDevice).when(mInputManager).getInputDevice(1);
+ }
+
+ @Test
+ public void registerCallback_registersBatteryListener() {
+ mStylusDeviceUpdater.registerCallback();
+
+ verify(mInputManager, times(1)).addInputDeviceBatteryListener(eq(1), any(),
+ any());
+ }
+
+ @Test
+ public void registerCallback_registersInputDeviceListener() {
+ mStylusDeviceUpdater.registerCallback();
+
+ verify(mInputManager, times(1)).registerInputDeviceListener(eq(mStylusDeviceUpdater),
+ any());
+ }
+
+ @Test
+ public void onInputDeviceAdded_internalStylus_registersBatteryListener() {
+ mStylusDeviceUpdater.onInputDeviceAdded(1);
+
+ verify(mInputManager, times(1)).addInputDeviceBatteryListener(eq(1), any(),
+ any());
+ }
+
+ @Test
+ public void onInputDeviceAdded_nonStylus_doesNotRegisterBatteryListener() {
+ mStylusDeviceUpdater.onInputDeviceAdded(0);
+
+ verify(mInputManager, never()).addInputDeviceBatteryListener(eq(1), any(),
+ any());
+ }
+
+ @Test
+ public void click_usiPreference_launchUsiDetailsPage() {
+ doReturn(mSettingsActivity).when(mDashboardFragment).getContext();
+ doReturn(true).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+ mStylusDeviceUpdater.forceUpdate();
+ mStylusDeviceUpdater.mLastDetectedUsiId = 1;
+ final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+
+ mStylusDeviceUpdater.mUsiPreference.performClick();
+
+ assertThat(mStylusDeviceUpdater.mUsiPreference.getTitle().toString()).isEqualTo(
+ mContext.getString(R.string.stylus_connected_devices_title));
+ verify(mSettingsActivity).startActivity(intentCaptor.capture());
+ assertThat(intentCaptor.getValue().getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+ .isEqualTo(StylusUsiDetailsFragment.class.getName());
+ }
+
+ @Test
+ public void forceUpdate_addsUsiPreference_validUsiDevice() {
+ doReturn(true).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+
+ mStylusDeviceUpdater.forceUpdate();
+
+ assertThat(mStylusDeviceUpdater.mUsiPreference).isNotNull();
+ }
+
+ @Test
+ public void forceUpdate_doesNotAddPreference_invalidUsiDevice() {
+ doReturn(false).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+
+ mStylusDeviceUpdater.forceUpdate();
+
+ assertThat(mStylusDeviceUpdater.mUsiPreference).isNull();
+ }
+
+ @Test
+ public void forceUpdate_removesUsiPreference_existingPreference_invalidUsiDevice() {
+ doReturn(true).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+
+ mStylusDeviceUpdater.forceUpdate();
+
+ doReturn(false).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ mStylusDeviceUpdater.forceUpdate();
+
+ assertThat(mStylusDeviceUpdater.mUsiPreference).isNull();
+ }
+
+ @Test
+ public void forceUpdate_doesNotAddUsiPreference_bluetoothStylusConnected() {
+ doReturn(true).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ doReturn(true).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+
+ mStylusDeviceUpdater.forceUpdate();
+
+ assertThat(mStylusDeviceUpdater.mUsiPreference).isNull();
+ }
+
+ @Test
+ public void forceUpdate_addsUsiPreference_bluetoothStylusDisconnected() {
+ doReturn(true).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ doReturn(true).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+ mStylusDeviceUpdater.forceUpdate();
+
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+ mStylusDeviceUpdater.forceUpdate();
+
+ assertThat(mStylusDeviceUpdater.mUsiPreference).isNotNull();
+ }
+
+ @Test
+ public void forceUpdate_removesUsiPreference_existingPreference_bluetoothStylusConnected() {
+ doReturn(true).when(mStylusDeviceUpdater).isUsiConnectionValid();
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+ mStylusDeviceUpdater.forceUpdate();
+ doReturn(true).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+
+ mStylusDeviceUpdater.forceUpdate();
+
+ assertThat(mStylusDeviceUpdater.mUsiPreference).isNull();
+ }
+
+ @Test
+ public void onBatteryStateChanged_detectsValidUsi() {
+ BatteryState batteryState = mock(BatteryState.class);
+ doReturn(true).when(batteryState).isPresent();
+ doReturn(0.5f).when(batteryState).getCapacity();
+
+ mStylusDeviceUpdater.onBatteryStateChanged(1, SystemClock.uptimeMillis(),
+ batteryState);
+
+ assertThat(mStylusDeviceUpdater.isUsiConnectionValid()).isTrue();
+ }
+
+ @Test
+ public void onBatteryStateChanged_detectsInvalidUsi_batteryNotPresent() {
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+ BatteryState batteryState = mock(BatteryState.class);
+ doReturn(false).when(batteryState).isPresent();
+
+ mStylusDeviceUpdater.onBatteryStateChanged(1, SystemClock.uptimeMillis(),
+ batteryState);
+
+ assertThat(mStylusDeviceUpdater.isUsiConnectionValid()).isFalse();
+ }
+
+ @Test
+ public void onBatteryStateChanged_ddetectsInvalidUsi_staleBatteryEventTime() {
+ doReturn(false).when(mStylusDeviceUpdater).hasConnectedBluetoothStylusDevice();
+ BatteryState batteryState = mock(BatteryState.class);
+ doReturn(true).when(batteryState).isPresent();
+ doReturn(0.5f).when(batteryState).getCapacity();
+
+ mStylusDeviceUpdater.onBatteryStateChanged(1, 0, batteryState);
+
+ assertThat(mStylusDeviceUpdater.isUsiConnectionValid()).isFalse();
+ }
+
+ @Test
+ public void detectsConnectedBluetoothStylus() {
+ InputDevice stylusDevice = new InputDevice.Builder().setId(1).setName("Pen").setSources(
+ InputDevice.SOURCE_STYLUS)
+ .build();
+ doReturn(stylusDevice).when(mInputManager).getInputDevice(1);
+ doReturn("04:52:C7:0B:D8:3C").when(mInputManager).getInputDeviceBluetoothAddress(1);
+
+ assertThat(mStylusDeviceUpdater.hasConnectedBluetoothStylusDevice()).isTrue();
+ }
+
+ @Test
+ public void detectsDisconnectedBluetoothStylus() {
+ InputDevice stylusDevice = new InputDevice.Builder().setId(1).setName("Pen").setSources(
+ InputDevice.SOURCE_STYLUS).build();
+ doReturn(stylusDevice).when(mInputManager).getInputDevice(1);
+ doReturn(null).when(mInputManager).getInputDeviceBluetoothAddress(1);
+
+ assertThat(mStylusDeviceUpdater.hasConnectedBluetoothStylusDevice()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
index 27b1de5..3aad02e 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsiHeaderControllerTest.java
@@ -109,7 +109,7 @@
assertThat(((TextView) mLayoutPreference.findViewById(
R.id.entity_header_title)).getText().toString()).isEqualTo(
- mContext.getString(R.string.stylus_usi_header_title));
+ mContext.getString(R.string.stylus_connected_devices_title));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
index eea07fe..5cfe404 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
@@ -34,6 +34,8 @@
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.Observer;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@@ -46,6 +48,7 @@
import java.util.List;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -125,7 +128,7 @@
@Test
public void displayPreference_multiSim_shouldAddSecondPreference() {
when(mTelephonyManager.getPhoneCount()).thenReturn(2);
- SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
+ SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -133,10 +136,11 @@
verify(mCategory).addPreference(mSecondSimPreference);
}
+ @Ignore
@Test
public void updateState_singleSim_shouldSetSingleSimTitleAndSummary() {
when(mTelephonyManager.getPhoneCount()).thenReturn(1);
- SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
+ SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -146,10 +150,11 @@
verify(mFirstSimPreference).setSummary(anyString());
}
+ @Ignore
@Test
public void updateState_multiSim_shouldSetMultiSimTitleAndSummary() {
when(mTelephonyManager.getPhoneCount()).thenReturn(2);
- SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
+ SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -163,12 +168,13 @@
verify(mSecondSimPreference).setSummary(anyString());
}
+ @Ignore
@Test
public void handlePreferenceTreeClick_shouldStartDialogFragment() {
when(mFragment.getChildFragmentManager()).thenReturn(
mock(FragmentManager.class, Answers.RETURNS_DEEP_STUBS));
when(mTelephonyManager.getPhoneCount()).thenReturn(2);
- SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
+ SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
mController.init(mFragment, slotSimStatus);
mController.displayPreference(mScreen);
@@ -180,7 +186,7 @@
@Test
public void updateDynamicRawDataToIndex_notAddToSearch_emptySimSlot() {
doReturn(null).when(mSubscriptionManager).getActiveSubscriptionInfoList();
- SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
+ SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
List<SearchIndexableRaw> rawData = new ArrayList<SearchIndexableRaw>();
mController.init(mFragment, slotSimStatus);
@@ -191,10 +197,11 @@
@Test
public void updateDynamicRawDataToIndex_addToSearch_simInSimSlot() {
+ when(mTelephonyManager.getPhoneCount()).thenReturn(1);
doReturn(false).when(mSubscriptionInfo).isEmbedded();
doReturn(List.of(mSubscriptionInfo)).when(mSubscriptionManager)
.getActiveSubscriptionInfoList();
- SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
+ SlotSimStatus slotSimStatus = new TestSlotSimStatus(mContext);
List<SearchIndexableRaw> rawData = new ArrayList<SearchIndexableRaw>();
mController.init(mFragment, slotSimStatus);
@@ -203,23 +210,16 @@
assertThat(rawData.size()).isEqualTo(1);
}
- @Test
- public void updateDynamicRawDataToIndex_addEsimToSearch_esimInSimSlot() {
- doReturn(true).when(mSubscriptionInfo).isEmbedded();
- doReturn(List.of(mSubscriptionInfo)).when(mSubscriptionManager)
- .getActiveSubscriptionInfoList();
- SlotSimStatus slotSimStatus = new SlotSimStatus(mContext);
- List<SearchIndexableRaw> rawData = new ArrayList<SearchIndexableRaw>();
-
- mController.init(mFragment, slotSimStatus);
- mController.updateDynamicRawDataToIndex(rawData);
-
- assertThat(rawData.size()).isEqualTo(1);
- assertThat(rawData.get(0).keywords.contains("eid")).isTrue();
- }
-
private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {
when(mContext.getSystemServiceName(serviceClass)).thenReturn(serviceName);
when(mContext.getSystemService(serviceName)).thenReturn(service);
}
+
+ private class TestSlotSimStatus extends SlotSimStatus {
+ public TestSlotSimStatus(Context context) {
+ super(context);
+ }
+
+ public void observe(LifecycleOwner owner, Observer observer) {}
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
index 57963aa..839cae2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryChartPreferenceControllerTest.java
@@ -371,8 +371,8 @@
@Test
public void getTotalHours_getExpectedResult() {
Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = createBatteryHistoryMap(60);
- BatteryLevelData batteryLevelData = DataProcessor.getBatteryLevelData(mContext, null,
- batteryHistoryMap, null);
+ BatteryLevelData batteryLevelData =
+ DataProcessManager.getBatteryLevelData(mContext, null, batteryHistoryMap, null);
final int totalHour = BatteryChartPreferenceController.getTotalHours(batteryLevelData);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
index aee8398..fe1bff6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/ConvertUtilsTest.java
@@ -15,6 +15,9 @@
*/
package com.android.settings.fuelgauge.batteryusage;
+import static android.app.usage.UsageStatsManager.USAGE_SOURCE_CURRENT_ACTIVITY;
+import static android.app.usage.UsageStatsManager.USAGE_SOURCE_TASK_ROOT_ACTIVITY;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -22,6 +25,7 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
+import android.app.usage.IUsageStatsManager;
import android.app.usage.UsageEvents;
import android.app.usage.UsageEvents.Event;
import android.content.ContentValues;
@@ -31,6 +35,7 @@
import android.os.BatteryManager;
import android.os.BatteryUsageStats;
import android.os.LocaleList;
+import android.os.RemoteException;
import android.os.UserHandle;
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
@@ -56,6 +61,8 @@
@Mock
private BatteryUsageStats mBatteryUsageStats;
@Mock
+ private IUsageStatsManager mUsageStatsManager;
+ @Mock
private BatteryEntry mMockBatteryEntry;
@Before
@@ -278,7 +285,7 @@
final long userId = 2;
final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(
- mContext, event, userId);
+ mContext, mUsageStatsManager, event, userId);
assertThat(appUsageEvent.getTimestamp()).isEqualTo(101L);
assertThat(appUsageEvent.getType()).isEqualTo(AppUsageEventType.ACTIVITY_RESUMED);
assertThat(appUsageEvent.getPackageName()).isEqualTo("com.android.settings1");
@@ -299,7 +306,7 @@
final long userId = 1;
final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(
- mContext, event, userId);
+ mContext, mUsageStatsManager, event, userId);
assertThat(appUsageEvent.getTimestamp()).isEqualTo(101L);
assertThat(appUsageEvent.getType()).isEqualTo(AppUsageEventType.DEVICE_SHUTDOWN);
assertThat(appUsageEvent.getPackageName()).isEqualTo("com.android.settings1");
@@ -315,7 +322,7 @@
event.mPackage = null;
final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(
- mContext, event, /*userId=*/ 0);
+ mContext, mUsageStatsManager, event, /*userId=*/ 0);
assertThat(appUsageEvent).isNull();
}
@@ -331,7 +338,7 @@
final long userId = 1;
final AppUsageEvent appUsageEvent = ConvertUtils.convertToAppUsageEvent(
- mContext, event, userId);
+ mContext, mUsageStatsManager, event, userId);
assertThat(appUsageEvent).isNull();
}
@@ -415,4 +422,53 @@
mContext.getResources().getConfiguration().setLocales(new LocaleList());
assertThat(ConvertUtils.getLocale(mContext)).isEqualTo(Locale.getDefault());
}
+
+ @Test
+ public void getEffectivePackageName_currentActivity_returnPackageName() throws RemoteException {
+ when(mUsageStatsManager.getUsageSource()).thenReturn(USAGE_SOURCE_CURRENT_ACTIVITY);
+ final String packageName = "com.android.settings1";
+ final String taskRootPackageName = "com.android.settings2";
+
+ assertThat(ConvertUtils.getEffectivePackageName(
+ mUsageStatsManager, packageName, taskRootPackageName))
+ .isEqualTo(packageName);
+ }
+
+ @Test
+ public void getEffectivePackageName_usageSourceThrowException_returnPackageName()
+ throws RemoteException {
+ when(mUsageStatsManager.getUsageSource()).thenThrow(new RemoteException());
+ final String packageName = "com.android.settings1";
+ final String taskRootPackageName = "com.android.settings2";
+
+ assertThat(ConvertUtils.getEffectivePackageName(
+ mUsageStatsManager, packageName, taskRootPackageName))
+ .isEqualTo(packageName);
+ }
+
+ @Test
+ public void getEffectivePackageName_rootActivity_returnTaskRootPackageName()
+ throws RemoteException {
+ when(mUsageStatsManager.getUsageSource()).thenReturn(USAGE_SOURCE_TASK_ROOT_ACTIVITY);
+ final String packageName = "com.android.settings1";
+ final String taskRootPackageName = "com.android.settings2";
+
+ assertThat(ConvertUtils.getEffectivePackageName(
+ mUsageStatsManager, packageName, taskRootPackageName))
+ .isEqualTo(taskRootPackageName);
+ }
+
+ @Test
+ public void getEffectivePackageName_nullOrEmptyTaskRoot_returnPackageName()
+ throws RemoteException {
+ when(mUsageStatsManager.getUsageSource()).thenReturn(USAGE_SOURCE_TASK_ROOT_ACTIVITY);
+ final String packageName = "com.android.settings1";
+
+ assertThat(ConvertUtils.getEffectivePackageName(
+ mUsageStatsManager, packageName, /*taskRootPackageName=*/ null))
+ .isEqualTo(packageName);
+ assertThat(ConvertUtils.getEffectivePackageName(
+ mUsageStatsManager, packageName, /*taskRootPackageName=*/ ""))
+ .isEqualTo(packageName);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
index 1bfff07..ee37469 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessManagerTest.java
@@ -21,16 +21,21 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.app.usage.IUsageStatsManager;
import android.app.usage.UsageEvents;
+import android.content.ContentValues;
import android.content.Context;
+import android.content.Intent;
import android.database.MatrixCursor;
+import android.os.BatteryManager;
import android.os.Parcel;
import android.os.RemoteException;
import android.os.UserManager;
+import android.text.format.DateUtils;
import com.android.settings.fuelgauge.batteryusage.db.AppUsageEventEntity;
@@ -43,10 +48,14 @@
import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@RunWith(RobolectricTestRunner.class)
public final class DataProcessManagerTest {
+ private static final String FAKE_ENTRY_KEY = "fake_entry_key";
+
private Context mContext;
private DataProcessManager mDataProcessManager;
@@ -54,6 +63,8 @@
private IUsageStatsManager mUsageStatsManager;
@Mock
private UserManager mUserManager;
+ @Mock
+ private Intent mIntent;
@Before
public void setUp() {
@@ -65,6 +76,9 @@
doReturn(mUserManager)
.when(mContext)
.getSystemService(UserManager.class);
+ doReturn(mIntent).when(mContext).registerReceiver(any(), any());
+ doReturn(100).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_SCALE), anyInt());
+ doReturn(66).when(mIntent).getIntExtra(eq(BatteryManager.EXTRA_LEVEL), anyInt());
mDataProcessManager = new DataProcessManager(
mContext, /*handler=*/ null, /*callbackFunction=*/ null,
@@ -72,6 +86,14 @@
}
@Test
+ public void constructor_noLevelData() {
+ final DataProcessManager dataProcessManager =
+ new DataProcessManager(mContext, /*handler=*/ null, /*callbackFunction=*/ null);
+ assertThat(dataProcessManager.getShowScreenOnTime()).isFalse();
+ assertThat(dataProcessManager.getShowBatteryLevel()).isFalse();
+ }
+
+ @Test
public void start_loadEmptyDatabaseAppUsageData() {
final MatrixCursor cursor = new MatrixCursor(
new String[]{
@@ -204,6 +226,66 @@
assertThat(dataProcessManager.getStartTimestampOfBatteryLevelData()).isEqualTo(0);
}
+ @Test
+ public void getBatteryLevelData_emptyHistoryMap_returnNull() {
+ assertThat(DataProcessManager.getBatteryLevelData(
+ mContext,
+ /*handler=*/ null,
+ /*batteryHistoryMap=*/ null,
+ /*asyncResponseDelegate=*/ null))
+ .isNull();
+ assertThat(DataProcessManager.getBatteryLevelData(
+ mContext, /*handler=*/ null, new HashMap<>(), /*asyncResponseDelegate=*/ null))
+ .isNull();
+ }
+
+ @Test
+ public void getBatteryLevelData_notEnoughData_returnNull() {
+ // The timestamps and the current time are within half hour before an even hour.
+ final long[] timestamps = {
+ DateUtils.HOUR_IN_MILLIS * 2 - 300L,
+ DateUtils.HOUR_IN_MILLIS * 2 - 200L,
+ DateUtils.HOUR_IN_MILLIS * 2 - 100L};
+ final int[] levels = {100, 99, 98};
+ final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
+ createHistoryMap(timestamps, levels);
+ DataProcessor.sFakeCurrentTimeMillis = timestamps[timestamps.length - 1];
+
+ assertThat(DataProcessManager.getBatteryLevelData(
+ mContext, /*handler=*/ null, batteryHistoryMap, /*asyncResponseDelegate=*/ null))
+ .isNull();
+ }
+
+ @Test
+ public void getBatteryLevelData_returnExpectedResult() {
+ // Timezone GMT+8: 2022-01-01 00:00:00, 2022-01-01 01:00:00
+ final long[] timestamps = {1640966400000L, 1640970000000L};
+ final int[] levels = {100, 99};
+ final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
+ createHistoryMap(timestamps, levels);
+ DataProcessor.sFakeCurrentTimeMillis = timestamps[timestamps.length - 1];
+
+ final BatteryLevelData resultData =
+ DataProcessManager.getBatteryLevelData(
+ mContext,
+ /*handler=*/ null,
+ batteryHistoryMap,
+ /*asyncResponseDelegate=*/ null);
+
+ final List<Long> expectedDailyTimestamps = List.of(
+ 1640966400000L, // 2022-01-01 00:00:00
+ 1640973600000L); // 2022-01-01 02:00:00
+ final List<Integer> expectedDailyLevels = List.of(100, 66);
+ final List<List<Long>> expectedHourlyTimestamps = List.of(expectedDailyTimestamps);
+ final List<List<Integer>> expectedHourlyLevels = List.of(expectedDailyLevels);
+ verifyExpectedBatteryLevelData(
+ resultData,
+ expectedDailyTimestamps,
+ expectedDailyLevels,
+ expectedHourlyTimestamps,
+ expectedHourlyLevels);
+ }
+
private UsageEvents getUsageEvents(final List<UsageEvents.Event> events) {
UsageEvents usageEvents = new UsageEvents(events, new String[] {"package"});
Parcel parcel = Parcel.obtain();
@@ -222,9 +304,77 @@
return event;
}
+ private static Map<Long, Map<String, BatteryHistEntry>> createHistoryMap(
+ final long[] timestamps, final int[] levels) {
+ final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap = new HashMap<>();
+ for (int index = 0; index < timestamps.length; index++) {
+ final Map<String, BatteryHistEntry> entryMap = new HashMap<>();
+ final ContentValues values = getContentValuesWithBatteryLevel(levels[index]);
+ final BatteryHistEntry entry = new BatteryHistEntry(values);
+ entryMap.put(FAKE_ENTRY_KEY, entry);
+ batteryHistoryMap.put(timestamps[index], entryMap);
+ }
+ return batteryHistoryMap;
+ }
+
+ private static ContentValues getContentValuesWithBatteryLevel(final int level) {
+ final ContentValues values = new ContentValues();
+ final DeviceBatteryState deviceBatteryState =
+ DeviceBatteryState
+ .newBuilder()
+ .setBatteryLevel(level)
+ .build();
+ final BatteryInformation batteryInformation =
+ BatteryInformation
+ .newBuilder()
+ .setDeviceBatteryState(deviceBatteryState)
+ .build();
+ values.put(BatteryHistEntry.KEY_BATTERY_INFORMATION,
+ ConvertUtils.convertBatteryInformationToString(batteryInformation));
+ return values;
+ }
+
private void assertAppUsageEvent(
final AppUsageEvent event, final AppUsageEventType eventType, final long timestamp) {
assertThat(event.getType()).isEqualTo(eventType);
assertThat(event.getTimestamp()).isEqualTo(timestamp);
}
+
+ private static void verifyExpectedBatteryLevelData(
+ final BatteryLevelData resultData,
+ final List<Long> expectedDailyTimestamps,
+ final List<Integer> expectedDailyLevels,
+ final List<List<Long>> expectedHourlyTimestamps,
+ final List<List<Integer>> expectedHourlyLevels) {
+ final BatteryLevelData.PeriodBatteryLevelData dailyResultData =
+ resultData.getDailyBatteryLevels();
+ final List<BatteryLevelData.PeriodBatteryLevelData> hourlyResultData =
+ resultData.getHourlyBatteryLevelsPerDay();
+ verifyExpectedDailyBatteryLevelData(
+ dailyResultData, expectedDailyTimestamps, expectedDailyLevels);
+ verifyExpectedHourlyBatteryLevelData(
+ hourlyResultData, expectedHourlyTimestamps, expectedHourlyLevels);
+ }
+
+ private static void verifyExpectedDailyBatteryLevelData(
+ final BatteryLevelData.PeriodBatteryLevelData dailyResultData,
+ final List<Long> expectedDailyTimestamps,
+ final List<Integer> expectedDailyLevels) {
+ assertThat(dailyResultData.getTimestamps()).isEqualTo(expectedDailyTimestamps);
+ assertThat(dailyResultData.getLevels()).isEqualTo(expectedDailyLevels);
+ }
+
+ private static void verifyExpectedHourlyBatteryLevelData(
+ final List<BatteryLevelData.PeriodBatteryLevelData> hourlyResultData,
+ final List<List<Long>> expectedHourlyTimestamps,
+ final List<List<Integer>> expectedHourlyLevels) {
+ final int expectedHourlySize = expectedHourlyTimestamps.size();
+ assertThat(hourlyResultData).hasSize(expectedHourlySize);
+ for (int dailyIndex = 0; dailyIndex < expectedHourlySize; dailyIndex++) {
+ assertThat(hourlyResultData.get(dailyIndex).getTimestamps())
+ .isEqualTo(expectedHourlyTimestamps.get(dailyIndex));
+ assertThat(hourlyResultData.get(dailyIndex).getLevels())
+ .isEqualTo(expectedHourlyLevels.get(dailyIndex));
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
index 0f95754..aab3cb3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/DataProcessorTest.java
@@ -99,66 +99,6 @@
}
@Test
- public void getBatteryLevelData_emptyHistoryMap_returnNull() {
- assertThat(DataProcessor.getBatteryLevelData(
- mContext,
- /*handler=*/ null,
- /*batteryHistoryMap=*/ null,
- /*asyncResponseDelegate=*/ null))
- .isNull();
- assertThat(DataProcessor.getBatteryLevelData(
- mContext, /*handler=*/ null, new HashMap<>(), /*asyncResponseDelegate=*/ null))
- .isNull();
- }
-
- @Test
- public void getBatteryLevelData_notEnoughData_returnNull() {
- // The timestamps and the current time are within half hour before an even hour.
- final long[] timestamps = {
- DateUtils.HOUR_IN_MILLIS * 2 - 300L,
- DateUtils.HOUR_IN_MILLIS * 2 - 200L,
- DateUtils.HOUR_IN_MILLIS * 2 - 100L};
- final int[] levels = {100, 99, 98};
- final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
- createHistoryMap(timestamps, levels);
- DataProcessor.sFakeCurrentTimeMillis = timestamps[timestamps.length - 1];
-
- assertThat(DataProcessor.getBatteryLevelData(
- mContext, /*handler=*/ null, batteryHistoryMap, /*asyncResponseDelegate=*/ null))
- .isNull();
- }
-
- @Test
- public void getBatteryLevelData_returnExpectedResult() {
- // Timezone GMT+8: 2022-01-01 00:00:00, 2022-01-01 01:00:00
- final long[] timestamps = {1640966400000L, 1640970000000L};
- final int[] levels = {100, 99};
- final Map<Long, Map<String, BatteryHistEntry>> batteryHistoryMap =
- createHistoryMap(timestamps, levels);
- DataProcessor.sFakeCurrentTimeMillis = timestamps[timestamps.length - 1];
-
- final BatteryLevelData resultData =
- DataProcessor.getBatteryLevelData(
- mContext,
- /*handler=*/ null,
- batteryHistoryMap,
- /*asyncResponseDelegate=*/ null);
-
- final List<Long> expectedDailyTimestamps = List.of(
- 1640966400000L, // 2022-01-01 00:00:00
- 1640973600000L); // 2022-01-01 02:00:00
- final List<Integer> expectedDailyLevels = List.of(100, 66);
- final List<List<Long>> expectedHourlyTimestamps = List.of(expectedDailyTimestamps);
- final List<List<Integer>> expectedHourlyLevels = List.of(expectedDailyLevels);
- verifyExpectedBatteryLevelData(
- resultData,
- expectedDailyTimestamps,
- expectedDailyLevels,
- expectedHourlyTimestamps,
- expectedHourlyLevels);
- }
-
- @Test
public void getAppUsageEvents_returnExpectedResult() throws RemoteException {
UserInfo userInfo = new UserInfo(/*id=*/ 0, "user_0", /*flags=*/ 0);
final List<UserInfo> userInfoList = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
index ff57ebc..14ca76f 100644
--- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
@@ -91,6 +91,7 @@
private static final String KEY_APP_COPYING = "app_copying";
private static final int DIALOG_CONFIRM_REMOVE = 1;
+ private static final int DIALOG_CONFIRM_RESET_GUEST = 4;
@Mock
private TelephonyManager mTelephonyManager;
@@ -469,8 +470,24 @@
mFragment.onPreferenceClick(mSwitchUserPref);
verify(mFragment).switchUser();
- verify(mMetricsFeatureProvider, never()).action(any(),
- eq(SettingsEnums.ACTION_SWITCH_TO_GUEST));
+ verify(mMetricsFeatureProvider).action(any(),
+ eq(SettingsEnums.ACTION_SWITCH_TO_USER));
+ }
+
+ @Test
+ public void onPreferenceClick_switchToRestrictedClicked_canSwitch_shouldSwitch() {
+ setupSelectedRestrictedUser();
+ mUserManager.setSwitchabilityStatus(SWITCHABILITY_STATUS_OK);
+ mFragment.mSwitchUserPref = mSwitchUserPref;
+ mFragment.mRemoveUserPref = mRemoveUserPref;
+ mFragment.mAppAndContentAccessPref = mAppAndContentAccessPref;
+ mFragment.mUserInfo = mUserInfo;
+
+ mFragment.onPreferenceClick(mSwitchUserPref);
+
+ verify(mFragment).switchUser();
+ verify(mMetricsFeatureProvider).action(any(),
+ eq(SettingsEnums.ACTION_SWITCH_TO_RESTRICTED_USER));
}
@Test
@@ -503,6 +520,41 @@
}
@Test
+ public void onPreferenceClick_removeGuestClicked_canDelete_shouldShowDialog() {
+ setupSelectedGuest();
+ mFragment.mUserInfo = mUserInfo;
+ mUserManager.setIsAdminUser(true);
+ mFragment.mSwitchUserPref = mSwitchUserPref;
+ mFragment.mRemoveUserPref = mRemoveUserPref;
+ mFragment.mAppAndContentAccessPref = mAppAndContentAccessPref;
+ doNothing().when(mFragment).showDialog(anyInt());
+
+ mFragment.onPreferenceClick(mRemoveUserPref);
+
+ verify(mMetricsFeatureProvider).action(any(), eq(SettingsEnums.ACTION_REMOVE_GUEST_USER));
+ verify(mFragment).canDeleteUser();
+ verify(mFragment).showDialog(DIALOG_CONFIRM_RESET_GUEST);
+ }
+
+ @Test
+ public void onPreferenceClick_removeRestrictedClicked_canDelete_shouldShowDialog() {
+ setupSelectedRestrictedUser();
+ mFragment.mUserInfo = mUserInfo;
+ mUserManager.setIsAdminUser(true);
+ mFragment.mSwitchUserPref = mSwitchUserPref;
+ mFragment.mRemoveUserPref = mRemoveUserPref;
+ mFragment.mAppAndContentAccessPref = mAppAndContentAccessPref;
+ doNothing().when(mFragment).showDialog(anyInt());
+
+ mFragment.onPreferenceClick(mRemoveUserPref);
+
+ verify(mMetricsFeatureProvider)
+ .action(any(), eq(SettingsEnums.ACTION_REMOVE_RESTRICTED_USER));
+ verify(mFragment).canDeleteUser();
+ verify(mFragment).showDialog(DIALOG_CONFIRM_REMOVE);
+ }
+
+ @Test
public void onPreferenceClick_removeClicked_canDelete_shouldShowDialog() {
setupSelectedUser();
mFragment.mUserInfo = mUserInfo;
@@ -514,6 +566,7 @@
mFragment.onPreferenceClick(mRemoveUserPref);
+ verify(mMetricsFeatureProvider).action(any(), eq(SettingsEnums.ACTION_REMOVE_USER));
verify(mFragment).canDeleteUser();
verify(mFragment).showDialog(DIALOG_CONFIRM_REMOVE);
}
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppNotificationPreferenceTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppNotificationPreferenceTest.kt
new file mode 100644
index 0000000..c54d35f
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppNotificationPreferenceTest.kt
@@ -0,0 +1,122 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.spa.app.appinfo
+
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.test.performClick
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.dx.mockito.inline.extended.ExtendedMockito
+import com.android.settings.R
+import com.android.settings.applications.appinfo.AppInfoDashboardFragment
+import com.android.settings.notification.app.AppNotificationSettings
+import com.android.settings.spa.notification.IAppNotificationRepository
+import com.android.settingslib.spa.testutils.delay
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.MockitoSession
+import org.mockito.Spy
+import org.mockito.quality.Strictness
+
+@RunWith(AndroidJUnit4::class)
+class AppNotificationPreferenceTest {
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ private lateinit var mockSession: MockitoSession
+
+ @Spy
+ private val context: Context = ApplicationProvider.getApplicationContext()
+
+ private val repository = object : IAppNotificationRepository {
+ override fun getNotificationSummary(app: ApplicationInfo) = SUMMARY
+ }
+
+ @Before
+ fun setUp() {
+ mockSession = ExtendedMockito.mockitoSession()
+ .initMocks(this)
+ .mockStatic(AppInfoDashboardFragment::class.java)
+ .strictness(Strictness.LENIENT)
+ .startMocking()
+ }
+
+ @After
+ fun tearDown() {
+ mockSession.finishMocking()
+ }
+
+ @Test
+ fun title_displayed() {
+ setContent()
+
+ composeTestRule.onNodeWithText(context.getString(R.string.notifications_label))
+ .assertIsDisplayed()
+ }
+
+ @Test
+ fun summary_displayed() {
+ setContent()
+
+ composeTestRule.onNodeWithText(SUMMARY).assertIsDisplayed()
+ }
+
+ @Test
+ fun onClick_startActivity() {
+ setContent()
+
+ composeTestRule.onRoot().performClick()
+ composeTestRule.delay()
+
+ ExtendedMockito.verify {
+ AppInfoDashboardFragment.startAppInfoFragment(
+ AppNotificationSettings::class.java,
+ APP,
+ context,
+ AppInfoSettingsProvider.METRICS_CATEGORY,
+ )
+ }
+ }
+
+ private fun setContent() {
+ composeTestRule.setContent {
+ CompositionLocalProvider(LocalContext provides context) {
+ AppNotificationPreference(app = APP, repository = repository)
+ }
+ }
+ }
+
+ private companion object {
+ const val PACKAGE_NAME = "package.name"
+ const val UID = 123
+ val APP = ApplicationInfo().apply {
+ packageName = PACKAGE_NAME
+ uid = UID
+ }
+ const val SUMMARY = "Summary"
+ }
+}
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt b/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
new file mode 100644
index 0000000..8e1757f
--- /dev/null
+++ b/tests/spa_unit/src/com/android/settings/spa/app/backgroundinstall/BackgroundInstalledAppsPageProviderTest.kt
@@ -0,0 +1,319 @@
+/*
+ * 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.
+ */
+
+package com.android.settings.spa.app.backgroundinstall
+
+import android.content.Context
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.IBackgroundInstallControlService
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
+import android.content.pm.ParceledListSlice
+import android.net.Uri
+import android.os.UserHandle
+import androidx.compose.ui.test.assertIsDisplayed
+import androidx.compose.ui.test.junit4.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
+import com.android.settingslib.spa.framework.compose.stateOf
+import com.android.settingslib.spa.testutils.FakeNavControllerWrapper
+import com.android.settingslib.spa.testutils.any
+import com.android.settingslib.spaprivileged.template.app.AppListItemModel
+import com.google.common.truth.Truth
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentCaptor
+import org.mockito.ArgumentMatchers.eq
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.mockito.junit.MockitoJUnit
+import org.mockito.junit.MockitoRule
+
+@RunWith(AndroidJUnit4::class)
+class BackgroundInstalledAppsPageProviderTest {
+ @get:Rule
+ val composeTestRule = createComposeRule()
+
+ @get:Rule
+ val mockito: MockitoRule = MockitoJUnit.rule()
+
+ private val context: Context = ApplicationProvider.getApplicationContext()
+
+ @Mock
+ private lateinit var mockContext: Context
+
+ @Mock
+ private lateinit var mockPackageManager: PackageManager
+
+ @Mock
+ private lateinit var mockBackgroundInstallControlService: IBackgroundInstallControlService
+
+ private var packageInfoFlagsCaptor =
+ ArgumentCaptor.forClass(PackageManager.PackageInfoFlags::class.java)
+
+ private var intentCaptor =
+ ArgumentCaptor.forClass(Intent::class.java)
+
+ private val fakeNavControllerWrapper = FakeNavControllerWrapper()
+
+ @Before
+ fun setup() {
+ Mockito.`when`(mockContext.packageManager).thenReturn(mockPackageManager)
+ }
+ @Test
+ fun allAppListPageProvider_name() {
+ Truth.assertThat(BackgroundInstalledAppsPageProvider.name)
+ .isEqualTo(EXPECTED_PROVIDER_NAME)
+ }
+
+ @Test
+ fun injectEntry_title() {
+ Mockito.`when`(mockBackgroundInstallControlService
+ .getBackgroundInstalledPackages(any(Long::class.java), any(Int::class.java)))
+ .thenReturn(ParceledListSlice(listOf()))
+ setInjectEntry(false)
+
+ composeTestRule.onNodeWithText(
+ context.getString(R.string.background_install_title)).assertIsDisplayed()
+ }
+
+ @Test
+ fun injectEntry_title_disabled() {
+ setInjectEntry(true)
+
+ composeTestRule.onNodeWithText(
+ context.getString(R.string.background_install_title)).assertDoesNotExist()
+ }
+
+ @Test
+ fun injectEntry_summary() {
+ Mockito.`when`(mockBackgroundInstallControlService
+ .getBackgroundInstalledPackages(any(Long::class.java), any(Int::class.java)))
+ .thenReturn(ParceledListSlice(listOf()))
+ setInjectEntry(false)
+
+ composeTestRule.onNodeWithText("0 apps").assertIsDisplayed()
+ }
+
+ @Test
+ fun injectEntry_summary_disabled() {
+ setInjectEntry(true)
+
+ composeTestRule.onNodeWithText("0 apps").assertDoesNotExist()
+ }
+
+ @Test
+ fun injectEntry_onClick_navigate() {
+ Mockito.`when`(mockBackgroundInstallControlService
+ .getBackgroundInstalledPackages(any(Long::class.java), any(Int::class.java)))
+ .thenReturn(ParceledListSlice(listOf()))
+ setInjectEntry(false)
+
+ composeTestRule.onNodeWithText(
+ context.getString(R.string.background_install_title)).performClick()
+
+ Truth.assertThat(fakeNavControllerWrapper.navigateCalledWith)
+ .isEqualTo(EXPECTED_PROVIDER_NAME)
+ }
+
+ private fun setInjectEntry(disableFeature: Boolean = false) {
+ composeTestRule.setContent {
+ fakeNavControllerWrapper.Wrapper {
+ BackgroundInstalledAppsPageProvider
+ .setBackgroundInstallControlService(mockBackgroundInstallControlService)
+ .setDisableFeature(disableFeature)
+ .buildInjectEntry().build().UiLayout()
+ }
+ }
+ }
+
+ @Test
+ fun title_displayed() {
+ composeTestRule.setContent {
+ BackgroundInstalledAppList()
+ }
+
+ composeTestRule.onNodeWithText(
+ context.getString(R.string.background_install_title)).assertIsDisplayed()
+ }
+
+ @Test
+ fun item_labelDisplayed() {
+ setItemContent()
+
+ composeTestRule.onNodeWithText(TEST_LABEL).assertIsDisplayed()
+ }
+
+ @Test
+ fun item_onClick_navigate() {
+ setItemContent()
+
+ composeTestRule.onNodeWithText(TEST_LABEL).performClick()
+
+ Truth.assertThat(fakeNavControllerWrapper.navigateCalledWith)
+ .isEqualTo("AppInfoSettings/package.name/0")
+ }
+
+ @Suppress
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun startUninstallActivity_success() = runTest {
+ val expectedPackageUri = Uri.parse("package:package.name")
+ val mockUserHandle = UserHandle(0)
+ Mockito.`when`(mockContext.user).thenReturn(mockUserHandle)
+ Mockito.`when`(mockContext.startActivityAsUser(
+ intentCaptor.capture(),
+ eq(mockUserHandle)
+ )).then { }
+
+ startUninstallActivity(mockContext, TEST_PACKAGE_NAME)
+
+ Truth.assertThat(intentCaptor.value.action).isEqualTo(Intent.ACTION_UNINSTALL_PACKAGE)
+ Truth.assertThat(intentCaptor.value.data).isEqualTo(expectedPackageUri)
+ Truth.assertThat(intentCaptor.value.extras?.getBoolean(Intent.EXTRA_UNINSTALL_ALL_USERS))
+ .isEqualTo(false)
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun backgroundInstalledAppsWithGroupingListModel_getGroupTitleOne() = runTest {
+ val listModel = BackgroundInstalledAppsWithGroupingListModel(context)
+
+ val actualGroupTitle = listModel
+ .getGroupTitle(0,
+ BackgroundInstalledAppListWithGroupingAppRecord(
+ APP,
+ System.currentTimeMillis()
+ ))
+
+ Truth.assertThat(actualGroupTitle).isEqualTo("Apps installed in the last 6 months")
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun backgroundInstalledAppsWithGroupingListModel_getGroupTitleTwo() = runTest {
+ val listModel = BackgroundInstalledAppsWithGroupingListModel(context)
+
+ val actualGroupTitle = listModel
+ .getGroupTitle(0,
+ BackgroundInstalledAppListWithGroupingAppRecord(
+ APP,
+ 0L
+ ))
+
+ Truth.assertThat(actualGroupTitle).isEqualTo("Apps installed more than 6 months ago")
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun backgroundInstalledAppsWithGroupingListModel_transform() = runTest {
+ val listModel = BackgroundInstalledAppsWithGroupingListModel(mockContext)
+ Mockito.`when`(mockPackageManager.getPackageInfoAsUser(
+ eq(TEST_PACKAGE_NAME),
+ packageInfoFlagsCaptor.capture(),
+ eq(TEST_USER_ID))
+ )
+ .thenReturn(PACKAGE_INFO)
+ val recordListFlow = listModel.transform(flowOf(TEST_USER_ID), flowOf(listOf(APP)))
+
+ val recordList = recordListFlow.first()
+
+ Truth.assertThat(recordList).hasSize(1)
+ Truth.assertThat(recordList[0].app).isSameInstanceAs(APP)
+ Truth.assertThat(packageInfoFlagsCaptor.value.value).isEqualTo(EXPECTED_PACKAGE_INFO_FLAG)
+ }
+
+ @OptIn(ExperimentalCoroutinesApi::class)
+ @Test
+ fun backgroundInstalledAppsWithGroupingListModel_filter() = runTest {
+ val listModel = BackgroundInstalledAppsWithGroupingListModel(mockContext)
+ listModel.setBackgroundInstallControlService(mockBackgroundInstallControlService)
+ Mockito.`when`(mockBackgroundInstallControlService.getBackgroundInstalledPackages(
+ PackageManager.MATCH_ALL.toLong(),
+ TEST_USER_ID
+ )).thenReturn(ParceledListSlice(listOf(PACKAGE_INFO)))
+
+ val recordListFlow = listModel.filter(
+ flowOf(TEST_USER_ID),
+ 0,
+ flowOf(listOf(APP_RECORD_WITH_PACKAGE_MATCH, APP_RECORD_WITHOUT_PACKAGE_MATCH))
+ )
+
+
+ val recordList = recordListFlow.first()
+ Truth.assertThat(recordList).hasSize(1)
+ Truth.assertThat(recordList[0]).isSameInstanceAs(APP_RECORD_WITH_PACKAGE_MATCH)
+ }
+
+ private fun setItemContent() {
+ composeTestRule.setContent {
+ BackgroundInstalledAppList {
+ fakeNavControllerWrapper.Wrapper {
+ with(BackgroundInstalledAppsWithGroupingListModel(context)) {
+ AppListItemModel(
+ record = BackgroundInstalledAppListWithGroupingAppRecord(
+ app = APP,
+ dateOfInstall = TEST_FIRST_INSTALL_TIME),
+ label = TEST_LABEL,
+ summary = stateOf(TEST_SUMMARY),
+ ).AppItem()
+ }
+ }
+ }
+ }
+ }
+
+ private companion object {
+ private const val TEST_USER_ID = 0
+ private const val TEST_PACKAGE_NAME = "package.name"
+ private const val TEST_NO_MATCH_PACKAGE_NAME = "no.match"
+ private const val TEST_LABEL = "Label"
+ private const val TEST_SUMMARY = "Summary"
+ private const val TEST_FIRST_INSTALL_TIME = 0L
+ private const val EXPECTED_PROVIDER_NAME = "BackgroundInstalledAppsPage"
+ private const val EXPECTED_PACKAGE_INFO_FLAG = 0L
+
+ val APP = ApplicationInfo().apply {
+ packageName = TEST_PACKAGE_NAME
+ }
+ val APP_NO_RECORD = ApplicationInfo().apply {
+ packageName = TEST_NO_MATCH_PACKAGE_NAME
+ }
+ val APP_RECORD_WITH_PACKAGE_MATCH = BackgroundInstalledAppListWithGroupingAppRecord(
+ APP,
+ TEST_FIRST_INSTALL_TIME
+ )
+ val APP_RECORD_WITHOUT_PACKAGE_MATCH = BackgroundInstalledAppListWithGroupingAppRecord(
+ APP_NO_RECORD,
+ TEST_FIRST_INSTALL_TIME
+ )
+ val PACKAGE_INFO = PackageInfo().apply {
+ packageName = TEST_PACKAGE_NAME
+ applicationInfo = APP
+ firstInstallTime = TEST_FIRST_INSTALL_TIME
+ }
+ }
+}
\ No newline at end of file
diff --git a/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt b/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt
index 7a5bc9f..a1d8d3f 100644
--- a/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt
+++ b/tests/spa_unit/src/com/android/settings/spa/notification/AppNotificationRepositoryTest.kt
@@ -29,8 +29,10 @@
import android.os.Build
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.R
import com.android.settingslib.spa.testutils.any
import com.android.settingslib.spaprivileged.model.app.IPackageManagers
+import com.android.settingslib.spaprivileged.model.app.userId
import com.google.common.truth.Truth.assertThat
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.first
@@ -89,6 +91,39 @@
return channel
}
+ private fun mockIsEnabled(app: ApplicationInfo, enabled: Boolean) {
+ whenever(notificationManager.areNotificationsEnabledForPackage(app.packageName, app.uid))
+ .thenReturn(enabled)
+ }
+
+ private fun mockChannelCount(app: ApplicationInfo, count: Int) {
+ whenever(
+ notificationManager.getNumNotificationChannelsForPackage(
+ app.packageName,
+ app.uid,
+ false,
+ )
+ ).thenReturn(count)
+ }
+
+ private fun mockBlockedChannelCount(app: ApplicationInfo, count: Int) {
+ whenever(notificationManager.getBlockedChannelCount(app.packageName, app.uid))
+ .thenReturn(count)
+ }
+
+ private fun mockSentCount(app: ApplicationInfo, sentCount: Int) {
+ val events = (1..sentCount).map {
+ UsageEvents.Event().apply {
+ mEventType = UsageEvents.Event.NOTIFICATION_INTERRUPTION
+ }
+ }
+ whenever(
+ usageStatsManager.queryEventsForPackageForUser(
+ any(), any(), eq(app.userId), eq(app.packageName), any()
+ )
+ ).thenReturn(UsageEvents(events, arrayOf()))
+ }
+
@Test
fun getAggregatedUsageEvents() = runTest {
val events = listOf(
@@ -120,8 +155,7 @@
@Test
fun isEnabled() {
- whenever(notificationManager.areNotificationsEnabledForPackage(APP.packageName, APP.uid))
- .thenReturn(true)
+ mockIsEnabled(app = APP, enabled = true)
val isEnabled = repository.isEnabled(APP)
@@ -212,6 +246,61 @@
}
@Test
+ fun getNotificationSummary_notEnabled() {
+ mockIsEnabled(app = APP, enabled = false)
+
+ val summary = repository.getNotificationSummary(APP)
+
+ assertThat(summary).isEqualTo(context.getString(R.string.off))
+ }
+
+ @Test
+ fun getNotificationSummary_noChannel() {
+ mockIsEnabled(app = APP, enabled = true)
+ mockChannelCount(app = APP, count = 0)
+ mockSentCount(app = APP, sentCount = 1)
+
+ val summary = repository.getNotificationSummary(APP)
+
+ assertThat(summary).isEqualTo("About 1 notification per week")
+ }
+
+ @Test
+ fun getNotificationSummary_allChannelsBlocked() {
+ mockIsEnabled(app = APP, enabled = true)
+ mockChannelCount(app = APP, count = 2)
+ mockBlockedChannelCount(app = APP, count = 2)
+
+ val summary = repository.getNotificationSummary(APP)
+
+ assertThat(summary).isEqualTo(context.getString(R.string.off))
+ }
+
+ @Test
+ fun getNotificationSummary_noChannelBlocked() {
+ mockIsEnabled(app = APP, enabled = true)
+ mockChannelCount(app = APP, count = 2)
+ mockSentCount(app = APP, sentCount = 2)
+ mockBlockedChannelCount(app = APP, count = 0)
+
+ val summary = repository.getNotificationSummary(APP)
+
+ assertThat(summary).isEqualTo("About 2 notifications per week")
+ }
+
+ @Test
+ fun getNotificationSummary_someChannelsBlocked() {
+ mockIsEnabled(app = APP, enabled = true)
+ mockChannelCount(app = APP, count = 2)
+ mockSentCount(app = APP, sentCount = 3)
+ mockBlockedChannelCount(app = APP, count = 1)
+
+ val summary = repository.getNotificationSummary(APP)
+
+ assertThat(summary).isEqualTo("About 3 notifications per week / 1 category turned off")
+ }
+
+ @Test
fun calculateFrequencySummary_daily() {
val summary = repository.calculateFrequencySummary(4)
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SlotSimStatusTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SlotSimStatusTest.java
index 4c17d15..3136af7 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SlotSimStatusTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SlotSimStatusTest.java
@@ -23,8 +23,13 @@
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
import android.telephony.TelephonyManager;
+import androidx.lifecycle.Lifecycle;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -36,15 +41,27 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import java.util.List;
import java.util.concurrent.Executor;
@RunWith(AndroidJUnit4.class)
public class SlotSimStatusTest {
+ private static final int SUB_ID_1 = 3;
+ private static final int SUB_ID_2 = 8;
+
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
@Mock
private TelephonyManager mTelephonyManager;
@Mock
+ private SubscriptionInfo mSubscriptionInfo1;
+ @Mock
+ private SubscriptionInfo mSubscriptionInfo2;
+ @Mock
private Executor mExecutor;
+ @Mock
+ private Lifecycle mLifecycle;
@Captor
private ArgumentCaptor<Runnable> mRunnableCaptor;
@@ -56,13 +73,20 @@
mContext = spy(ApplicationProvider.getApplicationContext());
mockService(Context.TELEPHONY_SERVICE, TelephonyManager.class, mTelephonyManager);
+ mockService(Context.TELEPHONY_SUBSCRIPTION_SERVICE, SubscriptionManager.class,
+ mSubscriptionManager);
}
@Test
public void size_returnNumberOfPhone_whenQuery() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
- SlotSimStatus target = new SlotSimStatus(mContext);
+ SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
+ @Override
+ protected void postValue(Long value) {}
+ @Override
+ protected void setValue(Long value) {}
+ };
assertEquals(new Integer(target.size()), new Integer(2));
}
@@ -71,7 +95,12 @@
public void size_returnNumberOfPhone_whenQueryInBackgroundThread() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
- SlotSimStatus target = new SlotSimStatus(mContext, mExecutor);
+ SlotSimStatus target = new SlotSimStatus(mContext, mExecutor, mLifecycle) {
+ @Override
+ protected void postValue(Long value) {}
+ @Override
+ protected void setValue(Long value) {}
+ };
verify(mExecutor).execute(mRunnableCaptor.capture());
mRunnableCaptor.getValue().run();
@@ -83,7 +112,12 @@
public void getPreferenceOrdering_returnOrdering_whenQuery() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
- SlotSimStatus target = new SlotSimStatus(mContext);
+ SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
+ @Override
+ protected void postValue(Long value) {}
+ @Override
+ protected void setValue(Long value) {}
+ };
target.setBasePreferenceOrdering(30);
assertEquals(new Integer(target.getPreferenceOrdering(1)), new Integer(32));
@@ -93,10 +127,36 @@
public void getPreferenceKey_returnKey_whenQuery() {
doReturn(2).when(mTelephonyManager).getPhoneCount();
- SlotSimStatus target = new SlotSimStatus(mContext);
+ SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
+ @Override
+ protected void postValue(Long value) {}
+ @Override
+ protected void setValue(Long value) {}
+ };
target.setBasePreferenceOrdering(50);
- assertEquals(target.getPreferenceKey(1), "sim_status52");
+ assertEquals(target.getPreferenceKey(1), "sim_status2");
+ }
+
+ @Test
+ public void getSubscriptionInfo_returnSubscriptionInfo_whenActive() {
+ doReturn(SUB_ID_1).when(mSubscriptionInfo1).getSubscriptionId();
+ doReturn(0).when(mSubscriptionInfo1).getSimSlotIndex();
+ doReturn(SUB_ID_2).when(mSubscriptionInfo2).getSubscriptionId();
+ doReturn(1).when(mSubscriptionInfo2).getSimSlotIndex();
+
+ doReturn(List.of(mSubscriptionInfo1, mSubscriptionInfo2))
+ .when(mSubscriptionManager).getActiveSubscriptionInfoList();
+ doReturn(2).when(mTelephonyManager).getPhoneCount();
+
+ SlotSimStatus target = new SlotSimStatus(mContext, null, null) {
+ @Override
+ protected void postValue(Long value) {}
+ @Override
+ protected void setValue(Long value) {}
+ };
+
+ assertEquals(target.getSubscriptionInfo(1), mSubscriptionInfo2);
}
private <T> void mockService(String serviceName, Class<T> serviceClass, T service) {
diff --git a/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
index 484138e..180ea90 100644
--- a/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/display/ScreenSaverPreferenceControllerTest.java
@@ -45,11 +45,13 @@
private ScreenSaverPreferenceController mController;
+ private final String mPrefKey = "test_screensaver";
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mController = new ScreenSaverPreferenceController(mContext);
+ mController = new ScreenSaverPreferenceController(mContext, mPrefKey);
when(mContext.getResources()).thenReturn(mResources);
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);