Commit Graph

101937 Commits

Author SHA1 Message Date
TreeHugger Robot
420a446be9 Merge "Update data_usage_bytes_editor spinner background" into tm-dev am: d1c349c572
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312731

Change-Id: I03e7c7ba4ea33e133bddfb08eb762d75a732a3ab
2022-03-24 10:38:34 +00:00
TreeHugger Robot
2ddb627c77 Merge "Enhance Settings deep link transition" into tm-dev am: 73d2d07d1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17290004

Change-Id: Ie78032f2edb7a3e0081b79cb95886f0c375d0a02
2022-03-24 10:37:14 +00:00
TreeHugger Robot
d1c349c572 Merge "Update data_usage_bytes_editor spinner background" into tm-dev 2022-03-24 10:28:17 +00:00
Philip Junker
860d07f4e8 Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877 am: ff5f6bb47f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673

Change-Id: If76fd2ddc0fe1f1314064c3db47e4834a3befaf9
2022-03-24 10:21:56 +00:00
TreeHugger Robot
73d2d07d1e Merge "Enhance Settings deep link transition" into tm-dev 2022-03-24 10:16:46 +00:00
Philip Junker
ff5f6bb47f Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673

Change-Id: I7ef3eda5c9cc14fe03eb025750982d9696f5bec0
2022-03-24 10:07:20 +00:00
Philip Junker
c4648f276b Merge "Add special app access for turning on the screen." into tm-dev am: bf4878c877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182673

Change-Id: Ia91f563137a21fe5628ca98564d2cc8669d52807
2022-03-24 10:07:12 +00:00
Philip Junker
bf4878c877 Merge "Add special app access for turning on the screen." into tm-dev 2022-03-24 10:02:49 +00:00
Betty Chang
0ce7b1df97 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev am: 0ef919db7e am: 687a9405e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348585

Change-Id: If5a1d37ae658a17bdc61c5b24e93e948ce8bad5a
2022-03-24 09:23:05 +00:00
Yuri Ufimtsev
4c45e0d19b Merge "Postpone getting Metrics Category until it is needed" into tm-dev am: bdf31dd9dd am: e770b6a717
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Change-Id: Ic08c8d69ab5fe7960ea71cc680d1a01c5d6a33a7
2022-03-24 08:56:04 +00:00
TreeHugger Robot
e2b0da6d40 [automerger skipped] Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7 am: 309fc1b00c -s ours
am skip reason: Merged-In Ib51a0d73c13700c981d1ca789d2ab669e57d814d with SHA-1 8edf692915 is already in history

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

Change-Id: I45fad9b1527b4b5afe3ba3108e47caf77402bae0
2022-03-24 08:55:50 +00:00
Yuri Ufimtsev
87ad62e7b3 Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc" into tm-mainline-prod am: 08e26559c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Change-Id: I96b1ed099b79cc92d65c00f81d5dfe52698e32b4
2022-03-24 08:55:26 +00:00
Betty Chang
687a9405e9 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev am: 0ef919db7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348585

Change-Id: I0a4bdff9583b7a265e1a595947ad4fb2615b31c8
2022-03-24 08:48:37 +00:00
Betty Chang
5ff1a5e1d8 Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev am: 0ef919db7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17348585

Change-Id: I7413e9ecb53dc9326392097593d6363ebe5b16b4
2022-03-24 08:48:35 +00:00
Yuri Ufimtsev
e770b6a717 Merge "Postpone getting Metrics Category until it is needed" into tm-dev am: bdf31dd9dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Change-Id: I1977142ab8d580b75f70b980c96d1d86fd77b258
2022-03-24 08:48:09 +00:00
Yuri Ufimtsev
cb838c8c8a Merge "Postpone getting Metrics Category until it is needed" into tm-dev am: bdf31dd9dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352025

Change-Id: I58169e565030a05b13a932e5aabcf930b71800be
2022-03-24 08:47:59 +00:00
TreeHugger Robot
309fc1b00c Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17359096

Change-Id: I6dedc6788f514ff518bff8b666ef9b6742dc04b8
2022-03-24 08:47:54 +00:00
TreeHugger Robot
32904462f6 [automerger skipped] Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev am: 5b9c125bb7 -s ours
am skip reason: Merged-In Ib51a0d73c13700c981d1ca789d2ab669e57d814d with SHA-1 70128d9016 is already in history

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

Change-Id: Iddce69d48e133c8f104c9d94e8f33ee4b3b3f43c
2022-03-24 08:47:49 +00:00
Yi Jiang
ece863162c [automerger skipped] Moves battery saver warning message below Screen Attention setting. am: 8edf692915 -s ours
am skip reason: Merged-In Ib51a0d73c13700c981d1ca789d2ab669e57d814d with SHA-1 70128d9016 is already in history

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

Change-Id: Iee7d56ad36129bcdcdf0f54af1751e462f80db00
2022-03-24 08:47:47 +00:00
Betty Chang
0ef919db7e Merge "Move the QrCodeGenerator from Settings to SettingsLib for Wifi and BT" into tm-dev 2022-03-24 08:21:16 +00:00
Yuri Ufimtsev
08e26559c4 Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc" into tm-mainline-prod
* changes:
  [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089
  Postpone getting Metrics Category until it is needed
2022-03-24 07:56:27 +00:00
Yuri Ufimtsev
bdf31dd9dd Merge "Postpone getting Metrics Category until it is needed" into tm-dev 2022-03-24 07:56:27 +00:00
Yuri Ufimtsev
d80171d2b4 Merge changes from topic "presubmit-am-828990c34a2f4d19a5e198e98437febc"
* changes:
  [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089 2p: 8e7599c129
  [automerge] Postpone getting Metrics Category until it is needed 2p: af22553089
  Postpone getting Metrics Category until it is needed
2022-03-24 07:56:27 +00:00
TreeHugger Robot
5b9c125bb7 Merge "Moves battery saver warning message below Screen Attention setting." into tm-dev 2022-03-24 07:40:32 +00:00
Jenhou (Alan) Huang
b5c3a872d1 Merge "Sync clean up for Spatial audio classes from tm-dev to master" 2022-03-24 07:11:14 +00:00
Jason Chang
4ccdc1a659 Merge "Add checking if device should not support One-handed mode shortcut widget" into tm-dev am: ea5b55ca53 am: abb753d299
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238504

Change-Id: I7b60b620d63d5f363b0a4f7984cb35a2e3809cbf
2022-03-24 06:57:14 +00:00
Jason Chang
abb753d299 Merge "Add checking if device should not support One-handed mode shortcut widget" into tm-dev am: ea5b55ca53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238504

Change-Id: If5ab31f60c663fe8373d4d434b7ce24c4e94b3f3
2022-03-24 06:36:07 +00:00
Jason Chang
ee99fc7d52 Merge "Add checking if device should not support One-handed mode shortcut widget" into tm-dev am: ea5b55ca53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17238504

Change-Id: I12e65cd735450fb72101fcad4df436089e21e5c9
2022-03-24 06:36:00 +00:00
Jason Hsu
e6d0766d01 Merge changes from topic "triple-tap" into tm-dev am: a46d6dcebc am: 6bfb9f50de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220624

Change-Id: I91320426f66a384e4ddfb6d9477c2ddd18bd591c
2022-03-24 06:29:31 +00:00
Jason Chang
ea5b55ca53 Merge "Add checking if device should not support One-handed mode shortcut widget" into tm-dev 2022-03-24 06:17:31 +00:00
Jason Hsu
6bfb9f50de Merge changes from topic "triple-tap" into tm-dev am: a46d6dcebc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220624

Change-Id: I1f926c8375f1da0366ce26ae8fbe45061a54ec0c
2022-03-24 06:08:37 +00:00
Jason Hsu
8f6c3fa915 Merge changes from topic "triple-tap" into tm-dev am: a46d6dcebc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17220624

Change-Id: I2f2c3b949d15cfa6d2fb40dba6243760f0fa2c9f
2022-03-24 06:08:33 +00:00
Jason Hsu
a46d6dcebc Merge changes from topic "triple-tap" into tm-dev
* changes:
  Add link functionality in message of magnification triple-tap dialog
  Apply new flow to hint user about triple-tap will delay when user select triple-tap shortcut on window-mode.
2022-03-24 05:49:16 +00:00
Xinyi Zhou
22229e5b9c Merge "Update API according to API council feedback" into tm-dev am: 9badccfc9d am: ecada6d32d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: If425f6ac05667e1dc255e65cc1f08733f8899c64
2022-03-24 05:22:19 +00:00
Xinyi Zhou
ecada6d32d Merge "Update API according to API council feedback" into tm-dev am: 9badccfc9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I6ecf3590d89223f062163a51a0f94f55902aaafd
2022-03-24 04:59:43 +00:00
Xinyi Zhou
79e82f244a Merge "Update API according to API council feedback" into tm-dev am: 9badccfc9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I5af96de8ad3a930d8243f423bbb7e7564786d063
2022-03-24 04:59:08 +00:00
Xinyi Zhou
fa5926b065 Merge changes from topic "nearby_api_5" into tm-mainline-prod am: e44aae5b29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17355055

Change-Id: I9ca3a6d0dc1a0d576206d7a9c5144994686e10a1
2022-03-24 04:44:00 +00:00
TreeHugger Robot
e10272b35b Merge "Update multiple users strings" into tm-dev am: e741185e17 am: a6430837e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: I2b87902e936ec5b0b3f10a83af6b0f09bf0881dc
2022-03-24 04:43:26 +00:00
Jason Chiu
177573c892 Enhance Settings deep link transition
Since the deep link mechanism uses a trampoline activity to redirect the
target activity, and the targeting activity is launched in a separate
task, there will be two transitions played, where one is the splash
screen with the trampoline acitvity and another one is the task
transition. This makes the UX weird.

To avoid this, this CL tries to make the targeting activity launch in
the same task as the trampoline acitivity by removing the taskAffinity,
so there won't be a task transition.

Fix: 215275940
Test: Create a settings shortcut on the home screen and launch it.
Change-Id: I7621ab9f1132acbf619495801a3b985c5c3b1b5d
2022-03-24 12:42:01 +08:00
TreeHugger Robot
1ce836c599 Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: d6ca2dadf4 am: 1b07340b6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: I177f5872ff74fb4e7fd1d088ba00e18b52e8e71a
2022-03-24 04:38:48 +00:00
Xinyi Zhou
9badccfc9d Merge "Update API according to API council feedback" into tm-dev 2022-03-24 04:36:17 +00:00
Xinyi Zhou
e44aae5b29 Merge changes from topic "nearby_api_5" into tm-mainline-prod
* changes:
  [automerge] Update API according to API council feedback 2p: ad5e65a338
  Update API according to API council feedback
2022-03-24 04:36:17 +00:00
Xinyi Zhou
da8184aa12 Merge changes from topic "nearby_api_5"
* changes:
  [automerge] Update API according to API council feedback 2p: ad5e65a338 2p: d883631dc5
  [automerge] Update API according to API council feedback 2p: ad5e65a338
  Update API according to API council feedback
2022-03-24 04:36:17 +00:00
TreeHugger Robot
a6430837e8 Merge "Update multiple users strings" into tm-dev am: e741185e17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: Id7b8980f463d9e59eaaa09da41a4c223ef8ebbc6
2022-03-24 04:23:00 +00:00
TreeHugger Robot
1b07340b6c Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: d6ca2dadf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Ia965d488a7663b586cbf8368e9d45c7f5995d2ca
2022-03-24 04:13:02 +00:00
TreeHugger Robot
cd07cc8dd6 Merge "Update multiple users strings" into tm-dev am: e741185e17
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: Iee9d083d7e6d449692f4537e3cbd74db2e7ee8b6
2022-03-24 04:12:32 +00:00
TreeHugger Robot
09770eb915 Merge changes from topic "presubmit-am-79923e45dbeb447a849c3ed6d03e96f1" into tm-mainline-prod am: f4f09c446e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352043

Change-Id: I27478be8b332678c8e5fddde80338f39110beffe
2022-03-24 04:08:29 +00:00
TreeHugger Robot
bdc72eb689 Merge changes from topic "presubmit-am-a4b5fed487654d059d858e79df0cd2fb" into tm-mainline-prod am: f6fb17fcb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Iea4285a0353c4f8cc4361d0bd3e75cfd66810bf9
2022-03-24 04:07:54 +00:00
TreeHugger Robot
2417ba1d6c Merge "Ignore PublicVolumeSettingsTest#test_invalidSetupDoesNotCrashSettings" into tm-dev am: d6ca2dadf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17353323

Change-Id: Ia1377e866b9c3d9a1ad6108715f5b08010155a8d
2022-03-24 04:05:47 +00:00
TreeHugger Robot
e741185e17 Merge "Update multiple users strings" into tm-dev 2022-03-24 04:05:07 +00:00