Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
647,360 Commits 3 Branches 0 Tags
b3b07cdfd7167f34b4c615afc8551ccd349626a0
Commit Graph

647360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mill Chen
fbfd4ef12e Add line spacing multiplier for CollapsingToolbarLayout 
Since there is a problem with a small line spacing between multiline
title of collapsing toolbar in a few locales, that caused the title is
overlapping with each other. Enlarging the line spacing by using
lineSpacingMultiplier to fix it.

Fix: 183223866
Test: visual verified
1) Change to MY locale
2) Navigate to Settings > Sounds & vibration > Do not disturb > Alarms &
other interruptions
3) Observe the title and check if it is overlapping with each other

Change-Id: Ib35ae0edb6fb168293bdb39a926bad5049eece34
 2021-06-28 18:24:44 +08:00
TreeHugger Robot
d0292b7119 Merge "Use DeviceConfig in MediaMetricsManagerService" into sc-dev am: d87df18092 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15027382

Change-Id: Idef2fa59a175c755e53c7d2bdf19ed1bb7d8d50c
 2021-06-28 10:15:53 +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
tomnatan
b871802d61 Override equals and hashCode in PackageOverride 
Bug: 190024878
Test: N/A
Change-Id: If33e246e7cce294ec943186aa850223cc1dd84c8
 2021-06-28 10:03:05 +00:00
TreeHugger Robot
d87df18092 Merge "Use DeviceConfig in MediaMetricsManagerService" into sc-dev 2021-06-28 09:58:51 +00:00
Stevie Kideckel
a3123584cc Merge "Add clipToOutline to the background views in people tile layouts" into sc-dev am: 52698a914e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107818

Change-Id: I6775fa42b297a54d654865a3f1e30578a77bfff5
 2021-06-28 09:17:43 +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
c53732b4f4 Merge "Export the instance of CoordinatorLayout" into sc-dev am: 6f383b1b8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15101226

Change-Id: Ifd49bb71c459cd6e92ebf106d94c8439ff3dc8ee
 2021-06-28 08:52:17 +00:00
TreeHugger Robot
6f383b1b8e Merge "Export the instance of CoordinatorLayout" into sc-dev 2021-06-28 08:35:04 +00:00
Stanley Wang
33c5ed926e Fix the problem that the unknown item will be announced when 
using Switch Access.

- Disable the importantForAccessibility of the MainSwitchBar's
  parent layout.

Fix: 182227784
Test: robotest and operate the switch preference manually
Change-Id: If1780361fcc7d7e0e53400d068ef4d2c31d6d8af
 2021-06-28 16:02:44 +08:00
Bill Lin
950858bb30 Merge "Check shortcut enabled before auto trun on OHM" into sc-dev am: e606dcbecb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15102775

Change-Id: Ifca32ef3b247e86b28050f82a1207c0581f72412
 2021-06-28 07:43:03 +00:00
Stanley Wang
459c478d10 Merge "Fix the problem that the switch should gray out when preference disabled." into sc-dev am: ef65dc4315 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15109464

Change-Id: I3dd20dc7722a232a32b49f3b739128752adc596d
 2021-06-28 07:41:23 +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
d778afe90b Merge "Updating the display bounds when it changes" into sc-dev am: 117ff31a3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15073695

Change-Id: Ib6b3608abb8446c5259596481bba9715d7e4425d
 2021-06-28 07:03:51 +00:00
tim peng
848aad376a Merge "[Output Switcher] Device status is not updated when a disconnected BT device is connected and activated" into sc-dev am: 435dc859d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100487

Change-Id: I140148c4dcdebd48da2b99cbb94c95f2cb6bcf6c
 2021-06-28 07:03:34 +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
8861f3e5aa Merge "Don't apply remote animation on IME when keyguad is going away." into sc-dev am: 0be68ccabb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15105256

Change-Id: I3e66c16841e6f798848f590af3aa7c901ed31ac5
 2021-06-28 06:28:13 +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
e2646ffd1a Merge "Clear invisible transition info" into sc-dev am: 556ca21ecf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100485

Change-Id: I13d787b7748fb992fcdd028d07a16e54a9ed88b5
 2021-06-28 05:23:13 +00:00
Riddle Hsu
556ca21ecf Merge "Clear invisible transition info" into sc-dev 2021-06-28 05:02:43 +00:00
TreeHugger Robot
0938fc250d Merge "Fix NPE crash in PermissionController" into sc-dev am: ff50eb43a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15100488

Change-Id: I1744c57acb1533742f76be65306f7b77ed5b0f62
 2021-06-28 03:39:41 +00:00
TreeHugger Robot
ff50eb43a3 Merge "Fix NPE crash in PermissionController" into sc-dev 2021-06-28 03:36:09 +00:00
Louis Chang
336712f18c [automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-dev am: a40db19307 am: 7e8c8d25f6 -s ours am: c62d247cd5 -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: I0cbe9ce2f0f2346a6c167ac918afba24e813a8f7
 2021-06-28 03:32:04 +00:00
Louis Chang
53e25d5f20 [automerger skipped] Merge "Avoid locking profile task when it is already lock" into rvc-qpr-dev am: 20e2f6426e -s ours am: ab2e0e835c -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: I4e6464edb9912bcf9f9649fe80f0aa4c9264233e
 2021-06-28 03:25:03 +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
5397d5970d Merge "Compare min width/height with the longest screen side" into sc-dev am: 58854f38cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15123858

Change-Id: I36cf2ffcfbde3bbde19ab4b9539bffae337bf3ad
 2021-06-28 01:42:54 +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
5925979e0c Merge "Use non-shadowed app icon" into sc-dev am: 0736341861 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15112055

Change-Id: I3f4ffcb4ed5bc07a0e2443f729309916e1e4a7cd
 2021-06-27 23:52:03 +00: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
c35463b10a Merge "Reduce chance for leak in MediaPlayerData" into sc-dev am: 8e4f478fb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15110150

Change-Id: Ia111019ab7e9c9980a79c90292c2d115f3f7ce63
 2021-06-27 14:22:19 +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
9cd626c564 Merge changes Icf81845d,Iea54abf3,I98656314 into sc-dev am: 5a532f6eed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15058002

Change-Id: If4acdbd45591f6def9eb3b6cb5da204efb8f6fe5
 2021-06-27 06:38:45 +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
b5ec94bf2a [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: 6540d0c6a4 -s ours 
am skip reason: skipped by user nona

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

Change-Id: I213c186ecebc9a720726fd2df75d5bfdab06f090
 2021-06-26 20:33:16 +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
TreeHugger Robot
72a39d4416 [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 skip reason: skipped by user nona

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

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

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

Change-Id: I4c0e19d061aaa0ce9a6a6edc6ec81f88c6bbf41d
 2021-06-26 19:43:25 +00:00