Ryan Mitchell
96930e4faa
Merge "AAPT: Fixed split resource dumping" into pi-dev am: fb07d82086
...
am: d94160943d
2018-05-08 11:01:37 -07:00
android-build-team Robot
dd209c8c1c
Merge changes I1539580e,I8452e799 into pi-dev am: 8ea760c815
...
am: f0013528bc
2018-05-08 10:57:14 -07:00
android-build-team Robot
160761ecf9
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev am: 188b642ac0
...
am: 9ec1c3fe3a
2018-05-08 10:53:02 -07:00
android-build-team Robot
0a6dc035a2
Merge "Fix intercepting touch events for guts" into pi-dev am: 87ffd28760
...
am: b3e029cb38
2018-05-08 10:48:55 -07:00
Nicolas Geoffray
ecfd6e7148
Merge "Add some JobInfo APIs in light grey." into pi-dev am: da801c2a25
...
am: 5b9acb5fcd
2018-05-08 10:41:49 -07:00
Ryan Mitchell
d94160943d
Merge "AAPT: Fixed split resource dumping" into pi-dev
...
am: fb07d82086
2018-05-08 10:28:36 -07:00
Ryan Mitchell
fb07d82086
Merge "AAPT: Fixed split resource dumping" into pi-dev
2018-05-08 17:17:17 +00:00
android-build-team Robot
f0013528bc
Merge changes I1539580e,I8452e799 into pi-dev
...
am: 8ea760c815
2018-05-08 09:56:11 -07:00
android-build-team Robot
9ec1c3fe3a
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev
...
am: 188b642ac0
2018-05-08 09:46:12 -07:00
android-build-team Robot
8ea760c815
Merge changes I1539580e,I8452e799 into pi-dev
...
* changes:
Volume dialog mulit-streams have 8dp padding
Check if alarm and now times are in schedule
2018-05-08 16:41:47 +00:00
android-build-team Robot
b3e029cb38
Merge "Fix intercepting touch events for guts" into pi-dev
...
am: 87ffd28760
2018-05-08 09:41:04 -07:00
Nicolas Geoffray
5b9acb5fcd
Merge "Add some JobInfo APIs in light grey." into pi-dev
...
am: da801c2a25
2018-05-08 09:35:13 -07:00
android-build-team Robot
188b642ac0
Merge "Fixes a NPE in search manager in CTS tests." into pi-dev
2018-05-08 16:21:39 +00:00
Winson Chung
2e536d12b3
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev am: 0f3698c88a
...
am: 442ab23ca5
2018-05-08 09:21:19 -07:00
android-build-team Robot
87ffd28760
Merge "Fix intercepting touch events for guts" into pi-dev
2018-05-08 16:19:50 +00:00
android-build-team Robot
aed3341bd9
Merge "[Android WebView] print minimum sdk version required for WebView APKs"
2018-05-08 16:15:37 +00:00
Winson Chung
442ab23ca5
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev
...
am: 0f3698c88a
2018-05-08 09:08:01 -07:00
Nicolas Geoffray
da801c2a25
Merge "Add some JobInfo APIs in light grey." into pi-dev
2018-05-08 16:06:04 +00:00
android-build-team Robot
bccadb12f0
Merge "Remove ticker text for screenshot saving notification." into pi-dev am: 70c9a79127
...
am: 069d14cfef
2018-05-08 08:58:44 -07:00
Winson Chung
0f3698c88a
Merge "Cancel any recents animation whenever a display's stack order changes" into pi-dev
2018-05-08 15:51:04 +00:00
android-build-team Robot
069d14cfef
Merge "Remove ticker text for screenshot saving notification." into pi-dev
...
am: 70c9a79127
2018-05-08 08:45:11 -07:00
android-build-team Robot
70c9a79127
Merge "Remove ticker text for screenshot saving notification." into pi-dev
2018-05-08 15:28:31 +00:00
Makoto Onuki
c4e62af65d
Merge "Fix "battery saver" notification keeping coming back." into pi-dev am: f450a7266b
...
am: 9a20164149
2018-05-08 08:25:53 -07:00
android-build-team Robot
b4b616db1e
[automerger skipped] Merge "Adding batterystats history to proto dump." into pi-dev am: 291b944d89
...
am: ccb89f9263
2018-05-08 08:21:33 -07:00
android-build-team Robot
43d83d913e
Merge "Use Meta+Space for hard-keyboard layout switching"
2018-05-08 15:18:47 +00:00
Makoto Onuki
9a20164149
Merge "Fix "battery saver" notification keeping coming back." into pi-dev
...
am: f450a7266b
2018-05-08 08:17:18 -07:00
Beverly
6cb4cafd96
Volume dialog mulit-streams have 8dp padding
...
Change-Id: I1539580e2d848521638b50c10bd51c18ff415268
Fixes: 79353898
Test: visual inspection with multi-stream and dnd
2018-05-08 11:16:02 -04:00
Makoto Onuki
f450a7266b
Merge "Fix "battery saver" notification keeping coming back." into pi-dev
2018-05-08 15:11:57 +00:00
android-build-team Robot
ccb89f9263
Merge "Adding batterystats history to proto dump." into pi-dev
...
am: 291b944d89
2018-05-08 08:11:22 -07:00
Nicolas Geoffray
143ed4d81c
Add some JobInfo APIs in light grey.
...
bug: 79258941
Test: m
Change-Id: Ief508c5785482a28ee0262cc168b01d3b632fbfa
2018-05-08 16:05:03 +01:00
Steven Wu
2b71d79215
Fixes a NPE in search manager in CTS tests.
...
Test: atest CtsSliceTestCases
Change-Id: I9e9b3bbcf0dc980e5189293abcee95ff374e309f
Fixes: 76211625
2018-05-08 11:03:17 -04:00
android-build-team Robot
291b944d89
Merge "Adding batterystats history to proto dump." into pi-dev
2018-05-08 14:58:09 +00:00
android-build-team Robot
05f09f17a1
[automerger skipped] Merge "Store package restriction settings at shutdown" into pi-dev am: ae4a20c75b -s ours
...
am: 769039598b
2018-05-08 07:43:12 -07:00
android-build-team Robot
769039598b
[automerger skipped] Merge "Store package restriction settings at shutdown" into pi-dev
...
am: ae4a20c75b
2018-05-08 07:34:57 -07:00
android-build-team Robot
ae4a20c75b
Merge "Store package restriction settings at shutdown" into pi-dev
2018-05-08 14:22:30 +00:00
Beverly
4b7853ec5f
Check if alarm and now times are in schedule
...
Bug: 77570224
Bug: 79230399
Test: ScheduleCalendarTest
Change-Id: I8452e799189dab0559b49f1e62b18b7106929cd3
2018-05-08 09:24:59 -04:00
Annie Meng
a9b443de16
Merge "Remove unused critical accessibility settings from backup/restore"
2018-05-08 12:45:57 +00:00
Edward Chen
dac3ddcf7f
Merge "Backup and restore default alarm sound setting."
2018-05-08 10:14:29 +00:00
Remi NGUYEN VAN
df6464d890
Merge "Fix testRegisterUsageCallback" am: d0b9f983d6 am: 66674ce8fb
...
am: 6b8e9a0635
2018-05-08 02:24:48 -07:00
Remi NGUYEN VAN
6b8e9a0635
Merge "Fix testRegisterUsageCallback" am: d0b9f983d6
...
am: 66674ce8fb
2018-05-08 02:13:00 -07:00
Remi NGUYEN VAN
66674ce8fb
Merge "Fix testRegisterUsageCallback"
...
am: d0b9f983d6
2018-05-08 02:00:59 -07:00
Remi NGUYEN VAN
d0b9f983d6
Merge "Fix testRegisterUsageCallback"
2018-05-08 07:55:42 +00:00
Winson Chung
0f7ec96b75
Cancel any recents animation whenever a display's stack order changes
...
- The recents animation holds a reference to the stack that the recents
stack was previously behind (before the animation started) and should be
restored behind after the animation ends. Due to the ordering of events,
it is possible for a call to cancelRecentsAnimation() to come in after
we have started the transition to home
ie.
1) in app A
2) touch down on home button -> start recents animation, home stack
saves A stack as the one to restore behind if animation doesn't
finish
3) touch up to trigger button -> PWM to start home activity and
simultaneously proxies the motion even to launcher which happens to
call cancelRecentsAnimation (as a part of a catch all)
4) PWM start activity -> move home stack to top
5) cancelRecentsAnimation from launcher will try to restore the home
stack behind A, when the rest of the system has already thought
that the home stack was already moved to the front and focused
Instead of depending on any particular ordering of events, we can just
cancel the recents animation (without reordering) whenever the display's
stacks change so as not to affect any upcoming changes. There is only
one stack order changed listener (the recents animation, and there can
only be one animation at a time; the previous animation is always
canceled and unregisters the listener when cleaning up.
- Revert the old workaround for Beta 1 in PWM as it doesn't catch other
cases
- Removed confusing code suggesting that we were using a non-default
display (we are always only ever doing this animation for the default
display since that's where we resolved the target stack).
Bug: 73188263
Test: Was able to repro by artificially calling cancelRecentsAnimation
immediately after starting home (and also by swiping up, holding,
then invoking the home via adb (to trigger start activity) and then
releasing (to trigger cancelRecentsAnimation)). Ensure that case
now works.
Test: atest FrameworksServicesTests:RecentsAnimationTest
Test: atest FrameworksServicesTests:ActivityStackTests
Change-Id: Iec1a29b5bb53737b4be3f1a3719c4e7c26313a11
2018-05-07 23:56:14 -07:00
android-build-team Robot
13ca02c1e2
Merge "AOD padding animation should match slice" into pi-dev am: 1b5e2d8b3e
...
am: 299eba7cef
2018-05-07 23:13:15 -07:00
android-build-team Robot
299eba7cef
Merge "AOD padding animation should match slice" into pi-dev
...
am: 1b5e2d8b3e
2018-05-07 23:03:51 -07:00
android-build-team Robot
1b5e2d8b3e
Merge "AOD padding animation should match slice" into pi-dev
2018-05-08 05:52:36 +00:00
Remi NGUYEN VAN
ada973be57
Merge "Fix testUidPoliciesToString" am: c8613f9965 am: 717f4e19d8
...
am: 44e953f177
2018-05-07 22:47:55 -07:00
Remi NGUYEN VAN
44e953f177
Merge "Fix testUidPoliciesToString" am: c8613f9965
...
am: 717f4e19d8
2018-05-07 22:32:14 -07:00
Remi NGUYEN VAN
717f4e19d8
Merge "Fix testUidPoliciesToString"
...
am: c8613f9965
2018-05-07 22:24:56 -07:00
Wei Sheng Shih
d8727bd98f
Merge "Reload wallpaper after user unlock." into pi-dev am: f687efc455
...
am: 42e687a61a
2018-05-07 21:48:04 -07:00
