PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,793 Commits 1 Branch 0 Tags
d6f101a2d8153b89c78d92c47c46365970b0d0a6
Commit Graph

89793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
d6f101a2d8 Merge changes from topic "unicorn-hand" into sc-dev am: daeda0525b am: d932268510 am: 88fc8f817a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15030503

Change-Id: I5866a3cc161292d1b146e8395ff92037a6937c68
 2021-06-21 20:33:01 +00:00
Joe Bolinger
2cc57b1d73 Add handoff activity to parental consent flow. am: fb515ed608 am: f7ee87c992 am: 872bc56abf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029584

Change-Id: Id44f2ba41b034596e7ad25f24073215607cd362e
 2021-06-21 20:32:55 +00:00
TreeHugger Robot
ab43a110b7 Merge "Adjust bubbles avatar icon size to align left icon" into sc-dev am: 65220e5cdb am: 05e21445b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048196

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

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

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

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

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

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

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

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

Change-Id: I663a388243b059dbfab08301c30b874815f75ae8
 2021-06-21 19:57:09 +00:00
TreeHugger Robot
05e21445b8 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: Iea48cb1d04c4d2f2c3afe00fb1f0f2da7809d1a0
 2021-06-21 19:55:32 +00:00
TreeHugger Robot
565507053e Merge "Revert "Suppress Shared Axis transition on the SIM dialog"" into sc-dev am: dbaad0436d am: 3909722588 am: 9d84b54ac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029682

Change-Id: Idad26c81af6de34f5229d4d26f78449dc0e4a416
 2021-06-21 19:55:15 +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
Joe Bolinger
69291542a5 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: Idb2045adfc3d220555330ea735fc4b04719c5976
 2021-06-21 19:53:49 +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
TreeHugger Robot
80c95cf92a Merge "Move ic_info_outline_24 from SettingsLib to Settings" into sc-dev am: 23222388c1 am: 9346fb4474 am: 0f7c1467a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15001652

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

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

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

Change-Id: Ib0b9a264a910cdc0be586a5f9cf742f300d8756a
 2021-06-21 17:22:57 +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
921e433926 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 5ae801442d am: 1ff9797a13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: I838f23e72516d69d6c74e7e8fe3657244036322d
 2021-06-21 14:17:18 +00: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
1ddbf04f88 Merge "Improve search by adding the settings keywords for supported downloaded services" into sc-dev am: 34961821f4 am: 82531a695b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14299190

Change-Id: Id4fb63ef6a5bd335fe52cb8c3fd4e7d776045f34
 2021-06-21 14:02:21 +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
82531a695b 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: I040bdb7288bb02993ebe6a9de20b2dad59e2d442
 2021-06-21 13:47:18 +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
ae12cea123 Merge "Clean up unused code" into sc-dev am: 3928e0b4f1 am: 251d3a27f3 am: 34e7bde17f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029689

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

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

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

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

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

Change-Id: I99a46d8dbfc998cc707ef351078ff71d93b5d298
 2021-06-21 12:42:34 +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