Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
637,912 Commits 3 Branches 0 Tags
65c23abeabfeb245fa187aa30db77541751f7703
Commit Graph

637912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricky Niu
65c23abeab Merge "Remove redundant variable" 2021-03-30 08:21:07 +00:00
Jerry Chang
ed8fea431c Merge "Deal with display insets when layout splits" into sc-dev am: 04e05de6da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14010220

Change-Id: I32fadf1b0205e87256d59845fd2f5310a2f029c6
 2021-03-30 07:10:23 +00:00
Jerry Chang
04e05de6da Merge "Deal with display insets when layout splits" into sc-dev 2021-03-30 06:45:48 +00:00
Ahaan Ugale
37430509cf Merge "Add OnDevice to TranslationManager method names." into sc-dev am: 342ddee557 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14012904

Change-Id: I9a1c0e90d27922c434eb9790b4ba81e2f9fa9e86
 2021-03-30 06:28:54 +00:00
Ahaan Ugale
342ddee557 Merge "Add OnDevice to TranslationManager method names." into sc-dev 2021-03-30 06:13:22 +00:00
Kevin Chyn
40b017aae6 Merge "Update getAuthenticatorId logic" into sc-dev am: ba049548bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13999915

Change-Id: I6ce361cb5f7a2d22db28de04fddb7cf26be95c4e
 2021-03-30 05:56:13 +00:00
Wesley.CW Wang
19dc73c1f1 Support bottom text in UsageProgressBarPreference am: f52c07b730 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13959433

Change-Id: Ia6c2bddbcf0d1b48492af9f267e43a2f9aafd70c
 2021-03-30 05:55:59 +00:00
Kevin Chyn
ba049548bf Merge "Update getAuthenticatorId logic" into sc-dev 2021-03-30 05:30:27 +00:00
Wesley.CW Wang
f52c07b730 Support bottom text in UsageProgressBarPreference 
- Add text view under progressbar

Bug: 177617478
Test: atest UsageProgressBarPreferenceTest
Change-Id: I8b6c00752d3a7d0b1281bb84904f32e3df3e0721
 2021-03-30 05:27:10 +00:00
Bill Yi
4ca01d55c9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-30 05:20:50 +00:00
Bill Yi
dd81e7d032 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-03-30 05:20:32 +00:00
Junyu Lai
15c1fcc6b8 [automerger skipped] Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" am: a819b9fcf5 am: efe96175f6 am: 79ffe7e704 -s ours am: 64f8341998 -s ours 
am skip reason: skip tag Change-Id I6c4863030c36328db571294fd12a40e59864def5 with SHA-1 ff05ee0fdb is already in history

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

Change-Id: Ia7efceb0380f4c76967c03b8ecf433451622fa4b
 2021-03-30 04:14:49 +00:00
Charles Chen
6db60e7341 Merge "Make wm to own protolog JSON file" am: 9500cbd939 am: 38909ac8e9 am: 070aee9525 am: b2bf86d78d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652221

Change-Id: Ida3f4431a983a9da6da917140682449313842c28
 2021-03-30 04:14:29 +00:00
George Chang
26717af683 Merge changes from topic "update_NFCC_Always_on" am: 7b7b809587 am: 6a6d92ff09 am: f5dcd90370 am: 03259bf7a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655107

Change-Id: If0f2753def656a3f74181a00a7f0401f5c414359
 2021-03-30 04:14:09 +00:00
James Lin
340de4d666 Merge "Updated the RcsCapabilityExchangeImplBase APIs" am: 47dc400888 am: 4f4713ec67 am: a4829f365a am: 3afabac191 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652213

Change-Id: I5a97bca774ce86cfc122259be267e2b88944290e
 2021-03-30 04:13:31 +00:00
Junyu Lai
64f8341998 [automerger skipped] Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" am: a819b9fcf5 am: efe96175f6 am: 79ffe7e704 -s ours 
am skip reason: skip tag Change-Id I6c4863030c36328db571294fd12a40e59864def5 with SHA-1 ff05ee0fdb is already in history

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

Change-Id: Ifbd33d77e0f2f3ddff5191589f6e3a958b01284f
 2021-03-30 04:00:50 +00:00
Charles Chen
b2bf86d78d Merge "Make wm to own protolog JSON file" am: 9500cbd939 am: 38909ac8e9 am: 070aee9525 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652221

Change-Id: I740dcdbd95d779126675f3f02db09fd6630add3f
 2021-03-30 04:00:10 +00:00
George Chang
03259bf7a4 Merge changes from topic "update_NFCC_Always_on" am: 7b7b809587 am: 6a6d92ff09 am: f5dcd90370 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655107

Change-Id: I57b2db68bb05750718298d776ba2d365bea44a8b
 2021-03-30 03:59:15 +00:00
James Lin
3afabac191 Merge "Updated the RcsCapabilityExchangeImplBase APIs" am: 47dc400888 am: 4f4713ec67 am: a4829f365a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652213

Change-Id: I9baf8f72e5dfe33d2e27554f7b8e952ab73ce95d
 2021-03-30 03:57:54 +00:00
Kevin Chyn
9702697d1d Merge "Only request resetLockout if enrollments exist" into sc-dev am: f3258c35c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14021313

Change-Id: I53fcd545e88d4edbe998c7ffb5dc6c93c85ec048
 2021-03-30 03:53:04 +00:00
Kevin Chyn
f3258c35c0 Merge "Only request resetLockout if enrollments exist" into sc-dev 2021-03-30 03:36:47 +00:00
Junyu Lai
79ffe7e704 Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" am: a819b9fcf5 am: efe96175f6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470723

Change-Id: I6d799819362fd7d89b6be691d15c49314c867734
 2021-03-30 03:30:15 +00:00
Charles Chen
070aee9525 Merge "Make wm to own protolog JSON file" am: 9500cbd939 am: 38909ac8e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652221

Change-Id: I7c1cd2edfa6a608a03d12de54e169feaa9f61db3
 2021-03-30 03:29:45 +00:00
Ming-Shin Lu
558d4d9696 Merge "Don't skip IME animation when backed to Task has no editor focus" into sc-dev am: a8e90c7cbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13892844

Change-Id: I98beb0df6971667228ddcce5ea0ef2da6798a855
 2021-03-30 03:25:30 +00:00
Lucy Chang
c63c8ce0a8 Merge "Update accessibility notification channel name" into sc-dev am: 164eb20e46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13988830

Change-Id: Idad51dbd76d1dbaf959a0bfc06a05ec87c461e33
 2021-03-30 03:24:39 +00:00
Junyu Lai
efe96175f6 Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" am: a819b9fcf5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470723

Change-Id: I9004a9af67fffc90c1d9f8ff18448d2258caf5ba
 2021-03-30 03:10:57 +00:00
Ming-Shin Lu
a8e90c7cbc Merge "Don't skip IME animation when backed to Task has no editor focus" into sc-dev 2021-03-30 03:10:21 +00:00
Lucy Chang
164eb20e46 Merge "Update accessibility notification channel name" into sc-dev 2021-03-30 03:08:11 +00:00
George Chang
f5dcd90370 Merge changes from topic "update_NFCC_Always_on" am: 7b7b809587 am: 6a6d92ff09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655107

Change-Id: Ie96dfbcd9e37a1e76faa2efbea2fc146a42e82f9
 2021-03-30 03:07:50 +00:00
James Lin
a4829f365a Merge "Updated the RcsCapabilityExchangeImplBase APIs" am: 47dc400888 am: 4f4713ec67 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652213

Change-Id: I8be9e96e205cc464e8620723361de0277b39b2f8
 2021-03-30 03:07:29 +00:00
Charles Chen
38909ac8e9 Merge "Make wm to own protolog JSON file" am: 9500cbd939 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652221

Change-Id: Ic0df683b6a212aa1468b7bd28db0e42a04b6f714
 2021-03-30 03:07:11 +00:00
Jerry Chang
8e8ceb4542 Merge "Fix not able to put app in split after removed task from side stage" into sc-dev am: 8b23eff356 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13982791

Change-Id: Iab4f315a441c93e469588c943d9f7f7b14915708
 2021-03-30 03:05:30 +00:00
Lorenzo Colitti
2d8f39b241 Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67 am: cfe25a8b49 am: c103a8cee9 am: b0c88dac50 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262

Change-Id: I959ba4ad9729b5d824ac02555b81f10616941bdd
 2021-03-30 03:05:19 +00:00
TreeHugger Robot
a7c5ebf8c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 11ce805c9f -s ours am: d219f86595 -s ours am: 3785dc2137 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49c36108200c8454774f57704644bdbcb1acfd79
 2021-03-30 03:02:20 +00:00
Jerry Chang
29f76eeae5 Deal with display insets when layout splits 
Fix: 175360659
Bug: 174209492
Test: manual check split bounds and divider position
Change-Id: I3b8c567a6a8f49d003eedd53a4abc32f53c7208c
 2021-03-30 10:58:55 +08:00
Junyu Lai
a819b9fcf5 Merge "[SP29] Send interface warning bytes to NetworkStatsProvider" 2021-03-30 02:56:25 +00:00
Charles Chen
9500cbd939 Merge "Make wm to own protolog JSON file" 2021-03-30 02:44:02 +00:00
Jerry Chang
8b23eff356 Merge "Fix not able to put app in split after removed task from side stage" into sc-dev 2021-03-30 02:36:43 +00:00
Lorenzo Colitti
b0c88dac50 Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67 am: cfe25a8b49 am: c103a8cee9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262

Change-Id: I94e5cf19a7b7dac8400cb7acf80b39a864099956
 2021-03-30 02:24:00 +00:00
George Chang
6a6d92ff09 Merge changes from topic "update_NFCC_Always_on" am: 7b7b809587 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655107

Change-Id: I99ee357d8dd742404688ffb5ba49c945406e4ff6
 2021-03-30 02:23:23 +00:00
TreeHugger Robot
3785dc2137 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 11ce805c9f -s ours am: d219f86595 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70924c213c55adb170557edd199294947a9f2092
 2021-03-30 02:23:21 +00:00
James Lin
4f4713ec67 Merge "Updated the RcsCapabilityExchangeImplBase APIs" am: 47dc400888 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652213

Change-Id: Iba781ae529b55d8055984706c0652d68e97e6873
 2021-03-30 02:20:10 +00:00
Kevin Chyn
17681607d9 Update getAuthenticatorId logic 
1) Theoretically, 0 is a valid random authenticatorId
2) A more precise way of handling this is by checking enrollment
   status. If the sensor has no enrollments, do not add its
   authenticatorId to the list

Bug: 183142128
Test: atest CtsBiometricsTestCases
Change-Id: I80e9b27a297480b02015b20788d56703833245ab
 2021-03-29 19:19:55 -07:00
George Chang
7b7b809587 Merge changes from topic "update_NFCC_Always_on" 
* changes:
  Make NFC_UID TestApi
  Update SetAlwaysOn to SetControllerAlwaysOn
  Add new permission to set NFC always on states
 2021-03-30 02:17:03 +00:00
Joanne Chung
eca3c30889 Merge "Fix the wrong logic to check if the element in SparseArray" into sc-dev am: d99fcedeb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14018529

Change-Id: Ic8974480db2388a7ed444f66936e60864245ab67
 2021-03-30 01:58:55 +00:00
Yi Jiang
daee850c20 Merge "Syncs camera sensor with gesture sensor." into sc-dev am: 7610f6976c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13770649

Change-Id: I01fd2e32abc2420e13a27d24936a8025e2e3d2ab
 2021-03-30 01:58:28 +00:00
Lorenzo Colitti
c103a8cee9 Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67 am: cfe25a8b49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262

Change-Id: I028d1f51c9685bcc7bcaabd0339b930aa46940c6
 2021-03-30 01:58:24 +00:00
TreeHugger Robot
d219f86595 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 11ce805c9f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If95223825a551111f3f54425e56fc5359abd1bce
 2021-03-30 01:57:59 +00:00
James Lin
47dc400888 Merge "Updated the RcsCapabilityExchangeImplBase APIs" 2021-03-30 01:57:10 +00:00
Joanne Chung
d99fcedeb3 Merge "Fix the wrong logic to check if the element in SparseArray" into sc-dev 2021-03-30 01:49:41 +00:00