Commit Graph

119916 Commits

Author SHA1 Message Date
TreeHugger Robot
7c7e235730 Merge "Update battery usage app list filter logic:" 2023-02-13 09:05:01 +00:00
Bonian Chen
b6aae6cc3e Merge "[Settings] Avoid from accessing deprecated API getLine1Number()" 2023-02-13 07:36:12 +00:00
Zaiyue Xue
7fad47a8d7 Update battery usage app list filter logic:
(1) Add app screen on time thrshold 100 ms.
(2) Change app battery comsuption threshold from 0.1 mA to 1 mA.
Apps meet one of above conditions will be shown.

Bug: 264840285
Test: manual
Change-Id: Icfb304f09c49248397350ebe55bf06f3eb82d639
2023-02-13 15:30:03 +08:00
Angela Wang
96968c3dc5 Merge "Fix fail test case in FlashNotificationsUtilTest" 2023-02-13 05:13:39 +00:00
Bonian Chen
8f4e1ace9d [Settings] Avoid from accessing deprecated API getLine1Number()
Migrate to new APIs.

Bug: 269052593
Test: build pass

Change-Id: I76705ec303fa9a593dd3a63d5cac3bdf65258315
2023-02-13 04:42:57 +00:00
Lili Zou
1da516bc2c Merge "Support search for work profile settings page." 2023-02-13 03:32:27 +00:00
jasonwshsu
642380410d Fix fail test case in FlashNotificationsUtilTest
* Update correct code for ScreenFlashNotificationColor.AZURE

Bug: 237628564
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FlashNotificationsUtilTest
Change-Id: I10a3106ab140192841a703b50763a1d2e6b1c0d0
2023-02-13 01:52:37 +08:00
TreeHugger Robot
5a2088e232 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3773ae0d9f -s ours am: 507631c4f5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005

Change-Id: I90f8bc98cdc6f3c5daea7f04ad1d9ea9e37b400a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 22:06:53 +00:00
Bill Yi
a7a96f7f0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bd553ab9c -s ours am: 9dcc1f9bed -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005

Change-Id: I3ba8bf5cf983acc79ed2a8a3f4459457066d3e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 22:06:36 +00:00
TreeHugger Robot
507631c4f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3773ae0d9f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005

Change-Id: I7a6226bafb7b3ad24c25183df2c4eda9d942bfd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 20:32:55 +00:00
Bill Yi
9dcc1f9bed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bd553ab9c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21362005

Change-Id: I818bd4e3dfaf8baa07e1d63b9df7bdc0ffc1aacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-11 20:32:25 +00:00
TreeHugger Robot
3773ae0d9f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-11 19:15:37 +00:00
Zoey Chen
1278cb5f87 [Settings] Fix the error of checking the null point
Change-Id: Ied5d9d5268d9d6d83b2995ae0e56bf5f0276ad22
Test: manual
2023-02-11 17:22:21 +00:00
Bill Yi
9a8ebc69b8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-11 17:16:53 +00:00
Bill Yi
a76f83806d Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-11 17:16:53 +00:00
Bill Yi
c3421c19c9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-11 17:16:53 +00:00
Bill Yi
41e8bc9206 Merge changes from topic "tc_change_23021010_19"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 403cdbfb4a
  Import translations. DO NOT MERGE ANYWHERE
2023-02-11 17:15:13 +00:00
Bonian Chen
1430ebce77 Merge "[Settings] Close UI when accessed from guest user" 2023-02-11 15:26:08 +00:00
TreeHugger Robot
34b7835a50 Merge "Hide "no thanks" button when enrollment completed." 2023-02-11 02:34:19 +00:00
Tyler Freeman
35def91fcc Merge "feat(#MagnificationJoystick): add preference for enabling Joystick to Settings" 2023-02-11 01:04:00 +00:00
Bonian Chen
131ca6ca75 Merge "[Settings] Close UI when accessed from guest user" 2023-02-11 00:55:08 +00:00
Tyler Freeman
43d5042ff9 feat(#MagnificationJoystick): add preference for enabling Joystick to Settings
Hide behind feature flag so no one sees the preference unless its enabled.

Bug: b/265688847

Test: atest MagnificationJoystickPreferenceControllerTest

Change-Id: Id5cc9385f25395f53809a79ba70c84205f9758c2
2023-02-10 19:19:11 +00:00
Bill Yi
57713a8832 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 403cdbfb4a
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21361999

Change-Id: I392fbdf378e0f1afe2482d83df19f4c89106aebd
2023-02-10 19:02:20 +00:00
Bonian Chen
76cd5d3c27 [Settings] Close UI when accessed from guest user
Avoid from guest user access.

Bug: 262242953
Test: local

Change-Id: Ifdc6d7ea7f65a945b2111a391eb53de6c1a3f52b
2023-02-10 18:09:09 +00:00
Bonian Chen
9d3bb818bf [Settings] Close UI when accessed from guest user
Avoid from guest user access.

Bug: 262242953
Test: local

Change-Id: Ib49693d083f42194575f958a1a238d6dfbba55d2
2023-02-10 17:51:00 +00:00
Bonian Chen
eb8ec1b1e4 Merge "[Settings] Avoid from user without sufficient permission to change WiFi calling" 2023-02-10 16:22:46 +00:00
Bonian Chen
a1d3fe061e [Settings] Avoid from user without sufficient permission to change WiFi
calling

Enhance security control through close UI when accessing by user with
restriction.

Bug: 262390632
Bug: 262243015
Test: local

Change-Id: I4fadaf2bdc55b97419f9e6abbd3cfa63af034f6a
2023-02-10 12:58:36 +00:00
Jason Hsu
0e352f9d1e Merge "Fix BluetoothPairingDetailTest fail" 2023-02-10 11:58:27 +00:00
Candice Lo
69ebaddddd [automerger skipped] Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev am: b0087167e0 am: 4eea038c26 -s ours
am skip reason: Merged-In If630bd9c9c27823c210410b53342b921a11bbfb9 with SHA-1 44ebe53cb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312036

Change-Id: I24d85763727c5ffe9fedbf71496e156a3e846387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 10:01:40 +00:00
Ankita Vyas
2c8e147d7d Merge "Fix gap issue between animation and app list in recycler view while scrolling." 2023-02-10 09:51:37 +00:00
jasonwshsu
68ffe47f08 Fix BluetoothPairingDetailTest fail
Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDetailTest
Change-Id: I183fea9903cad921f7fe69445579b80dea045559
2023-02-10 09:47:22 +00:00
Candice Lo
4eea038c26 Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev am: b0087167e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312036

Change-Id: Ie07b89f7f2095c42cd30e20d4a9a3031b679b26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 09:19:51 +00:00
Jiaming Liu
02c3e876f4 [automerger skipped] Fix build for jetpack update am: 5a6444776a -s ours
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 e65283de6a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21271186

Change-Id: I7203de3bd88ce83567d0ec089fee9a2792c2dc01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 09:13:04 +00:00
Diego Vela
2ccb884784 [automerger skipped] Update ActivityEmbedding usage. am: 65bb5a09f4 -s ours
am skip reason: Merged-In I8e4aa8daf51cb9c669d06b152cc5a2fc69a06571 with SHA-1 a9394d1796 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21271184

Change-Id: I29eba2a2f5edb7653858fe140d3e8ddda81262b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10 09:12:56 +00:00
Candice Lo
b0087167e0 Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev 2023-02-10 09:12:05 +00:00
Bonian Chen
b73369e874 Merge "[Settings] User with restriction should avoid from having entries through Settings search" 2023-02-10 08:52:55 +00:00
Ankita Vyas
e7b52fd368 Fix gap issue between animation and app list in recycler view while
scrolling.

Bug: 266539240
Test: manual
Change-Id: Ia9f40dec6f4c42f1a813d6c334aaebedab40656b
2023-02-10 08:29:34 +00:00
TreeHugger Robot
b32549c184 Merge "Fix checkcolor_hook error" 2023-02-10 08:27:48 +00:00
Lili Zou
2a445bb89e Support search for work profile settings page.
Test: manual, robotest
Bug: 254192800
Change-Id: Id8ec76557fc170fcf727da1971cd90f494c7ecd4
2023-02-10 15:51:34 +08:00
Sunny Shao
b324804074 Fix checkcolor_hook error
Bug: 265688684
Test: repo upload OK
Change-Id: Ie2be84a51985782f7fb1e6aae7bc1be668ff8f2d
2023-02-10 15:17:22 +08:00
Candice Lo
3fb6e69f88 Move font size related resources to SettingsLib (1/2)
Since creating the seekbar for changing font size in SystemUI requires
the size of the value entry array and the values in the array.
Therefore, we move the related resource to SettingsLib to share the usage.

Bug: 242326166
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FontSizeDataTest
Test: Maually test the availability of changing font size through
Settings page

Change-Id: Ia2621e3b4c71f900e6591644d0e3f93bedbe4ee8
Merged-In: If630bd9c9c27823c210410b53342b921a11bbfb9
2023-02-10 06:36:50 +00:00
Candice Lo
9aabfafb4c Merge "Move entryvalues_font_size to SettingsLib (1/2)" 2023-02-10 06:33:40 +00:00
Bill Yi
2050fddfa7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I791947de566749a689f7a3e067065384ad741efc
2023-02-09 20:08:07 -08:00
Bill Yi
9bd553ab9c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2569a05c74264d46ba1f85544a8aa7d0b1541d9a
2023-02-09 20:04:29 -08:00
Bill Yi
f102cc96e0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9d4305c2e5e6a2d47faf42c6f6e35361d48b836a
2023-02-09 20:00:53 -08:00
Tom Hsu
d3ff83eb4f Merge "[Regional Preferences] Remove u extension for subtitle of Language" 2023-02-10 03:57:51 +00:00
Bill Yi
ad7140d0ae Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id15b9334653ab57a1f57c840a8bc8078a50064e7
2023-02-09 19:56:57 -08:00
Bill Yi
403cdbfb4a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I30285f53b09d005ea66ac29d8c34fd049513ef31
2023-02-09 19:54:54 -08:00
Hao Dong
54003698b1 Do not show udfps enrollment page in multi window mode.
In multi window mode, finish FingerprintEnrollEnrolling activity
and show a toast.

Test: atest FingerprintEnrollEnrollingTest
Bug: 184118847
Change-Id: I8cfa61b334c029185e1bbf46fdbf158bb493a1e0
2023-02-10 01:30:30 +00:00
Daniel Norman
56f1eb0fbf Merge "Adapt to moved ACCESSIBILITY_MENU_IN_SYSTEM location." 2023-02-09 23:05:18 +00:00