Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
549,628 Commits 3 Branches 0 Tags
22f7b2b919dfcb2a9f094d7446b8e9e2064ccfae
Commit Graph

549628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
22f7b2b919 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d03a3606 -s ours am: f1578647ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a9b1dc8d6f54326e6a2c64e845a1094cf29f3d4
 2020-08-03 05:34:23 +00:00
Bill Yi
377c9a0261 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d03a3606 -s ours am: f98ec32360 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba0e1a726aaf42c690b096b94928a14467a0591e
 2020-08-03 05:19:27 +00:00
Bill Yi
f1578647ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d03a3606 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic267d327b7fd0eaeffe6cc026ca8d032ad340082
 2020-08-03 05:09:55 +00:00
Bill Yi
f98ec32360 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04d03a3606 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93b99b15b4df0ffab7e0e73266bedb6d47802556
 2020-08-03 05:08:49 +00:00
Treehugger Robot
dd5810e032 Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46 am: f363e6306b am: bdffa07001 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383977

Change-Id: Iec417650eb13ad15ac93ab9cf3b770fabd6d7580
 2020-08-03 02:59:20 +00:00
Treehugger Robot
bdffa07001 Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46 am: f363e6306b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383977

Change-Id: I0bb515ce675c94cc68b340e656044b8d3a2b0849
 2020-08-03 02:36:25 +00:00
Treehugger Robot
f363e6306b Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383977

Change-Id: I50422f84fddaf05ed8d5d94e1b93690b1eb5e1cd
 2020-08-03 02:10:40 +00:00
Treehugger Robot
728932de46 Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383977

Change-Id: Ic012e70d74fec68c05a51ad9f22fe09ecb11af3f
 2020-08-03 01:50:34 +00:00
Treehugger Robot
e803bb122f Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 01:27:50 +00:00
Treehugger Robot
79f4337f1b Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94 am: bde18f58a7 am: f42249506e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I6c402a244842105c980d3dd3cc0c57de73185c3b
 2020-08-03 00:03:36 +00:00
Treehugger Robot
f42249506e Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94 am: bde18f58a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I7ccbfddb32aa56a7454904b46968daeb98343247
 2020-08-02 23:34:38 +00:00
Treehugger Robot
bde18f58a7 Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I4711a07ce3df64317c0f8ef562506b91353ab691
 2020-08-02 23:07:26 +00:00
Treehugger Robot
19cb457e94 Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380556

Change-Id: I9ee9a80eb9eb808a9a7d2f46873b158ac1f4f00f
 2020-08-02 22:39:39 +00:00
Treehugger Robot
4e6e7d7238 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-02 22:19:05 +00:00
Bill Yi
04d03a3606 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id80ea2167494900f57296f60329f582303f398fc
 2020-08-02 20:06:12 +00:00
Treehugger Robot
abc8502551 Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa am: b2ccd88b3f am: 85ec9950e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I1914d2712aa5802ca212f05b41954a61b84c1256
 2020-08-01 13:45:59 +00:00
Treehugger Robot
85ec9950e2 Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa am: b2ccd88b3f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I78d0dded98f00114e90fb5b8fe6b054becccba95
 2020-08-01 13:21:45 +00:00
Treehugger Robot
b2ccd88b3f Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I5e5ce4f05763347ebe7e1cd5dd80be82489d436c
 2020-08-01 13:08:10 +00:00
Treehugger Robot
d13c410dfa Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I3dd84327f745f58647e71f5491b4240469a9dce9
 2020-08-01 12:46:17 +00:00
Treehugger Robot
dab3aaa5c6 Merge "Add support for Razer Kishi game controller." 2020-08-01 12:29:58 +00:00
Peiyong Lin
a5220103f1 Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c93a am: 8d7604a4cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272621

Change-Id: I4bbdb5252dcf1e73bdd0b05e382bb8a6482bd8df
 2020-08-01 07:01:51 +00:00
Peiyong Lin
8d7604a4cb Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c93a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272621

Change-Id: I4caee590c4fdd4f0d595ae091332555dff3654a8
 2020-08-01 06:40:51 +00:00
Peiyong Lin
094c85c93a Merge "Use more inclusive terms." into rvc-dev-plus-aosp 2020-08-01 06:25:52 +00:00
Treehugger Robot
696d25e48c Merge "Add support for Scuf Vantage game controller." am: 8ee49446ef am: 8114f3607b am: 889b8deaed am: eac0d11024 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384181

Change-Id: Iab006565a19056c04d00669fc84b15886d2ee480
 2020-08-01 05:51:46 +00:00
Treehugger Robot
eac0d11024 Merge "Add support for Scuf Vantage game controller." am: 8ee49446ef am: 8114f3607b am: 889b8deaed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384181

Change-Id: Id998230b0cdec0b201c540d6d09f0a755b2b1702
 2020-08-01 05:32:17 +00:00
Treehugger Robot
889b8deaed Merge "Add support for Scuf Vantage game controller." am: 8ee49446ef am: 8114f3607b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384181

Change-Id: If5954b0ae3ab98a10ee89b871e5ebfe9be5d3953
 2020-08-01 05:19:46 +00:00
Treehugger Robot
8114f3607b Merge "Add support for Scuf Vantage game controller." am: 8ee49446ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384181

Change-Id: Ibdc7f5977e62ff104952f15849107a6849a92681
 2020-08-01 04:57:50 +00:00
Chris Ye
d91a29ac36 Add support for Razer Kishi game controller. 
Add Razer Raiju Kishi controller keyboard layout mapping.

Bug: 140958486
Test: Connect Razer Kishi controller and play game with it.
Change-Id: I6f94e212fe10f777f04ad9815468e2148d4252f5
Merged-In: I6f94e212fe10f777f04ad9815468e2148d4252f5
 2020-08-01 04:38:14 +00:00
Treehugger Robot
8ee49446ef Merge "Add support for Scuf Vantage game controller." 2020-08-01 04:36:44 +00:00
Chris Ye
b07e2f8093 Add support for Scuf Vantage game controller. 
Add Scuf Vantage controller keyboard layout mapping.

Bug: 155223457
Test: ControllerTest App, Connect Scuf Vantage controller and play game with it.
Change-Id: I21d23dcbeb4ef24d212d4e386f6dbf8b1b89d9f6
Merged-In: I21d23dcbeb4ef24d212d4e386f6dbf8b1b89d9f6
 2020-08-01 04:35:51 +00:00
TreeHugger Robot
aad9f4ac17 Merge "Fix SideLoadedAppListenerTest" into rvc-qpr-dev am: 82abf1c4cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12285756

Change-Id: I9a6ddf0c9cab9fd532b11c8cc3135a5157896ea5
 2020-08-01 01:58:43 +00:00
TreeHugger Robot
9ebbd0fb0b Merge "Fix UserSwitchTransitionViewMediatorTest" into rvc-qpr-dev am: c7d1702343 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282475

Change-Id: If4c3df24af706e33c595f0840cf5427a6f8e33e4
 2020-08-01 01:57:24 +00:00
TreeHugger Robot
82abf1c4cd Merge "Fix SideLoadedAppListenerTest" into rvc-qpr-dev 2020-08-01 01:48:45 +00:00
TreeHugger Robot
c7d1702343 Merge "Fix UserSwitchTransitionViewMediatorTest" into rvc-qpr-dev 2020-08-01 01:29:52 +00:00
Treehugger Robot
a722891f7d Merge "Update language to comply with Android's inclusive language guidance" am: 0521eb758a am: 8d384c548c am: 12b1eaba8f am: eeac3d7223 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384138

Change-Id: I252ac1729ace47e8ca4107f8936a925771ae78a5
 2020-08-01 00:55:57 +00:00
Alice Kuo
75a3409546 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

 #inclusivefixit

Bug: 162536543
Change-Id: Id3228be845bffa340fdb0165b567e7cf1759c839
 2020-08-01 00:43:39 +00:00
Treehugger Robot
eeac3d7223 Merge "Update language to comply with Android's inclusive language guidance" am: 0521eb758a am: 8d384c548c am: 12b1eaba8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384138

Change-Id: Ia983b250273e8f16cb1f3e76b00563633c32e95d
 2020-08-01 00:31:29 +00:00
kwaky
01e7567c22 Fix SideLoadedAppListenerTest 
Display2 is expected to return stack info that is not safe, and so it is
expected that onUnSafeTaskDisplayedOnDisplay is called for it.

Bug: 161892451
Test: Unit Test
Change-Id: I3e3afbadff4cb2fc252c5b0d4fe32bd9ce19097a
 2020-07-31 17:04:26 -07:00
Treehugger Robot
12b1eaba8f Merge "Update language to comply with Android's inclusive language guidance" am: 0521eb758a am: 8d384c548c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384138

Change-Id: I706670b4342df343b0a4ec49260b3601d37aa95e
 2020-08-01 00:01:23 +00:00
kwaky
ff69d4bf4c Fix UserSwitchTransitionViewMediatorTest 
First, it has to extend SystemUiTestCase to pass AAAPlusPlusVerify Test.
Second, CarDeviceProvisionedController is injected into the Mediator and
mocked in its test to correctly test case where the user life cycle
event is being applied to the current user and a case when it is not.

Bug: 161892451
Test: Unit Test (the corresponding tests passing now.)
Change-Id: I8be7dacaa1bf0abb87dcb357c37e58ce511132d2
 2020-07-31 16:49:24 -07:00
Treehugger Robot
8d384c548c Merge "Update language to comply with Android's inclusive language guidance" am: 0521eb758a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384138

Change-Id: If60583d39beeb643bffad3f8e86a07e480ec97cd
 2020-07-31 23:35:50 +00:00
Treehugger Robot
a63b378dec Merge "address use of DummyIME in UI Automator" am: 54bac103d2 am: 4342d200c6 am: adb2c1f51b am: b4cd26b5cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1381318

Change-Id: Ie500f4928527009ab83baf080bb1a4f15c2d8600
 2020-07-31 23:10:17 +00:00
Treehugger Robot
7eea9803a0 Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a am: a42c8fc0c1 am: a3b73fba11 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383078

Change-Id: Idaec3eb44b854a86cae20f7c955acc0e2698800e
 2020-07-31 23:09:44 +00:00
Treehugger Robot
0521eb758a Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 22:50:33 +00:00
Treehugger Robot
b4cd26b5cf Merge "address use of DummyIME in UI Automator" am: 54bac103d2 am: 4342d200c6 am: adb2c1f51b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1381318

Change-Id: I07055a034954023290e83d2334b0040ff00b9080
 2020-07-31 22:42:54 +00:00
Treehugger Robot
a3b73fba11 Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a am: a42c8fc0c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383078

Change-Id: If4cc44baac9e5cd03022e539c2c848b0be873740
 2020-07-31 22:42:02 +00:00
Treehugger Robot
adb2c1f51b Merge "address use of DummyIME in UI Automator" am: 54bac103d2 am: 4342d200c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1381318

Change-Id: I54bd0dd55ff753972b145cc626b017068fa1427f
 2020-07-31 22:30:31 +00:00
Treehugger Robot
4342d200c6 Merge "address use of DummyIME in UI Automator" am: 54bac103d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1381318

Change-Id: I8f049883aefd5900e7264ea6d00a298cad245601
 2020-07-31 22:20:06 +00:00
Treehugger Robot
a42c8fc0c1 Merge "Update language to comply with Android’s inclusive language guidance." am: 262d80ba06 am: 844fc0e52a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1383078

Change-Id: Ic41fd85340530e59a02ce080bd3487e2a876a69e
 2020-07-31 22:19:09 +00:00
TreeHugger Robot
4b187f044a Merge "BluetoothManagerService: enforce BLUETOOTH_PRIVILEGED for onFactoryReset" into rvc-qpr-dev am: d53798ab4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12227685

Change-Id: I683273ba9cfc30904eb5a51d9c71f011e964f9b9
 2020-07-31 22:06:53 +00:00