Commit Graph

84767 Commits

Author SHA1 Message Date
TreeHugger Robot
f26cd7a11e Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: I2db1620d7a436d9370063217166ff9564b47323f
2021-06-21 19:58:20 +00:00
Joe Bolinger
32b8330f35 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: I6915f90eea8c58c3fbdbb380b5c93ec73db90d8c
2021-06-21 19:57:09 +00:00
Joe Bolinger
94add587c4 Add handoff activity to parental consent flow. am: fb515ed608
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: Ia81d929181c4820ef55b4663f9807597e05ae040
2021-06-21 19:57:07 +00:00
TreeHugger Robot
fa6829a065 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

Change-Id: Ie481fef6a8015206ffd822a6177e1b453cf41fb9
2021-06-21 19:57:02 +00:00
Joe Bolinger
d932268510 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: If97be85445da06264840e618efc23dd1c194e1d5
2021-06-21 19:55:03 +00:00
Joe Bolinger
f7ee87c992 Add handoff activity to parental consent flow. am: fb515ed608
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: Ia92797aaa897b0a31caf5d21b67ee05dd28ce6d4
2021-06-21 19:55:00 +00:00
TreeHugger Robot
65220e5cdb Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev 2021-06-21 18:46:23 +00:00
Joe Bolinger
daeda0525b Merge changes from topic "unicorn-hand" into sc-dev
* changes:
  Add new enum for parental consent UI.
  Add handoff activity to parental consent flow.
2021-06-21 17:06:29 +00:00
Jason Hsu
0ee314b055 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 6581df598f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: Id3b9d0be0c71ebe3dda3fb0e12eeaf2e2e022607
2021-06-21 16:27:50 +00:00
TreeHugger Robot
1f7161ec35 Merge "Clean up unused code" into sc-dev am: 3928e0b4f1 am: d56cb9842f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

Change-Id: I9e8d800efa5633f86617116e08fdcdf01e38b30b
2021-06-21 16:27:44 +00:00
YUKAI HUNG
fcbdc57177 Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a am: b0930acede
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683

Change-Id: Ib908d9fa283b40f208f097b5ffd1b8eb69cfe133
2021-06-21 16:27:39 +00:00
TreeHugger Robot
8e1b7f8ddb Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316 am: 04d77c008d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685

Change-Id: Ib5c8b99c1d796d6e189714dc6086a390e7f60def
2021-06-21 16:27:34 +00:00
TreeHugger Robot
9cab75d4a7 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12 am: 6f2ed120b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: I9db4033ca4eba0ca8fb4eb99d167540461c74acf
2021-06-21 16:27:29 +00:00
TreeHugger Robot
9d84b54ac0 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 3909722588
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I5d4f78e1f8e1881184ee3d8da87835d8a80c2ef9
2021-06-21 16:24:23 +00:00
TreeHugger Robot
0f7c1467a9 Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1 am: 9346fb4474
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: If27d839528ca109cbdcef7d00f60be222c877226
2021-06-21 16:18:58 +00:00
TreeHugger Robot
11c55d019d Merge "Remove the duplicated skip lock screen setting" into sc-dev am: b5b519dd85 am: 32a55b93f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14928755

Change-Id: If329d76496c2a921754fe9cf0499960001b2a4ce
2021-06-21 16:18:51 +00:00
Xin Li
41ea853ca2 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: a8cf9a798d -s ours am: 4d789befc6 -s ours am: 845c880234 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I792fb187e40341054129156cdf52b7762be60a30
2021-06-21 16:14:37 +00:00
Edgar Wang
9bac8ec684 Adjust bubbles avatar icon size to align left icon
Bug: 185596897
Test: robotest & visual
Change-Id: I5d283db7e6b7f0d8cda9689c1ead2fdd318cc8ab
2021-06-21 23:59:45 +08:00
Jason Hsu
1ff9797a13 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 5ae801442d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: Icbea561601335307469ee8d655457ec0b4516063
2021-06-21 14:02:45 +00:00
Jason Hsu
5ae801442d Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: I72b11f39dd09ddc92b21fbfea62dcadc6ee7dbaf
2021-06-21 13:48:09 +00:00
Jason Hsu
6581df598f Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: I7e4aa9e0d03741b32ce6fb05547057683c6c80fb
2021-06-21 13:46:04 +00:00
Jason Hsu
34961821f4 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev 2021-06-21 13:32:49 +00:00
TreeHugger Robot
34e7bde17f Merge "Clean up unused code" into sc-dev am: 3928e0b4f1 am: 251d3a27f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

Change-Id: I24a07e793fa1bca59b023002587b602ee37b0789
2021-06-21 12:30:08 +00:00
YUKAI HUNG
c077641fc0 Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a am: 2c8ffaa10e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683

Change-Id: Id5bad44827d97323fcd9867ddd45e20b2b56f247
2021-06-21 12:30:04 +00:00
TreeHugger Robot
5a3d92624f Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316 am: 189a5dfb7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685

Change-Id: I357bb8eefbfdd375b34425c3cd0c60d217bf3409
2021-06-21 12:29:59 +00:00
TreeHugger Robot
a658e81ea3 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12 am: 73f3a0d290
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: I18f41523d1d1d514afd710eec00505960facc4bb
2021-06-21 12:29:54 +00:00
TreeHugger Robot
ab0bb410a3 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 7514aebc80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: Ie8906f73efc1c7591f7e53e26d94001b14080d52
2021-06-21 12:29:47 +00:00
TreeHugger Robot
251d3a27f3 Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

Change-Id: I3c1d23136d733282b2cbc7215f94d88449fbc852
2021-06-21 12:21:40 +00:00
YUKAI HUNG
2c8ffaa10e Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683

Change-Id: I752da2c44a477cfc86fe3c8e80ffdffebb63e32e
2021-06-21 12:21:17 +00:00
TreeHugger Robot
189a5dfb7b Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685

Change-Id: Idabfa542612b20df39f51d06cd5838729c1e31ce
2021-06-21 12:20:44 +00:00
TreeHugger Robot
184ca3591f Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1 am: 54bb0bd2fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: I721768e83c6e45c5f6386cd6308fea6e6d8dd38a
2021-06-21 12:18:24 +00:00
TreeHugger Robot
73f3a0d290 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: Iec1e16c2bf5f4568c589da8d4c9dc0282abba813
2021-06-21 12:15:32 +00:00
TreeHugger Robot
7514aebc80 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I71b6663e9580e72f382b465d53904698e18c2f5d
2021-06-21 12:15:02 +00:00
TreeHugger Robot
54bb0bd2fb Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: I672d10f3e7549026a9a9cff35237e4c53001ad58
2021-06-21 12:14:42 +00:00
TreeHugger Robot
d56cb9842f Merge "Clean up unused code" into sc-dev am: 3928e0b4f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

Change-Id: I3a939bc7856efee8be0b8f23b54ad9cdf8c9327b
2021-06-21 11:42:38 +00:00
TreeHugger Robot
3928e0b4f1 Merge "Clean up unused code" into sc-dev 2021-06-21 11:25:35 +00:00
YUKAI HUNG
b0930acede Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev am: a0d61f253a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029683

Change-Id: I324150eb95c24897285a2978d5bc87ff30ab710f
2021-06-21 11:01:02 +00:00
YUKAI HUNG
a0d61f253a Merge "Remove legacy MIN_POWER_THRESHOLD_MILLI_AMP_HOURS threshold value" into sc-dev 2021-06-21 10:47:31 +00:00
TreeHugger Robot
04d77c008d Merge "Fix A11y broken on Draw your pattern again page" into sc-dev am: 503219b316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029685

Change-Id: I477e969f6b39034d7c3384094bf36b21ebbfc950
2021-06-21 10:42:02 +00:00
TreeHugger Robot
6f2ed120b3 Merge "Update the image for Fingerprint Finish page" into sc-dev am: f4a1b19c12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15027578

Change-Id: Ie1b044e7a112b9c9e000751f359ac327c05f56ce
2021-06-21 10:41:55 +00:00
TreeHugger Robot
503219b316 Merge "Fix A11y broken on Draw your pattern again page" into sc-dev 2021-06-21 10:33:34 +00:00
TreeHugger Robot
f4a1b19c12 Merge "Update the image for Fingerprint Finish page" into sc-dev 2021-06-21 10:29:34 +00:00
Tsung-Mao Fang
53f94d3289 Clean up unused code
Test: Rebuilt apk
Fix: 190142194
Change-Id: I16d18c538b612c6049f561bb524ee1e056255714
2021-06-21 18:17:27 +08:00
TreeHugger Robot
3909722588 Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: I51bebf3bb069e00aa7628d395d3d6c264e7ff544
2021-06-21 10:13:46 +00:00
TreeHugger Robot
dbaad0436d Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev 2021-06-21 10:00:14 +00:00
TreeHugger Robot
9346fb4474 Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

Change-Id: Ia0887bbe17c6abd8d069b3a6185efb15827eea07
2021-06-21 09:35:30 +00:00
Yi-Ling Chuang
c55b2cef2a Revert "Suppress Shared Axis transition on the SIM dialog"
This reverts commit 5e8a3947d2.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I0d4756797914ac5bcb37dde31e80dc4cd45fcd6b
2021-06-21 09:32:01 +00:00
Mill Chen
6f93ac0eec Update the image for Fingerprint Finish page
Fix: 188733201
Test: visual verified
Change-Id: Iebb9eaa201ac5481df0104b9394dbc9959aa0c52
2021-06-21 17:20:00 +08:00
Jason Chiu
272c7627e1 Fix A11y broken on Draw your pattern again page
Fixes: 190146459
Test: manual
Change-Id: I613e1db10334c06358bfa8d84770fb083ea12095
2021-06-21 17:18:34 +08:00
TreeHugger Robot
23222388c1 Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev 2021-06-21 09:17:32 +00:00