Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
703,055 Commits 3 Branches 0 Tags
a9c846a5fae3f531eed5ed3ffe17e3c2efcc65e9
Commit Graph

703055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
a9c846a5fa Refactor InternetIconInjector to SettingsLib 
- Plan to share the InternetIconInjector class to System UI.

Bug: 192923176
Test: manual test
make RunSettingsLibRoboTests ROBOTEST_FILTER=WifiUtilsTest

Change-Id: Ieb7080ab6f6462abc3820b47c2a58cc2ea2a083e
 2021-07-21 20:37:36 +08:00
TreeHugger Robot
1750f16889 [automerger skipped] Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 am: f7f77d0e2b -s ours am: 10a8c2df9f -s ours 
am skip reason: Merged-In I7417ccd3899ffba05411ebb4e56c255f6ef09f54 with SHA-1 1cad82c3bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: I1f551ec49447619aa0a7bc98f43f67bf90e01272
 2021-07-21 01:19:14 +00:00
TreeHugger Robot
5398337df0 [automerger skipped] Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 am: ba15251dcd am: 4e637524d3 -s ours 
am skip reason: Merged-In I7417ccd3899ffba05411ebb4e56c255f6ef09f54 with SHA-1 1cad82c3bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: I7d05ae9f9d25ca63e639e510bd895b26f9d0413b
 2021-07-21 01:18:36 +00:00
TreeHugger Robot
10a8c2df9f [automerger skipped] Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 am: f7f77d0e2b -s ours 
am skip reason: Merged-In I7417ccd3899ffba05411ebb4e56c255f6ef09f54 with SHA-1 1cad82c3bc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: I567fd2fdd0448701945db5a684ef06d4015cead5
 2021-07-21 01:03:00 +00:00
TreeHugger Robot
95ccc85b73 Merge "Fix concurrency of BatteryStats cleanup after user removal" 2021-07-21 01:02:23 +00:00
TreeHugger Robot
4e637524d3 Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 am: ba15251dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: Ia97c0cfc2abf56580cd65688384bceab1b62c8ea
 2021-07-21 01:02:10 +00:00
TreeHugger Robot
bd09ec4e75 [automerger skipped] Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 am: f31e6d1c22 -s ours 
am skip reason: Merged-In I7417ccd3899ffba05411ebb4e56c255f6ef09f54 with SHA-1 7d6516684e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: I4c042406967156993da92d08c846baf5355c3653
 2021-07-21 01:01:42 +00:00
TreeHugger Robot
ba15251dcd Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: I2eb4e379514ef2dff8bcded1dc02efc1d24e4395
 2021-07-21 00:51:18 +00:00
Chris Li
a90a260982 Merge "Add default implementation of TaskFragmentOrganizer" into sc-v2-dev am: f7224f068f am: b9d3f51aca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15130807

Change-Id: Ibbb1bf28a1e43c8a658a20c6198e6e85d06af9e9
 2021-07-21 00:51:16 +00:00
Winson Chung
0f493c60d4 [automerger skipped] Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 -s ours am: 6e8c4ca6e1 -s ours am: 4991f0dfae -s ours 
am skip reason: Merged-In I1204818eefd96d2eb1fb6d195e186f36fd47efac with SHA-1 70c7a4148a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I8ec5fc084c372dee6cb138ba6cea79ef86073e6a
 2021-07-21 00:50:48 +00:00
TreeHugger Robot
f31e6d1c22 Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: Ic1978de3c109e209f82eed51c34dca8d09dcc1d4
 2021-07-21 00:50:26 +00:00
TreeHugger Robot
f7f77d0e2b Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207

Change-Id: I2125e33aa25dc5e63b3cd036da68bde6e4aa8100
 2021-07-21 00:50:24 +00:00
Shuzhen Wang
d446a278ec Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f am: 7f9dbc3696 am: 24a432f7f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: Ic0e306a24f8efd0c6df28001a840a9289cbdf844
 2021-07-21 00:48:15 +00:00
Winson Chung
94539e0962 [automerger skipped] Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 am: 174ce49b34 -s ours am: b2be151f79 -s ours 
am skip reason: Merged-In I1204818eefd96d2eb1fb6d195e186f36fd47efac with SHA-1 70c7a4148a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I0da3d7469c673a7f49dc6c4b1ba29c89bb62b0e5
 2021-07-21 00:47:39 +00:00
Shuzhen Wang
2fac4c2883 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f am: 02a00aba16 am: 0d47a9da79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: Ieb5dbc9debd6ea9544d2838984d38fcea7219f84
 2021-07-21 00:47:05 +00:00
Automerger Merge Worker
829e0f5c85 Merge "Merge "ZipUtils: use FileChannel#size" am: d0798d7117 am: f92201554a am: 0c60cbf8c0 am: 1cbe6e0d72" 2021-07-21 00:46:49 +00:00
Jooyung Han
3e705d0f26 Merge "ZipUtils: use FileChannel#size" am: d0798d7117 am: f92201554a am: 0c60cbf8c0 am: 1cbe6e0d72 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765685

Change-Id: Ifb16c4b8f6cffeca9c7fc6f1a906137a7c65572d
 2021-07-21 00:46:12 +00:00
Chris Li
b9d3f51aca Merge "Add default implementation of TaskFragmentOrganizer" into sc-v2-dev am: f7224f068f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15130807

Change-Id: I1dcbaff4206f0e81a13d4113808430398a741f54
 2021-07-21 00:46:05 +00:00
Winson Chung
4991f0dfae [automerger skipped] Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 -s ours am: 6e8c4ca6e1 -s ours 
am skip reason: Merged-In I1204818eefd96d2eb1fb6d195e186f36fd47efac with SHA-1 70c7a4148a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I60fa5ba0efbde3cd539ed35e6beacb694e6bfa1f
 2021-07-21 00:45:44 +00:00
Winson Chung
1a7efdddc4 [automerger skipped] Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 am: dabc3d285e -s ours 
am skip reason: Merged-In I1204818eefd96d2eb1fb6d195e186f36fd47efac with SHA-1 70c7a4148a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I90820d11406a922f62a2eb0a5693e22e60741f26
 2021-07-21 00:45:40 +00:00
Shuzhen Wang
24a432f7f9 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f am: 7f9dbc3696 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: I9569ca71cc379e77f3e92f9b1217b6368c62d055
 2021-07-21 00:45:13 +00:00
Shuzhen Wang
8bab52a783 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f am: 53a6b7de48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: I0cce2ba453917c60ab427bd4c616b4d9da97bff2
 2021-07-21 00:44:46 +00:00
Winson Chung
b2be151f79 [automerger skipped] Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 am: 174ce49b34 -s ours 
am skip reason: Merged-In I1204818eefd96d2eb1fb6d195e186f36fd47efac with SHA-1 70c7a4148a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: Ib31970cbabb34a20d5abcbe4bc9649568b38c907
 2021-07-21 00:37:49 +00:00
Shuzhen Wang
0d47a9da79 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f am: 02a00aba16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: I458985283a4f93ed8aa62140f5ba31d63293713e
 2021-07-21 00:37:01 +00:00
Jooyung Han
1cbe6e0d72 Merge "ZipUtils: use FileChannel#size" am: d0798d7117 am: f92201554a am: 0c60cbf8c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765685

Change-Id: I0cdb5778b34957c712da6d0a4fd470c17df9da97
 2021-07-21 00:36:39 +00:00
TreeHugger Robot
16ff25f5a7 Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev 2021-07-21 00:36:13 +00:00
Winson Chung
174ce49b34 Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I9370fe66f4fca3ee2d620ef7d834b0e5c2d50e78
 2021-07-21 00:32:13 +00:00
Chris Li
f7224f068f Merge "Add default implementation of TaskFragmentOrganizer" into sc-v2-dev 2021-07-21 00:32:11 +00:00
Winson Chung
6e8c4ca6e1 [automerger skipped] Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 -s ours 
am skip reason: Merged-In I1204818eefd96d2eb1fb6d195e186f36fd47efac with SHA-1 70c7a4148a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I5ceff1e119aac0fa3bffc0bf76d67bbfb079090b
 2021-07-21 00:31:07 +00:00
Winson Chung
dabc3d285e Merge "Clean up previous DA organizer when registering" into sc-dev am: 2c4f6e1ae6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15333816

Change-Id: I019cf31cf7deecff84e3143f5490b0e4979b54c3
 2021-07-21 00:31:05 +00:00
Shuzhen Wang
7f9dbc3696 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: I7f0fdcec867aff22ad56f47a3c6aa44c2f96b5ec
 2021-07-21 00:30:40 +00:00
Shuzhen Wang
02a00aba16 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: I3fc9174671d3789fd6c3131a064742f2d3671d95
 2021-07-21 00:30:26 +00:00
Shuzhen Wang
53a6b7de48 Merge "Camera: Improve logical camera RAW capture docs" into sc-dev am: 3e72b3e16f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15114380

Change-Id: I58e25641355f2ff1709fc1e3bc4a72cb895d0595
 2021-07-21 00:30:19 +00:00
TreeHugger Robot
657be4de88 [automerger skipped] Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 am: 972319003b -s ours am: 3d6b2671a1 -s ours 
am skip reason: Merged-In I981cd3be3cd381c6d00f06e3da9f8e67f157a26b with SHA-1 63f5d4b699 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I76896842e9b0ec03ea41cbf71d1965fb70fbbc51
 2021-07-21 00:23:40 +00:00
Jooyung Han
0c60cbf8c0 Merge "ZipUtils: use FileChannel#size" am: d0798d7117 am: f92201554a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765685

Change-Id: I07df9fab5a971cc8cc5a4029a5935845efce27b0
 2021-07-21 00:22:34 +00:00
TreeHugger Robot
eabdda0438 [automerger skipped] Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 am: e6f790f8e0 am: 45d3d840ba -s ours 
am skip reason: Merged-In I981cd3be3cd381c6d00f06e3da9f8e67f157a26b with SHA-1 63f5d4b699 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I5b2131af8e8cd3403f68bd493bde3249cf7f5c13
 2021-07-21 00:22:01 +00:00
Winson Chung
2c4f6e1ae6 Merge "Clean up previous DA organizer when registering" into sc-dev 2021-07-21 00:21:18 +00:00
Jooyung Han
f92201554a Merge "ZipUtils: use FileChannel#size" am: d0798d7117 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765685

Change-Id: Id80acd731bdd74a8ec99273261091cacb449c4d6
 2021-07-21 00:09:34 +00:00
TreeHugger Robot
3d6b2671a1 [automerger skipped] Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 am: 972319003b -s ours 
am skip reason: Merged-In I981cd3be3cd381c6d00f06e3da9f8e67f157a26b with SHA-1 63f5d4b699 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I4e605b460733c22e7a141e52212c22df2578ae06
 2021-07-21 00:09:32 +00:00
Shuzhen Wang
3e72b3e16f Merge "Camera: Improve logical camera RAW capture docs" into sc-dev 2021-07-21 00:09:26 +00:00
TreeHugger Robot
45d3d840ba Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 am: e6f790f8e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I39876ccabf982bb04b901a44416d76c6fa1f8b9c
 2021-07-21 00:08:59 +00:00
TreeHugger Robot
07d2a0408e [automerger skipped] Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 am: c8230b63b5 -s ours 
am skip reason: Merged-In I981cd3be3cd381c6d00f06e3da9f8e67f157a26b with SHA-1 80feb40fe6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I8b54536268aeb9b9fbfe7ab126529bfa749d9bf8
 2021-07-21 00:08:09 +00:00
Zoey Chen
22503bcd4d Merge "[Provider Model] Sync solution from sc" 2021-07-20 23:56:40 +00:00
TreeHugger Robot
972319003b Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: Id73767774382250f7e3e9089dd498c2adc72f627
 2021-07-20 23:55:02 +00:00
TreeHugger Robot
c8230b63b5 Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I4ed023a09b9ec0bffe54195cb91b632fdead95e1
 2021-07-20 23:54:18 +00:00
TreeHugger Robot
e6f790f8e0 Merge "Stop removing all APP_STANDBY_BUCKET_CHANGED messages." into sc-dev am: 5b6a2aff21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331033

Change-Id: I5f693a14d6801104c8a2aafbb0f38b5b6f45d72b
 2021-07-20 23:54:11 +00:00
Dave Mankoff
34f676239d Merge "Use a different context when constructing an EdgeBackGestureHandler." 2021-07-20 23:53:07 +00:00
Automerger Merge Worker
cfaf97b68d Merge "Merge "Revert "Launch admin policies settings screen if not possible to launch help page"" into sc-dev am: 277047bc1e am: e37cf4686b" into sc-v2-dev-plus-aosp am: 4d6aae60b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340583

Change-Id: Ie0612bcd522f72594fd7fba10b7a0c36f11add70
 2021-07-20 23:51:20 +00:00
Hongwei Wang
2013535912 Merge "Fix entering PiP transition in button navigation mode" into sc-v2-dev am: e2a5a72266 am: 732ad85e3f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340838

Change-Id: I720d1b29df5ad8c2eb21236eb8c32cd804f9b492
 2021-07-20 23:51:06 +00:00
Jooyung Han
d0798d7117 Merge "ZipUtils: use FileChannel#size" 2021-07-20 23:50:59 +00:00