Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
572,214 Commits 3 Branches 0 Tags
59677e14a76683649fa386d642ad8eaf12a42a72
Commit Graph

572214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
59677e14a7 Merge "Migrate wm package in sysui to WM shell lib (1/n)" 2020-07-22 06:44:56 +00:00
Riddle Hsu
00c5aafbbc Merge "Add debounce for hide animation of fixed rotation recents" 2020-07-22 06:21:24 +00:00
Jerry Chang
919d1d280e Migrate wm package in sysui to WM shell lib (1/n) 
Bug: 161655636
Test: atest WindowManagerShellTests
Test: atest SystemUITests
Change-Id: I42f13ee7fbb14ba3b7f33ed5654ec72454dc6dba
 2020-07-22 11:46:04 +08:00
Chris Craik
3b732c01dc Merge "Switch APCT View tests to Jetpack Benchmark" 2020-07-22 03:39:29 +00:00
TreeHugger Robot
172b4510d1 Merge "Ensures the slop value is fixed cross lines." 2020-07-22 03:22:44 +00:00
TreeHugger Robot
54f5e7335c Merge "Moving AppStateTracker to apex directory" 2020-07-22 01:43:03 +00:00
TreeHugger Robot
3ee646f208 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours am: a4b6ce3b6a -s ours am: afb588dfeb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83c1fe2ae3003b694fe1c784e17db4815cfd01e5
 2020-07-22 01:20:02 +00:00
Automerger Merge Worker
47db26b54d Merge "Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684" into rvc-d1-dev-plus-aosp am: 1995e8a35c am: 72eefeb238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: Ide88b1f4f08fb228a8fffc78e8ef07cc45a6c5e6
 2020-07-22 01:19:51 +00:00
Kevin Hufnagle
ab87c0ea40 Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: eb65f3d86b am: 9b5478a0b9 am: a06702cb71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I14676426a0e76acdc801cf7b0de231983d021777
 2020-07-22 01:19:36 +00:00
TreeHugger Robot
c3a65d4b0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours am: 92e9590e7c -s ours am: f6e3bc298d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I93dcf11135fc08246562246c20c1624dfd95f831
 2020-07-22 01:19:15 +00:00
Kevin Hufnagle
c036e8739c Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: eb65f3d86b am: 64a447986e am: ceff8ff8cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I06e40c41a3991a32a132997288fce9c9c292e704
 2020-07-22 01:18:46 +00:00
TreeHugger Robot
41cc5dbb86 Merge "Allow empty tokens in strict grammar" into rvc-qpr-dev am: 5dd3cded78 am: 16c0823cfd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12205025

Change-Id: Ib039ff67872ee6235d362feccbccbca026ec3e72
 2020-07-22 01:17:58 +00:00
TreeHugger Robot
afb588dfeb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours am: a4b6ce3b6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie73db7ffb5d8a8148ca55ad846b0ebb64864b726
 2020-07-22 01:07:27 +00:00
Automerger Merge Worker
72eefeb238 Merge "Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684" into rvc-d1-dev-plus-aosp am: 1995e8a35c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: Id454e2d2421acac18ea7e747d6e54bf0c9e5606f
 2020-07-22 01:07:00 +00:00
Kevin Hufnagle
a06702cb71 Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: eb65f3d86b am: 9b5478a0b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I2dbfcf3cfb6d1700e49893971239165b27017db6
 2020-07-22 01:06:00 +00:00
TreeHugger Robot
f6e3bc298d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours am: 92e9590e7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9e86dbdf5246d8884002bb08382ee0c354f68c6
 2020-07-22 00:59:58 +00:00
Kevin Hufnagle
ceff8ff8cd Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: eb65f3d86b am: 64a447986e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I4cc8c2f5cce2f184d6dcbfcc8257ca4af8eb4150
 2020-07-22 00:59:42 +00:00
TreeHugger Robot
16c0823cfd Merge "Allow empty tokens in strict grammar" into rvc-qpr-dev am: 5dd3cded78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12205025

Change-Id: I7a2f918920faa775a8ef341711b2182bdfad4630
 2020-07-22 00:59:07 +00:00
TreeHugger Robot
92e9590e7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b50948976b9f83887b50ed3a07d22045e38361f
 2020-07-22 00:47:23 +00:00
TreeHugger Robot
a4b6ce3b6a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d381a1af79 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cee8db09e4046199bdc5b54ff7bbdd6556df219
 2020-07-22 00:47:10 +00:00
Kevin Hufnagle
64a447986e Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: eb65f3d86b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I6124999b50cdfc9b02d5ec5e761c24f7bec5b5a9
 2020-07-22 00:47:02 +00:00
Automerger Merge Worker
1995e8a35c Merge "Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684" into rvc-d1-dev-plus-aosp 2020-07-22 00:46:56 +00:00
Kevin Hufnagle
87587094db Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: 269b829684 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I0ef22dd9c5377dd5a42990abce68cc15935ef72d
 2020-07-22 00:46:42 +00:00
Kevin Hufnagle
9b5478a0b9 Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b am: eb65f3d86b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: If30564dd38a5e5f21373543d66de9158fee4623a
 2020-07-22 00:46:40 +00:00
TreeHugger Robot
5dd3cded78 Merge "Allow empty tokens in strict grammar" into rvc-qpr-dev 2020-07-22 00:39:04 +00:00
TreeHugger Robot
d381a1af79 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-07-22 00:33:18 +00:00
TreeHugger Robot
67bab55dc8 Merge "Handle null media metadata" into rvc-qpr-dev am: 4c438e2082 am: 9cda1e19e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12205023

Change-Id: Ibb7fd0b089e4d948a730ec09b166beba40aacb69
 2020-07-22 00:29:41 +00:00
Kevin Hufnagle
269b829684 Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: If709a97f28281e1da2087535f5dbabaa8e233dd8
 2020-07-22 00:29:19 +00:00
Kevin Hufnagle
eb65f3d86b Merge "docs: Use more inclusive pronouns" into rvc-dev am: 5c4491e04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12196424

Change-Id: I8c487c80dbe20844d5907d9a1b92a9653fae2dfa
 2020-07-22 00:29:12 +00:00
Heemin Seog
0199bad27b Merge "Use CarUserManager and fix broken "add user" button" into rvc-qpr-dev am: 9d96ed4893 am: 13e1b6c7ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181458

Change-Id: Ie94d1e53f6a041c9fd901282af3910fe663d2ff3
 2020-07-22 00:29:07 +00:00
TreeHugger Robot
9cda1e19e3 Merge "Handle null media metadata" into rvc-qpr-dev am: 4c438e2082 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12205023

Change-Id: I3a55463182c949b46a1e0c481917ea7d634197f4
 2020-07-22 00:21:45 +00:00
TreeHugger Robot
4c438e2082 Merge "Handle null media metadata" into rvc-qpr-dev 2020-07-22 00:17:15 +00:00
Heemin Seog
13e1b6c7ff Merge "Use CarUserManager and fix broken "add user" button" into rvc-qpr-dev am: 9d96ed4893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12181458

Change-Id: I7f1c2a42e0b539542b4fc8be786cdd18b9fe1652
 2020-07-22 00:13:58 +00:00
Kevin Hufnagle
5c4491e04b Merge "docs: Use more inclusive pronouns" into rvc-dev 2020-07-22 00:07:00 +00:00
Heemin Seog
9d96ed4893 Merge "Use CarUserManager and fix broken "add user" button" into rvc-qpr-dev 2020-07-21 23:56:26 +00:00
Suprabh Shukla
e4b485fa70 Moving AppStateTracker to apex directory 
Initial change to move the code. Refactorings and cleanup will be done
in a follow up.

Test: make -j
atest FrameworksMockingServicesTests:com.android.server
atest CtsAlarmManagerTestCases
atest CtsJobSchedulerTestCases

Bug: 159041453
Change-Id: I39456a02686cd6fa6d191442ce7a90f41f4d11dd
 2020-07-21 16:41:37 -07:00
TreeHugger Robot
f91ae5de5d Merge "Use unique_ptr when creating InputChannel" 2020-07-21 23:22:12 +00:00
Adam Bookatz
e5db76d906 Merge "Create-user logtag and re-order" 2020-07-21 23:16:23 +00:00
TreeHugger Robot
6010192c06 Merge "Bring back touch events for double tap and double tap and hold." 2020-07-21 23:03:22 +00:00
Hall Liu
b7cffcab32 Allow empty tokens in strict grammar 
In SQLiteQueryBuilder, allow empty tokens when checking for invalid
tokens during the strict grammar check.

Fixes: 151151800
Fixes: 161769478
Test: atest SQLiteQueryBuilderTest#testStrictQueryEmptyToken
Change-Id: Iac1cdd643253fd186a164b863d65d6e92698fd38
(cherry picked from commit e409ec2492)
 2020-07-21 22:48:03 +00:00
Treehugger Robot
b124998000 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 am: 1c4d68f863 am: d8447c1fa6 am: 4ca19816c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I3c4e3df716e14943f97df2192e3f5382d7caba19
 2020-07-21 22:23:44 +00:00
Treehugger Robot
4ca19816c0 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 am: 1c4d68f863 am: d8447c1fa6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: Ie1d8ec63a3672eada17843346805e7a3e4c7c531
 2020-07-21 22:10:51 +00:00
Beth Thibodeau
b30bb354fd Handle null media metadata 
We weren't checking this when filtering out notifications, and we have
fallback options for all the fields we check anyways, so remove the
requirement.

Test: manual
Test: atest
Bug: 161293891
Change-Id: Ia0921afeb6a6ffdc25572ad3734207ce14c7dc5a
(cherry picked from commit 55e80e8f46)
 2020-07-21 22:07:42 +00:00
Beth Thibodeau
08d378946d Merge "Handle null media metadata" 2020-07-21 22:03:11 +00:00
Treehugger Robot
d8447c1fa6 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 am: 1c4d68f863 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I455e3070b6692cd45cf94053b2112c06b87eb2b0
 2020-07-21 21:53:28 +00:00
Treehugger Robot
1c4d68f863 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 am: 0796fa5254 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I85a1b1a2f43df5cf78abc902abb0633fd97bf469
 2020-07-21 21:28:23 +00:00
TreeHugger Robot
1ecf9210b5 Merge "Use std:shared_ptr for InputChannel" 2020-07-21 21:15:45 +00:00
Jay Aliomer
8bc9fd513a Merge "Unlock keyguard for screen recording action" 2020-07-21 21:14:53 +00:00
Heemin Seog
c5f14f9e6a Use CarUserManager and fix broken "add user" button 
Bug: 161476819
Bug: 161546644
Test: manual
      1. switch to existing user
      2. switch to guest
      3. create new user
Change-Id: Ib31dc227b36f554f2c415e9d48df9e25fc9d7e0e
 2020-07-21 14:12:49 -07:00
Treehugger Robot
0796fa5254 Merge "Add KEYCODE_CAPTIONS mapping to LKC KEY_SUBTITLE" am: 3e21dc8b70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365552

Change-Id: I294cc7eb605e6a000b7e6cd765c76595c1c4ff6b
 2020-07-21 21:09:53 +00:00