Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
751,278 Commits 3 Branches 0 Tags
b12e8e7603a59bbda49f4e3d1fd39c8eaa307b75
Commit Graph

751278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Casey
b12e8e7603 Merge "Ignore all input outside of clipboard UI" into tm-dev am: 15bb168f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17085683

Change-Id: I9e8d424e273048a6409563f33683e209f18dab53
 2022-03-05 03:04:19 +00:00
Matt Casey
15bb168f46 Merge "Ignore all input outside of clipboard UI" into tm-dev 2022-03-05 02:42:59 +00:00
Nate Myren
4607c217b5 Merge "Add settings intelligence config" into tm-dev am: 410e1b73f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17046212

Change-Id: I340ccb2e49f861d9c98c85dcb7785a19bd7f6f7a
 2022-03-05 01:55:07 +00:00
Nate Myren
410e1b73f2 Merge "Add settings intelligence config" into tm-dev 2022-03-05 01:48:36 +00:00
Aaron Liu
b4591df95e Merge "Bouncer: Add title for each auth screen." into tm-dev am: ed72c410a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17072649

Change-Id: I49f2687794e424de102efeff2a3673e234820bff
 2022-03-05 01:44:21 +00:00
Sal Savage
614799e677 Merge "Remove usages of HFP Client audio state APIs" into tm-dev am: 28cb4aaf7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17035305

Change-Id: I77c15fa2058b6dd1d6b65d40d42a6a0a9dee6b78
 2022-03-05 01:43:42 +00:00
Aaron Liu
ed72c410a9 Merge "Bouncer: Add title for each auth screen." into tm-dev 2022-03-05 01:38:08 +00:00
Sal Savage
28cb4aaf7c Merge "Remove usages of HFP Client audio state APIs" into tm-dev 2022-03-05 01:38:05 +00:00
TreeHugger Robot
1404d2e143 Merge "Prevent optimization of common code between framework/sysui" into tm-dev am: df11d2d50c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084964

Change-Id: I2266929972ef621a86a035fd568242d00e39aee5
 2022-03-05 01:34:50 +00:00
James.cf Lin
cdf1cad7f9 Move the new added attr LineBreakStyle to the version T section. am: 3674b1c215 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084097

Change-Id: Ib7c08ec35bdd3ba53831fd286211efc45c67a5e9
 2022-03-05 01:34:26 +00:00
Winson Chiu
ebafc9a564 Merge changes from topics "presubmit-am-a8421206bd26452e95f6cad042b4b6bc", "presubmit-am-db10d76a65b5494fb2108722543f3813" into tm-dev am: c4ab817595 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084045

Change-Id: I39f3ea0dcc65d305aa67da157bce58850ea2b76b
 2022-03-05 01:33:51 +00:00
TreeHugger Robot
8fc61156b6 Revert 'Adding definitions for AccessibilityAction directional swipes.' am: 5a8bea1a5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17084132

Change-Id: I8cc27d247fea706d48245181cfca9c03fad27a3e
 2022-03-05 01:33:47 +00:00
TreeHugger Robot
df11d2d50c Merge "Prevent optimization of common code between framework/sysui" into tm-dev 2022-03-05 01:32:25 +00:00
James.cf Lin
3674b1c215 Move the new added attr LineBreakStyle to the version T section. 
The two attributes LineBreakStyle and LineBreakWordStyle were added in the version S-V2 section in the public.xml file. Move two attributes to the version T section in the public.xml file.

This violates resource finalization, but is done in an attempt to
reconcile differences between master and tm-dev.

Bug: 221172449
Test: atest TextViewTest; atest MeasuredTextTest; atest PrecomputedTextTest; atest TextViewPrecomputedTextTest
Merged-In: Iac54580c3a0a26bd4107342803b5e2eaff011f9c
Change-Id: Iac54580c3a0a26bd4107342803b5e2eaff011f9c
(cherry picked from commit 255581f097)
 2022-03-05 01:15:30 +00:00
Winson Chiu
c4ab817595 Merge changes from topics "presubmit-am-a8421206bd26452e95f6cad042b4b6bc", "presubmit-am-db10d76a65b5494fb2108722543f3813" into tm-dev 
* changes:
  Rename ACTION_SHOW_SUGGESTSIONS TO ACTION_SHOW_TEXT_SUGGESTIONS
  Revert 'Adding definitions for AccessibilityAction directional swipes.'
 2022-03-05 01:03:35 +00:00
Jing Ji
b223fb4bfe Merge "Reset the subreason field while reusing the AppExitInfoTracker record" into tm-dev am: d00d9c2bde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17085687

Change-Id: Ieb2b941fb8035f86981787c79fe23cd8c05b8d17
 2022-03-05 00:47:49 +00:00
yingleiw
a3a06ac231 Rename ACTION_SHOW_SUGGESTSIONS TO ACTION_SHOW_TEXT_SUGGESTIONS 
Fix: 217730256

Bug: 222537368

Test: Added test in EditTextTest (will merge later when reviewed).

Merged-In: I78354a0f1d955c5b7c1ead044ea49086b3479841
Change-Id: I78354a0f1d955c5b7c1ead044ea49086b3479841
(cherry picked from commit e1f392d171)
 2022-03-04 16:42:54 -08:00
Jing Ji
d00d9c2bde Merge "Reset the subreason field while reusing the AppExitInfoTracker record" into tm-dev 2022-03-05 00:42:52 +00:00
Michael Groover
3cae8b67c4 [automerger skipped] Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev am: 7026055322 am: ff844f4337 -s ours am: aeb6b72fcd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18882b188075bfdf46677d5d9256a39e1df878cc
 2022-03-05 00:37:31 +00:00
Michael Groover
ad2ec48fe1 Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into sc-v2-dev-plus-aosp am: dd244b19a4 am: e0cf3e3a84 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: I239fa913b4465f9cb67984627923e86f0a5f1779
 2022-03-05 00:37:18 +00:00
Presubmit Automerger Backend
f84b0e9ce9 [automerger skipped] [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee am: 659d441a9c -s ours am: 2e1878e73d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I92651db6e15eefefcf2f9cc2defa573d05f1d4a1
 2022-03-05 00:37:11 +00:00
Sukanya Rajkhowa
284425e1d5 VoWifi notification for emergency calls am: b6e9b03b83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17034757

Change-Id: Ibfe02ef2ecda3349fe97d81570ec163daa2ef117
 2022-03-05 00:26:56 +00:00
Michael Groover
aeb6b72fcd [automerger skipped] Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev am: 7026055322 am: ff844f4337 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iabe1b33048be61e2fe22a4d5e8f3a539a2f5a1f2
 2022-03-05 00:26:33 +00:00
Michael Groover
e0cf3e3a84 Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into sc-v2-dev-plus-aosp am: dd244b19a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: I694ce6d9211266c226198244e3ea2d22e5419cd5
 2022-03-05 00:25:59 +00:00
Presubmit Automerger Backend
2e1878e73d [automerger skipped] [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee am: 659d441a9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I266a49032c34f999e451f4de2c6fe2ae5db46861
 2022-03-05 00:25:36 +00:00
Michael Groover
ff844f4337 Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev am: 7026055322 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943318

Change-Id: Id1d3ebadd53f391268183ce27f57216e045134c3
 2022-03-05 00:25:21 +00:00
Sukanya Rajkhowa
b6e9b03b83 VoWifi notification for emergency calls 
- Add new intent to send VOWIFI_ENABLED status

Bug: 179122732
Test: Manually verified by simulating
Change-Id: Iaf52a642a0435a070b8280b098e7929cddde55f6
 2022-03-05 00:07:30 +00:00
Michael Groover
dd244b19a4 Merge changes from topic "presubmit-am-bc566b73c1674298b82a1153c03313a1" into sc-v2-dev-plus-aosp 
* changes:
  [automerge] [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition" 2p: 3c36fd5fee
  [DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"
 2022-03-05 00:02:48 +00:00
Michael Groover
7026055322 Merge "[DO NOT MERGE]Revert "Relax minimum signature scheme version for apps on system partition"" into sc-v2-dev 2022-03-05 00:02:48 +00:00
TreeHugger Robot
5a8bea1a5d Revert 'Adding definitions for AccessibilityAction directional swipes.' 
This reverts commit 0de71ca543.

Reason for revert: Don't yet have a use for the definitions,
and will likely reimplement them differently. This is an adjusted
revert to account for a resource finalization error

Test: Is a reversion.

Bug: 222537368

Merged-In: I99a71551069069d117039af4708030772b741cea
Change-Id: I99a71551069069d117039af4708030772b741cea
(cherry picked from commit 65e5bf07c2)
 2022-03-04 15:45:46 -08:00
William Leshner
3afb8b304c Merge "Add error log for adding parented complications." into tm-dev am: 786c9acaa6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17074592

Change-Id: If97d671c0df9e2ba1df10801b2385bdce7bf69fb
 2022-03-04 23:41:37 +00:00
William Leshner
786c9acaa6 Merge "Add error log for adding parented complications." into tm-dev 2022-03-04 23:36:45 +00:00
TreeHugger Robot
bd41b5ae3c Merge "Add a test API to query audio HAL version." into tm-dev am: d3672e192a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17060383

Change-Id: I5cfa99a8725d98fe9b46ab94a3fcb1b9a46bae2e
 2022-03-04 23:32:57 +00:00
TreeHugger Robot
d3672e192a Merge "Add a test API to query audio HAL version." into tm-dev 2022-03-04 23:26:24 +00:00
Bryce Lee
54f85531d8 Merge "Remove communal support from SystemUI." into tm-dev am: 836db75e0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17069901

Change-Id: I13e77b818ea96a8551a7667cbb0e6e4d7f791f23
 2022-03-04 23:20:26 +00:00
Winson Chiu
0a687772dc Merge "AAPT2: support removed_ entries in groups" into tm-dev am: 2222f486b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17085903

Change-Id: I46cbbf68424c896ff72643db962f916667df9653
 2022-03-04 23:19:21 +00:00
Bryce Lee
836db75e0f Merge "Remove communal support from SystemUI." into tm-dev 2022-03-04 22:50:50 +00:00
Winson Chiu
2222f486b2 Merge "AAPT2: support removed_ entries in groups" into tm-dev 2022-03-04 22:48:41 +00:00
TreeHugger Robot
ac395b8a5c [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours am: 3208bd64e6 -s ours am: 5302762a22 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I8ae02a06b83d57bd13085fe90f60df31eaa52ea9
 2022-03-04 22:15:11 +00:00
TreeHugger Robot
6a6132db5d [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours am: b6f75ad032 -s ours am: 4900eace9c -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I9a9fe130d9380d36f5bdc2ba5ac22cfd88c9f292
 2022-03-04 22:15:04 +00:00
Presubmit Automerger Backend
93e16192b0 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours am: b6785cc69b -s ours am: 2646e5f055 -s ours am: 71c381f4f9 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I53d2a833843555c5c02c4145183cf65f26ad2b1f
 2022-03-04 22:14:58 +00:00
Eric Biggers
d8596df6a3 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778 am: 089a351d31 am: 4fb38d5fc3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: Ia888aa400535d2422b25e41576c10211c59db9ca
 2022-03-04 22:14:15 +00:00
Jing Ji
0362d22597 Reset the subreason field while reusing the AppExitInfoTracker record 
Bug: 222752166
Test: manual - dumpsys activity exit-info
Change-Id: I131aee7a87290b0dc31688f9eb779f2f1772237a
 2022-03-04 14:14:12 -08:00
Xiaowen Lei
7e0016c139 Merge "Fix [AndroidFrameworkRequiresPermission] build warnings for add(remove)KeyguardLockedStateListener." into tm-dev am: 788fe7cdb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061596

Change-Id: Ib55513ded11740d2a849b14d9f653aed3a018bb8
 2022-03-04 22:13:47 +00:00
TreeHugger Robot
5302762a22 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours am: 3208bd64e6 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I29a676b5765db32103b143c52fa7eb8ef44369a0
 2022-03-04 22:12:45 +00:00
TreeHugger Robot
4900eace9c [automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6eb -s ours am: e6f05647a4 -s ours am: b6f75ad032 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: If58226e72280f452700c55754a0fba7f7686996e
 2022-03-04 22:12:29 +00:00
Xiaowen Lei
fc84fccd49 Merge "Add SharedPreferences keys for the nudge to setup dream." into tm-dev am: 94184ccae9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061170

Change-Id: I8a08f67731551ca5c6384248a7d999f716b7d6f2
 2022-03-04 22:12:19 +00:00
Presubmit Automerger Backend
71c381f4f9 [automerger skipped] [automerged blank] Keyguard - Treat messsages to lock with priority 2p: f8023c9829 am: 24bedd152e -s ours am: b6785cc69b -s ours am: 2646e5f055 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 563fdf4259 is already in history

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

Change-Id: I0d8dea3d2f35d5a3f4a6af5082875a69ff665df3
 2022-03-04 22:12:17 +00:00
TreeHugger Robot
3208bd64e6 [automerger skipped] Merge "Keyguard - Treat messsages to lock with priority" into sc-dev am: ca8eb0192c -s ours am: 306a4f429a -s ours am: 2c39d9f723 -s ours 
am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c9829 is already in history

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

Change-Id: I97f08a777ff6855ec16668e8d76b5a38a1f77b3e
 2022-03-04 22:11:57 +00:00
Eric Biggers
4fb38d5fc3 Merge "Remove broken code for mounting encrypted OBB files" am: a4f24f08b0 am: 56c37e5778 am: 089a351d31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003052

Change-Id: I87cbb67af5e1dc62ddbb8ff7d58a256ee4569b44
 2022-03-04 22:11:49 +00:00