Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
645,168 Commits 3 Branches 0 Tags
691b69364dfa2fba12dddaa3534730a42b4dffbf
Commit Graph

645168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
691b69364d [automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours am: acfbbafa98 -s ours am: 83a085e8cc -s ours am: 78ad33b608 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: I1309b2f68a875ce6cf2327b08ccd29f9a4a51ea2
 2021-06-28 17:07:43 +00:00
Christopher Tate
6be94c05fb [automerger skipped] Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 am: cb8e4e8db6 am: 8ebf5ba96a am: 1bd2f52715 -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 76e8e04703 is already in history

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

Change-Id: I39583e5016e080876c33d30ace2c40add534fecd
 2021-06-28 17:07:05 +00:00
Hui Yu
7370510868 [automerger skipped] Merge "Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: e51f884f6a" into rvc-qpr-dev am: bc54a29146 -s ours 
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history

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

Change-Id: Id95676561617b104646ec766de28c519d486d217
 2021-06-28 17:06:16 +00:00
Josh Tsuji
b5678c5ac0 Merge "Don't hide AOD icons if we're not in KEYGUARD but will be shortly due to the screen off animation." into sc-dev 2021-06-28 17:04:36 +00:00
TreeHugger Robot
78ad33b608 [automerger skipped] Merge "Fix side effects of trace-ipc and dumpheap commands" into qt-dev am: 956fe588a7 -s ours am: acfbbafa98 -s ours am: 83a085e8cc -s ours 
am skip reason: Merged-In Ie61ab2c3f4bfbd04de09ca99c1116d1129461e8f with SHA-1 4c0b9a5fbd is already in history

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

Change-Id: I67badca23c5a2217c0aa9b09a684aacf90eb3855
 2021-06-28 16:52:38 +00:00
Christopher Tate
1bd2f52715 Fix side effects of trace-ipc and dumpheap commands am: 4c0b9a5fbd am: 5518a714f3 am: cb8e4e8db6 am: 8ebf5ba96a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14982641

Change-Id: I44501af02bca5415ab58cd05d352cde2aff4a8bb
 2021-06-28 16:52:26 +00:00
Hui Yu
bc54a29146 Merge "Merge "BG-FGS-start while-in-use permission restriction improvement." into rvc-dev am: e51f884f6a" into rvc-qpr-dev 2021-06-28 16:50:22 +00:00
Victor Chang
604b00db37 Merge "Remove usage of Math.randomLongInternal" into sc-dev 2021-06-28 16:42:15 +00:00
Kweku Adams
881da35724 Merge "Fix pending job sorting." into sc-dev 2021-06-28 16:29:42 +00:00
Alexander Dorokhine
e665d39fd4 Merge "Port appsearch-service to the system_server_current sdk." into sc-dev 2021-06-28 16:27:55 +00:00
TreeHugger Robot
6fc657d10f Merge "Avoid unnecessary work." into sc-dev 2021-06-28 16:19:09 +00:00
Josh Tsuji
bba0b75b8a Merge "Add flags for new unlock and smartspace transition." into sc-dev 2021-06-28 15:28:24 +00:00
Beth Thibodeau
3e248c3e88 Merge "Adjust media layout to spec" into sc-dev 2021-06-28 15:10:24 +00:00
Beth Thibodeau
32fe72cfb9 Merge "Fix settings gear visibility" into sc-dev 2021-06-28 15:09:20 +00:00
Caitlin Cassidy
614e76dc22 Merge "[Ongoing Call Chip] Fix NPE if the notification doesn't have a content intent." into sc-dev 2021-06-28 14:49:00 +00:00
Patrick Baumann
4fd129b588 Merge "Fixes incorrect array type comparison" into sc-dev 2021-06-28 14:41:01 +00:00
Yi-Ling Chuang
99a680a50f Merge "Make CollapsingToolbarBaseActivity extend FragmentActivity" into sc-dev 2021-06-28 14:14:12 +00:00
Anna Zappone
5ce1b8c6ef Merge "Create RemoteViews for all supported app widget sizes" into sc-dev 2021-06-28 13:11:03 +00:00
TreeHugger Robot
e4147d7370 Merge "Rename keylayout for SnakeByte iDroid:con to match by name" into sc-dev 2021-06-28 13:10:02 +00:00
Flavio Fiszman
17f6df5f03 Merge "Polish Conversations widget Configuration Activity strings" into sc-dev 2021-06-28 12:41:32 +00:00
TreeHugger Robot
7058f9948f Merge "Allow Shell more permissions for TvInputManagerTest." into sc-dev 2021-06-28 11:05:00 +00:00
Riddle Hsu
05e83c1ce9 Merge "Separate trace of trampoline launch with different packages" into sc-dev 2021-06-28 10:44:58 +00:00
Yi-Ling Chuang
acf451f9a7 Make CollapsingToolbarBaseActivity extend FragmentActivity 
Since SettingsTransitionActivity is reverted, make
CollapsingToolbarBaseActivity extend FragmentActivity directly.

Bug: 191335572
Test: rebuild
Change-Id: I6eda699ec97f11f5a89a4bce7be041960c5d6e32
 2021-06-28 18:08:11 +08:00
TreeHugger Robot
d87df18092 Merge "Use DeviceConfig in MediaMetricsManagerService" into sc-dev 2021-06-28 09:58:51 +00:00
Stevie Kideckel
52698a914e Merge "Add clipToOutline to the background views in people tile layouts" into sc-dev 2021-06-28 09:07:56 +00:00
TreeHugger Robot
6f383b1b8e Merge "Export the instance of CoordinatorLayout" into sc-dev 2021-06-28 08:35:04 +00:00
Bill Lin
e606dcbecb Merge "Check shortcut enabled before auto trun on OHM" into sc-dev 2021-06-28 07:34:47 +00:00
Stanley Wang
ef65dc4315 Merge "Fix the problem that the switch should gray out when preference disabled." into sc-dev 2021-06-28 07:23:51 +00:00
Shawn Lin
117ff31a3e Merge "Updating the display bounds when it changes" into sc-dev 2021-06-28 07:00:09 +00:00
shubang
1a8a5e7ac0 Use DeviceConfig in MediaMetricsManagerService 
Bug: 186764459
Test: atest MediaMetricsAtomTests
Change-Id: I1becb0ef3eb8b889719c3aafa8578ff7f9af8a26
 2021-06-28 06:59:50 +00:00
tim peng
435dc859d5 Merge "[Output Switcher] Device status is not updated when a disconnected BT device is connected and activated" into sc-dev 2021-06-28 06:51:47 +00:00
Issei Suzuki
0be68ccabb Merge "Don't apply remote animation on IME when keyguad is going away." into sc-dev 2021-06-28 06:10:02 +00:00
Riddle Hsu
556ca21ecf Merge "Clear invisible transition info" into sc-dev 2021-06-28 05:02:43 +00:00
TreeHugger Robot
ff50eb43a3 Merge "Fix NPE crash in PermissionController" into sc-dev 2021-06-28 03:36:09 +00:00
Louis Chang
c62d247cd5 [automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-dev am: a40db19307 am: 7e8c8d25f6 -s ours 
am skip reason: Merged-In Iac345471ef3badad6b9e5c0cc2873c60938663eb with SHA-1 db7d06c529 is already in history

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

Change-Id: I0adf4af8b7c7b413d253289eec265422a9a9d656
 2021-06-28 03:24:39 +00:00
Louis Chang
7e8c8d25f6 Merge "Avoid locking profile task when it is already lock" into rvc-dev am: a40db19307 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15066851

Change-Id: I73673d0205d2a646adf0422467bd954263cce135
 2021-06-28 02:58:33 +00:00
Louis Chang
ab2e0e835c [automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-qpr-dev am: 20e2f6426e -s ours 
am skip reason: Merged-In Iac345471ef3badad6b9e5c0cc2873c60938663eb with SHA-1 805585ed1b is already in history

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

Change-Id: I780c7320ae9ade837226ca772cae705aa31906fc
 2021-06-28 02:57:54 +00:00
Tim Peng
8849b4b2f2 [Output Switcher] Device status is not updated when a disconnected BT 
device is connected and activated

-reset currentActivePosition to refresh all devices when connected device
is changed

Bug: 190146269
Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest MediaOutputGroupAdapterTest MediaOutputGroupDialogTest
Change-Id: Ifac79a093abc116a12c525d77426dea290c71314
 2021-06-28 02:52:00 +00:00
Louis Chang
a40db19307 Merge "Avoid locking profile task when it is already lock" into rvc-dev 2021-06-28 02:42:19 +00:00
Louis Chang
20e2f6426e Merge "Avoid locking profile task when it is already lock" into rvc-qpr-dev 2021-06-28 02:42:15 +00:00
Chris Li
58854f38cc Merge "Compare min width/height with the longest screen side" into sc-dev 2021-06-28 01:28:22 +00:00
Bill Lin
6061ddc2f7 Check shortcut enabled before auto trun on OHM 
When device (factory)boot, controller regsiter settings
'one_handed_mode_activated' will receive callback, and
the shortcut do not enabled by default, the flow will
go to auto enable one-handed mode feature and leading
unexpedted UX(disabled by default) and testing issue.

Solution:
- Add additional check for shortcut enabled when
  onActivatedActionChanged() callback.
- When setting is pull screen, notify shortcut
  one_handed_mode_activated to reset and align current
  mState when function enabled.

Note:
The setting provider one_handed_mode_activated could set
2 different values when shortcut button pressed
 - "0" mapping to pull screen STATE_NONE
 - "1" mapping to pull screen STATE_ACTIVE
Since show notification do not have state, whenever
onChange callback, we trigger expand notification.

Test: atest WMShellUnitTests
Test: manual factory reset | reboot check Log should show \
      "Shortcut not enabled, skip onActivatedActionChanged()".
Test: manual disable both OHM & shortcut toggle in settings \
      '# adb shell settings --user 0 put secure \
      one_handed_mode_activated 1'
      should not auto enable OHM main toggle.
Bug: 191736174
Bug: 191831415
Bug: 191950195
Fixes: 191812697
Change-Id: Ib9d66fbbcc7e6a52a37bb47efebf90c9d2644508
 2021-06-28 08:30:01 +08:00
Julia Reynolds
0736341861 Merge "Use non-shadowed app icon" into sc-dev 2021-06-27 23:35:07 +00:00
Chris Li
34a7f194a6 Compare min width/height with the longest screen side 
Since we only support 30/70 split in portrait and 50/50 split in
landscape, compare activity min width/height with those only.

Bug: 189180596
Test: manually with Calculator
Change-Id: I521785768fa7e01b2da3b8efd2ff39d31b3ceb7e
 2021-06-27 20:00:10 +00:00
TreeHugger Robot
8e4f478fb8 Merge "Reduce chance for leak in MediaPlayerData" into sc-dev 2021-06-27 14:07:36 +00:00
Stanley Wang
99b691f54c Fix the problem that the switch should gray out when preference 
disabled.

- Use the switch style of SettingsTheme to make the switch UI
  consistent.

Fix: 189062669
Test: robotest and operate the switch preference manually
Change-Id: Ic0280fd3986726008225530fd1705ad7df0b17a6
 2021-06-27 16:28:20 +08:00
Treehugger Robot
6853c263e9 Rename keylayout for SnakeByte iDroid:con to match by name 
This keylayout was introduced in ba81efe04a.
Unfortunately, we cannot match by vid / pid, since this breaks other
devices (like keyboards) that use the same vendor / product id.

Instead, match by name to avoid conflict.

Bug: 191720859
Change-Id: I9dd686ebcd612ca04d41b7b5cadf8442350346c9
Merged-In: I9dd686ebcd612ca04d41b7b5cadf8442350346c9
Test: verified manually
 2021-06-27 08:09:21 +00:00
Ryan Mitchell
5a532f6eed Merge changes Icf81845d,Iea54abf3,I98656314 into sc-dev 
* changes:
  Apply overlay changes with config change
  Version LoadedApk cache using base code path
  Revert "Deprecate Context#createApplicationContext"
 2021-06-27 06:27:58 +00:00
TreeHugger Robot
6540d0c6a4 [automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours am: afd2af6f87 -s ours am: 5cf0bcff67 -s ours am: 72a39d4416 -s ours am: 9a70036bde -s ours 
am skip reason: skipped by user nona

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

Change-Id: I4f9bb8ec7d777ba1ab686e1799bc97b99360a4d0
 2021-06-26 20:23:49 +00:00
TreeHugger Robot
9a70036bde [automerger skipped] Merge "Improve ellipsize performance" into oc-mr1-dev am: 0012f0daae -s ours am: 41378ed286 -s ours am: afd2af6f87 -s ours am: 5cf0bcff67 -s ours am: 72a39d4416 -s ours 
am skip reason: skipped by user nona

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

Change-Id: If2159251fb2e8e7d616e7557041c42fcfd6fe5f7
 2021-06-26 20:14:51 +00:00