Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
652,793 Commits 3 Branches 0 Tags
4ec930b354fa199c2e6d1db6a74beba679812bd9
Commit Graph

652793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
4ec930b354 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c723111fbb -s ours am: 0e139daafe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62c192c0dd94b7bcee36b43cfbd13eaecab2bbd9
 2021-06-15 14:33:37 +00:00
Automerger Merge Worker
f57233dbec Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9d3c99d8d8 -s ours" into sc-dev am: 482a5edcc8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib93c3008d0809f541c9bab7121f52a73a8209734
 2021-06-15 14:33:32 +00:00
TreeHugger Robot
c967a5a38c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ee64bc8a73 -s ours am: 321845d7c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3825e6c44601da5a681c7c84c261103fec0d88b9
 2021-06-15 14:33:23 +00:00
TreeHugger Robot
0e139daafe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: c723111fbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2ceceb7f5def37ba97e354c150cf95c0ec0045e
 2021-06-15 14:30:25 +00:00
Automerger Merge Worker
482a5edcc8 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9d3c99d8d8 -s ours" into sc-dev 2021-06-15 14:30:21 +00:00
TreeHugger Robot
46d17363f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9d3c99d8d8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3075784b0c2a4da0ca6743cbc2d6025f324b8b45
 2021-06-15 14:30:11 +00:00
TreeHugger Robot
321845d7c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: ee64bc8a73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05053e2b77532a51ac8d98ee6cb0b6582b15695c
 2021-06-15 14:30:09 +00:00
TreeHugger Robot
2b35f9e6f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 593ea89475 -s ours am: c584c78e25 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbf1e23aef28d6b217063a903f212c9bffc02da4
 2021-06-15 14:30:08 +00:00
TreeHugger Robot
3f9edab542 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0f0d124aa7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65887081c2b2f2eb7d899e44bf49507e2d86f7fb
 2021-06-15 14:30:01 +00:00
TreeHugger Robot
3281befb46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4160f1e3c1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If30b1928479ff6b8d485bc794615158831bae9f9
 2021-06-15 14:29:43 +00:00
TreeHugger Robot
c584c78e25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 593ea89475 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80da61cb530035cd524073303e1f83096730f429
 2021-06-15 14:29:40 +00:00
TreeHugger Robot
c723111fbb Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-15 14:21:44 +00:00
TreeHugger Robot
ee64bc8a73 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-15 14:20:14 +00:00
TreeHugger Robot
9d3c99d8d8 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-15 14:19:07 +00:00
TreeHugger Robot
0f0d124aa7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-15 14:18:24 +00:00
TreeHugger Robot
4160f1e3c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-15 14:16:03 +00:00
TreeHugger Robot
593ea89475 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-06-15 14:13:55 +00:00
Stanley Wang
5996107edb Merge "Remove the pause icon from IllustrationPreference." into sc-dev am: 469cd310c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972857

Change-Id: Ie0b3e98c0d5486d8f516c821a22ba88ec3386af0
 2021-06-15 13:34:59 +00:00
Jeff DeCew
21341b92c9 Merge "Prevent exception when temporarily detaching the RemoteInputView's EditText." into sc-dev am: 0b2f05287c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14938832

Change-Id: I5d00d4b4003232b808cc265071b53d1de826f75a
 2021-06-15 13:34:19 +00:00
Stanley Wang
469cd310c4 Merge "Remove the pause icon from IllustrationPreference." into sc-dev 2021-06-15 13:29:03 +00:00
Jeff DeCew
0b2f05287c Merge "Prevent exception when temporarily detaching the RemoteInputView's EditText." into sc-dev 2021-06-15 13:21:23 +00:00
Sorin Basca
01c0ea50f8 Merge "Revert "Use DeviceConfig in MediaMetricsManagerService"" into sc-dev am: 5829bd558a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14974995

Change-Id: I9023305776c258f6021b42a3bcee88865631955c
 2021-06-15 12:57:37 +00:00
Bill Yi
4c3e76d2f2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie4b12e7af9e3f753f7925159623eabfd5cc4dca5
 2021-06-15 12:47:09 +00:00
Sorin Basca
5829bd558a Merge "Revert "Use DeviceConfig in MediaMetricsManagerService"" into sc-dev 2021-06-15 12:46:49 +00:00
Sorin Basca
50540eaa1c Revert "Use DeviceConfig in MediaMetricsManagerService" 
This reverts commit d21b78c125.

Reason for revert: Broken MediaMetricsAtomTests tests

Bug: 191136205
Change-Id: I8187d7f104115f8935fc0eaa0ee8ffcdca393609
 2021-06-15 12:45:25 +00:00
Bill Yi
dc3cd59cc0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I98cbd74db9e634bf0fd7c2441897b27b16bea7fe
 2021-06-15 12:40:13 +00:00
Bill Yi
38a90ca2ca Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I502c46083628757bd8b35aa10cbb14796cfad148
 2021-06-15 12:33:43 +00:00
Bill Yi
da122c95c7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iee70413da5a7cbccc7770a05ea967191933b7b6e
 2021-06-15 12:29:21 +00:00
Bill Yi
c055a9d4fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I945d3ff48a18df0102206f98324b118d2392f365
 2021-06-15 12:26:39 +00:00
Bill Yi
1c01fb1538 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I40384e5a482d980b09cc79a8d55c206b3c631e5f
 2021-06-15 12:23:49 +00:00
Tom Natan
4692b0ad96 Merge "Avoid locking mChanges when not necessary" into sc-dev am: 7dfe7b74a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14971030

Change-Id: I72c63956235d9609d31f5c93aa12136c668ed095
 2021-06-15 11:27:12 +00:00
Tom Natan
7dfe7b74a7 Merge "Avoid locking mChanges when not necessary" into sc-dev 2021-06-15 10:37:31 +00:00
TreeHugger Robot
18a0a8dade Merge "Call route selected/unselected callbacks" into sc-dev am: 9f333ab2c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957149

Change-Id: Id461267d6f5524081d7e09977abdec91a7469c11
 2021-06-15 09:40:20 +00:00
TreeHugger Robot
9f333ab2c8 Merge "Call route selected/unselected callbacks" into sc-dev 2021-06-15 09:25:38 +00:00
TreeHugger Robot
dbf23b8524 Merge "Check for permission on every @Override method." into sc-dev am: f680d8a493 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934059

Change-Id: If8e3b00fda12ce29e21edb2a9d046b776143f6d1
 2021-06-15 09:12:27 +00:00
TreeHugger Robot
f680d8a493 Merge "Check for permission on every @Override method." into sc-dev 2021-06-15 08:51:38 +00:00
Jin Seok Park
e7af95039c Merge "Check nullity of ResultReceiver" into sc-dev am: 0f7813ec5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972761

Change-Id: Ie13143525337f6482c1e9fb627349fe845fd1f6a
 2021-06-15 08:25:05 +00:00
Stanley Wang
0935e11743 Remove the pause icon from IllustrationPreference. 
Fix: 189426848
Test: robotest and test the IllustrationPreference manually.
Change-Id: I6087adb99e6b23642d952165073e4e3468397dab
 2021-06-15 16:15:58 +08:00
Jin Seok Park
0f7813ec5e Merge "Check nullity of ResultReceiver" into sc-dev 2021-06-15 08:12:52 +00:00
Sungsoo Lim
6adeb2c9f1 Call route selected/unselected callbacks 
Bug: 168093983
Test: manually
Change-Id: Id48870052f1d3fefb8bdbf1b7ba3636c7138b53d
 2021-06-15 16:07:36 +09:00
TreeHugger Robot
c5d14a445a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 22a8a5fe93 -s ours am: 9328e1c7fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I459f6024e8d39bdf568cdb7abdf8df8382ddedf3
 2021-06-15 07:04:06 +00:00
TreeHugger Robot
9328e1c7fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 22a8a5fe93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f16503e4e2e88bda5c2e11e766851331d4ce6d8
 2021-06-15 06:58:33 +00:00
Tony Huang
751c068b24 Merge "Using rotate split layout while split active" into sc-dev am: e59e08b8f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909655

Change-Id: If2177bc4f6c21d38efd5b647c57098a8a21443b2
 2021-06-15 06:58:12 +00:00
Tony Huang
e59e08b8f2 Merge "Using rotate split layout while split active" into sc-dev 2021-06-15 06:50:54 +00:00
TreeHugger Robot
548e68e393 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-06-15 06:49:23 +00:00
TreeHugger Robot
22a8a5fe93 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-06-15 06:46:43 +00:00
Jin Seok Park
6d62a4711f Check nullity of ResultReceiver 
Bug: 182164496
Test: N/A
Change-Id: I96bdef1c79f8f91d33d6a6a734bc94e162a5ea33
(cherry picked from commit 2d12628ecc)
 2021-06-15 06:36:38 +00:00
TreeHugger Robot
f1e6f86759 Merge "Fix Preference mis-alignment" into sc-dev am: d53354eb95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14972759

Change-Id: I5eaf93d0701c4da80a3062e9ecb3e6fa047f5b65
 2021-06-15 06:29:45 +00:00
TreeHugger Robot
d53354eb95 Merge "Fix Preference mis-alignment" into sc-dev 2021-06-15 06:20:02 +00:00
Bill Yi
098560a4bb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I99e54d365a5135c2bc999143d93f5a76605deceb
 2021-06-15 05:15:34 +00:00