Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,118 Commits 3 Branches 0 Tags
23fa1dc4111f74d30bfbe8dffcec843b8bc79466
Commit Graph

651118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rhed Jao
23fa1dc411 Merge "Fix wrong targetSdkVersion returned by the ApkLiteParseUtils" into sc-dev am: 0d6cc194dc am: 6d0557b9ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972859

Change-Id: I60c7ad30715087275e0f37317b55068fce59930b
 2021-06-16 07:59:51 +00:00
Rhed Jao
6d0557b9ae Merge "Fix wrong targetSdkVersion returned by the ApkLiteParseUtils" into sc-dev am: 0d6cc194dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972859

Change-Id: Ib615b0300486da9b96cfbfc939b7bb19310076e0
 2021-06-16 07:50:33 +00:00
Automerger Merge Worker
be3647d9f4 Merge "Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2e3 am: 9053769983" into sc-v2-dev-plus-aosp 2021-06-16 07:27:53 +00:00
Rhed Jao
0d6cc194dc Merge "Fix wrong targetSdkVersion returned by the ApkLiteParseUtils" into sc-dev 2021-06-16 07:27:33 +00:00
Alexander Dorokhine
434778414a Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2e3 am: fb84ffc877 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14675867

Change-Id: Ica71778c81d1ed3f3c0c98c030581a75f6dbe93e
 2021-06-16 07:27:08 +00:00
Alexander Dorokhine
b658210231 Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2e3 am: 9053769983 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14675867

Change-Id: Ib3f5ecea03af7ae667db77d433e85d2863ea6bed
 2021-06-16 07:26:44 +00:00
Alexander Dorokhine
9053769983 Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14675867

Change-Id: Ia3ef2e833e105b2743004d8a72ed9212fb693493
 2021-06-16 07:15:06 +00:00
Alexander Dorokhine
fb84ffc877 Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14675867

Change-Id: Ib06b4d44d148e5481552070df43d3c02c94d2aeb
 2021-06-16 07:14:19 +00:00
Alexander Dorokhine
aafffec2e3 Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev 2021-06-16 07:00:17 +00:00
TreeHugger Robot
a9473dccce Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am: 72ca552528 am: c848a518a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14949624

Change-Id: I6c871dc3a90e48d3b64041dd0af4f6c8e7d106a0
 2021-06-16 06:54:18 +00:00
TreeHugger Robot
ed5af16153 Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am: 72ca552528 am: 9a6dafd359 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14949624

Change-Id: I0249165970bf326b1e46c6832edaf86bf7ea2488
 2021-06-16 06:53:51 +00:00
TreeHugger Robot
9a6dafd359 Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am: 72ca552528 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14949624

Change-Id: Ie8796953e95a67942b8ce8c304f3e250aaf771f9
 2021-06-16 06:49:56 +00:00
TreeHugger Robot
c848a518a3 Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev am: 72ca552528 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14949624

Change-Id: I079c876bf32fa057461de6568f26185f752b07fe
 2021-06-16 06:49:22 +00:00
TreeHugger Robot
5dad1eafac Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev am: 04e32fa3d2 am: 1d6d494c75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972760

Change-Id: I5e2f468c388642ed637d84e4af6ca0cd10dac405
 2021-06-16 06:47:33 +00:00
TreeHugger Robot
ee814143bb Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev am: 949b4d2940 am: cc6f134339 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982209

Change-Id: If05a28a3f5f9ab88b44dfa38772f666e1512d229
 2021-06-16 06:47:25 +00:00
TreeHugger Robot
681542b95f Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev am: 04e32fa3d2 am: c559206bd8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972760

Change-Id: Ic09687ae21a0ed781d8e65e748d5ca4f1c3eb1ae
 2021-06-16 06:47:08 +00:00
TreeHugger Robot
eb6368a1c6 Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev am: 949b4d2940 am: 388d8a3657 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982209

Change-Id: Ie8f050a5f5d10561d935270fdb2cb057e45923b4
 2021-06-16 06:46:56 +00:00
Automerger Merge Worker
c91694718f Merge "Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3 am: c8a47e1e78" into sc-v2-dev-plus-aosp 2021-06-16 06:46:43 +00:00
Kevin Chyn
132629af53 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3 am: c8a47e1e78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972615

Change-Id: Id3ef2b831325884ac80c6d973e54dd7287feb506
 2021-06-16 06:46:37 +00:00
Kevin Chyn
59be659ef2 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3 am: 5e82ec2682 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972615

Change-Id: Id10f66ac9414dd41db31223247b82fe311786191
 2021-06-16 06:46:34 +00:00
TreeHugger Robot
72ca552528 Merge "Fixed wipeData() so it doesn't depend on device_admin." into sc-dev 2021-06-16 06:45:36 +00:00
TreeHugger Robot
c559206bd8 Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev am: 04e32fa3d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972760

Change-Id: I368de72fbea997a0ef819e3fed67620e8c62c6a1
 2021-06-16 06:42:55 +00:00
TreeHugger Robot
1d6d494c75 Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev am: 04e32fa3d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972760

Change-Id: Ie382699bca45d00085a53301cf10ef944fa4b3a9
 2021-06-16 06:41:52 +00:00
TreeHugger Robot
04e32fa3d2 Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev 2021-06-16 06:35:52 +00:00
TreeHugger Robot
388d8a3657 Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev am: 949b4d2940 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982209

Change-Id: I1ee7c180158628fac9711a795ab04a78fbe33886
 2021-06-16 06:34:52 +00:00
TreeHugger Robot
cc6f134339 Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev am: 949b4d2940 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982209

Change-Id: I713ff0983ffefa90935967055b84c6c233b0f428
 2021-06-16 06:34:21 +00:00
Kevin Chyn
5e82ec2682 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972615

Change-Id: I2b7855c2a4745b9f087b6b1c068515ea2c73aaf8
 2021-06-16 06:34:12 +00:00
Kevin Chyn
c8a47e1e78 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989fd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972615

Change-Id: I6cdcee2228ea48f8d36af6b42e4afc6c6e6c0fdd
 2021-06-16 06:33:50 +00:00
TreeHugger Robot
949b4d2940 Merge "ContentCapture: DEBUG flag to log raw text" into sc-dev 2021-06-16 06:32:35 +00:00
Kevin Chyn
ffc5989fd3 Merge "Move non-settings-specific logic to frameworks/base" into sc-dev 2021-06-16 06:13:17 +00:00
Minche Li
1b9697b13b Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev am: 70aaf815b6 am: 2ad334461c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921895

Change-Id: I6d25afbc1a4caecc2ce2f0f3c8849a1c26df53ab
 2021-06-16 05:39:49 +00:00
Minche Li
d949fcf3ce Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev am: 70aaf815b6 am: 6619759631 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921895

Change-Id: I6d39c401c05f32507a81a40b75dbc250348457bd
 2021-06-16 05:28:19 +00:00
Automerger Merge Worker
eb6c8e22ba Merge "Merge "Limit marquee in QS tiles to 1" into sc-dev am: 014c064431 am: 1522a2d92a" into sc-v2-dev-plus-aosp 2021-06-16 05:28:13 +00:00
TreeHugger Robot
452c11ddcd Merge "Limit marquee in QS tiles to 1" into sc-dev am: 014c064431 am: 1522a2d92a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982226

Change-Id: Ie1cc0c6b8f8044d7caf8b9b2983fff2614c855cc
 2021-06-16 05:25:41 +00:00
Minche Li
2ad334461c Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev am: 70aaf815b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921895

Change-Id: Id9848497346417660cac743d4a8217792fb07202
 2021-06-16 05:24:19 +00:00
Minche Li
6619759631 Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev am: 70aaf815b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14921895

Change-Id: I3e75bc49991c1682f7c36474dcf07496618817aa
 2021-06-16 05:20:24 +00:00
Minche Li
70aaf815b6 Merge "Calculates the window height fraction on screen by the draggable bounds for magnification switch button" into sc-dev 2021-06-16 04:58:37 +00:00
Jacky Kao
03af15f510 [automerger skipped] Merge "Eliminate potential deadlock in AccessibilityCache" am: e6510baf3b am: 0d21e173f9 -s ours am: c54cf1ce11 -s ours 
am skip reason: Merged-In I27e4e64f778ae1c2a348e16cf8739f7a5596e0fc with SHA-1 1427156afc is already in history

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

Change-Id: Ibda108fb0a999f16da22845d8ddc3ab31e7357a6
 2021-06-16 04:35:52 +00:00
Lucas Lin
b2789c7d5d Merge "Set legacy type for VPN" am: e19a7da47f am: 49082c0065 am: 035d2579c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733495

Change-Id: I56392086895a375d174dfa40c7e78506850acef5
 2021-06-16 04:35:33 +00:00
TreeHugger Robot
5708dd66e6 Merge "Limit marquee in QS tiles to 1" into sc-dev am: 014c064431 am: a2a9378638 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982226

Change-Id: I3b2fb98f852b1aa88ad7f10c6f8855acf70afa7e
 2021-06-16 04:35:18 +00:00
TreeHugger Robot
37adb6dd26 Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev am: 8a39e97d7e am: d05a6224dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14966792

Change-Id: I325048b3a2d582264a2a533a310c282ecc41501b
 2021-06-16 04:35:09 +00:00
TreeHugger Robot
0bc81f8dcf Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev am: 8a39e97d7e am: 699738b370 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14966792

Change-Id: I7e6f0c79e0247581845e0683c00c6ded3040931c
 2021-06-16 04:34:57 +00:00
Colin Cross
30453b189b Merge "Revert "Revert "HULK SMASH! We've gotta declare REL.""" into sc-dev am: 5c80e3491d am: 9c00e6e8cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14991077

Change-Id: Idefbc62fcb5731700e2d98d09a110c708dce9e53
 2021-06-16 04:29:27 +00:00
Jacky Kao
c54cf1ce11 [automerger skipped] Merge "Eliminate potential deadlock in AccessibilityCache" am: e6510baf3b am: 0d21e173f9 -s ours 
am skip reason: Merged-In I27e4e64f778ae1c2a348e16cf8739f7a5596e0fc with SHA-1 1427156afc is already in history

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

Change-Id: I33f5c0149a1ce5865cba08e826632761a4efc4e3
 2021-06-16 04:23:19 +00:00
Lucas Lin
035d2579c3 Merge "Set legacy type for VPN" am: e19a7da47f am: 49082c0065 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1733495

Change-Id: Ic6c3f0db93ddef11ca0bea3c0dda3f5101f69be3
 2021-06-16 04:22:38 +00:00
TreeHugger Robot
a2a9378638 Merge "Limit marquee in QS tiles to 1" into sc-dev am: 014c064431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982226

Change-Id: I90989668229298cda91b13bffcfdbccd7d8b89f9
 2021-06-16 04:18:57 +00:00
TreeHugger Robot
d05a6224dd Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev am: 8a39e97d7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14966792

Change-Id: I8beeb1372180731c9257effa877ff2c39b153f56
 2021-06-16 04:17:53 +00:00
Jacky Kao
0d21e173f9 Merge "Eliminate potential deadlock in AccessibilityCache" am: e6510baf3b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1736248

Change-Id: Ic2c767c140ba4961caa63c574e805e70a69f3e63
 2021-06-16 04:11:45 +00:00
TreeHugger Robot
1522a2d92a Merge "Limit marquee in QS tiles to 1" into sc-dev am: 014c064431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982226

Change-Id: Ie57d1c48d76f097a92c17b9d935278f2a597cb22
 2021-06-16 04:07:46 +00:00
TreeHugger Robot
699738b370 Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev am: 8a39e97d7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14966792

Change-Id: Ifde912d63eba1660ca9a60c55ea6b240400e7ac1
 2021-06-16 04:07:02 +00:00