Commit Graph

266851 Commits

Author SHA1 Message Date
Adrian Roos
d08158782c Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev am: e88f60b8bb
am: f563836a85

* commit 'f563836a85f69a7abb7b8befe42c488dcb77ea57':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I08faeaf768bda8698224045d871b7f82aa31e22b
2016-05-27 21:31:01 +00:00
Adrian Roos
93276bd754 Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c
am: b35bd449a7

* commit 'b35bd449a709b1ccef0d70e3f804f938cee77c89':
  Notification: Fix bug with sliding action list

Change-Id: Ibbce96ec8af7a6e20689e45e02fb66516c1a1064
2016-05-27 21:30:55 +00:00
Ian Rogers
a5feec52a6 Fix bad locking.
When synchronizing on a field, it should be final to avoid locking on different
objects.
Missing synchronization on use of mRunning caught by Error Prone's @GuardedBy
checker.
Bug: 27723540

Change-Id: I9d7c9e37f8ef5f7f49707bfdf607a6b73b9654d8
2016-05-27 14:30:06 -07:00
Bart Sears
63a75e3b89 Revert "Remove ActivityManager calls with PM.mInstallLock held"
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
2016-05-27 21:28:50 +00:00
Adrian Roos
7aaf3aea00 Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev
am: e88f60b8bb

* commit 'e88f60b8bba7aeb6aa42f3baa78fa9a1e1767373':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I27794ef734161405862eac2446b51ae81145c8a2
2016-05-27 21:27:34 +00:00
Adrian Roos
f563836a85 Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev
am: e88f60b8bb

* commit 'e88f60b8bba7aeb6aa42f3baa78fa9a1e1767373':
  NotificationStackScroller: Fix scrollTo for notification groups

Change-Id: I743a924db07d37fca9c63c2bb47d8eb03b500790
2016-05-27 21:27:33 +00:00
Adrian Roos
b35bd449a7 Merge "Notification: Fix bug with sliding action list" into nyc-dev
am: 06fe24341c

* commit '06fe24341cd07cee044527cab61345355802fa54':
  Notification: Fix bug with sliding action list

Change-Id: I40870263f8b3d25bbd7f353259fde14ae0cf63c0
2016-05-27 21:27:32 +00:00
Adrian Roos
389c4e67e9 Merge "Notification: Fix bug with sliding action list" into nyc-dev
am: 06fe24341c

* commit '06fe24341cd07cee044527cab61345355802fa54':
  Notification: Fix bug with sliding action list

Change-Id: Ib59010775d30fff796fc03ee9ed1881f3be0849e
2016-05-27 21:27:31 +00:00
Chris Tate
bf932b0067 Merge "Purge an app's scheduled jobs when the whole package is disabled" into nyc-dev 2016-05-27 21:26:17 +00:00
Greg Hackmann
cac03c5cdf Merge "AlarmManagerService: remove legacy /dev/alarm support" am: 1f336bb051
am: 2c4b276df4

* commit '2c4b276df4ea5655d41b8e239ca44ef6559e485d':
  AlarmManagerService: remove legacy /dev/alarm support

Change-Id: I4cb2036c9a06adaaf9b93bc35821106dc2144c67
2016-05-27 21:25:54 +00:00
Android Build Merger (Role)
8f65100c07 Merge "Fix weirdness when home task forces rotation am: a6c05d5151 am: 1f1d754440" into nyc-mr1-dev-plus-aosp 2016-05-27 21:23:15 +00:00
Android Build Merger (Role)
00f5ffb929 Merge "Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c am: 26dea2d518" into nyc-mr1-dev-plus-aosp 2016-05-27 21:23:01 +00:00
Android Build Merger (Role)
0316a937ce Merge "Merge "Revert commits related to wallpaper cropping" into nyc-dev am: 0b56cc2804 am: 78b9d20449" into nyc-mr1-dev-plus-aosp 2016-05-27 21:22:46 +00:00
Jorim Jaggi
af31954561 Fix weirdness when home task forces rotation am: a6c05d5151
am: 1f1d754440

* commit '1f1d754440f075ec9e5b1708331e8ae4ed6044b1':
  Fix weirdness when home task forces rotation

Change-Id: Ib3bb20217b35e47a6d133db76ebfb3ab739890b4
2016-05-27 21:22:16 +00:00
Jorim Jaggi
8faa43e50d Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c
am: 26dea2d518

* commit '26dea2d518dcce38eee8e4fb639d4f78baf94e8b':
  Close IME when attaching dock stack

Change-Id: I9bee0140f830548712e33e5c7774eebd8d95de71
2016-05-27 21:22:13 +00:00
Chong Zhang
9db345cd3d Merge "Revert commits related to wallpaper cropping" into nyc-dev am: 0b56cc2804
am: 78b9d20449

* commit '78b9d204493f4620e12b4bcd2e1ff9b19c794e9c':
  Revert commits related to wallpaper cropping

Change-Id: I4dfe9f34790c02f4d7a8bcd8bd7feb1155e70159
2016-05-27 21:22:11 +00:00
Jorim Jaggi
9e5ec8eefe Fix weirdness when home task forces rotation am: a6c05d5151
am: ca0e846528

* commit 'ca0e846528807fb01b21e7c241953bb3b18987c5':
  Fix weirdness when home task forces rotation

Change-Id: I759b533737dd1d400e7aa120d3184919d1082ef9
2016-05-27 21:21:04 +00:00
Jorim Jaggi
bdcfbf442b Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c
am: 819cbb3dd3

* commit '819cbb3dd32bb0c721b4fef427f4ed84e208b15a':
  Close IME when attaching dock stack

Change-Id: I31b42a8f971f74e11febe9635fa6489924914226
2016-05-27 21:20:58 +00:00
Chong Zhang
f536ab9b26 Merge "Revert commits related to wallpaper cropping" into nyc-dev am: 0b56cc2804
am: 7414dad254

* commit '7414dad25426161d1f620c97ab586fc92835fdf1':
  Revert commits related to wallpaper cropping

Change-Id: Icc83adb00ee5c3a9dc6bdaf154038a596cbb5675
2016-05-27 21:20:50 +00:00
Adrian Roos
e88f60b8bb Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev 2016-05-27 21:18:57 +00:00
Greg Hackmann
2c4b276df4 Merge "AlarmManagerService: remove legacy /dev/alarm support"
am: 1f336bb051

* commit '1f336bb051e4d11ff3f8cdc2aa9486116c3f2b34':
  AlarmManagerService: remove legacy /dev/alarm support

Change-Id: Iaf69b28333c62572327d8a4362e714a7a5e44de2
2016-05-27 21:18:22 +00:00
Adrian Roos
06fe24341c Merge "Notification: Fix bug with sliding action list" into nyc-dev 2016-05-27 21:17:27 +00:00
Jorim Jaggi
1f1d754440 Fix weirdness when home task forces rotation
am: a6c05d5151

* commit 'a6c05d5151027f902c5c56bded008cbe15bd6301':
  Fix weirdness when home task forces rotation

Change-Id: If9266da74110928a7eb7ee33ab9db1d85c4dc1ae
2016-05-27 21:15:32 +00:00
Jorim Jaggi
26dea2d518 Merge "Close IME when attaching dock stack" into nyc-dev
am: c5fc6c602c

* commit 'c5fc6c602c16f0e985d8f8ba7f94075229e52320':
  Close IME when attaching dock stack

Change-Id: I40abf80fcea522c8082e622c33f3a6726f781145
2016-05-27 21:15:26 +00:00
Jorim Jaggi
ca0e846528 Fix weirdness when home task forces rotation
am: a6c05d5151

* commit 'a6c05d5151027f902c5c56bded008cbe15bd6301':
  Fix weirdness when home task forces rotation

Change-Id: I498aac192a0f819cf0e28c8b32b99380a1acbd0d
2016-05-27 21:15:23 +00:00
Jorim Jaggi
819cbb3dd3 Merge "Close IME when attaching dock stack" into nyc-dev
am: c5fc6c602c

* commit 'c5fc6c602c16f0e985d8f8ba7f94075229e52320':
  Close IME when attaching dock stack

Change-Id: I7921bf88bb49134d1fbde752d5fa963786ec1d46
2016-05-27 21:15:22 +00:00
Chong Zhang
78b9d20449 Merge "Revert commits related to wallpaper cropping" into nyc-dev
am: 0b56cc2804

* commit '0b56cc2804a8cd60bc4a4a0c2870236ffa15e68a':
  Revert commits related to wallpaper cropping

Change-Id: I4475e2ce6818da6e1deb256662f149aad30bc342
2016-05-27 21:15:21 +00:00
Chong Zhang
7414dad254 Merge "Revert commits related to wallpaper cropping" into nyc-dev
am: 0b56cc2804

* commit '0b56cc2804a8cd60bc4a4a0c2870236ffa15e68a':
  Revert commits related to wallpaper cropping

Change-Id: I244af4f1c048ecc4acb17b876b1f179fa66bdfab
2016-05-27 21:15:19 +00:00
Treehugger Robot
1f336bb051 Merge "AlarmManagerService: remove legacy /dev/alarm support" 2016-05-27 21:12:15 +00:00
Jorim Jaggi
a6c05d5151 Fix weirdness when home task forces rotation
- Make sure to retain the state when divider goes through a configuration
change in order to avoid that nothing happens when entering multi-window.
Save the state in DividerState and use a handler that's independant of the
attached state.
- Don't allow home task to dictate orientation unless the docked stack is
minimized. This caused a lot of weird bugs because when docking a task,
home stack gets moved to front, and if home task is front of stack, it
temporarily might dictate the rotation but later not anymore so this
causes two rapid configuration changes which may cause a lot of weirdness.

Change-Id: I6a2308af893cd8413ee8801e5b964f6ddc0abd51
Fixes: 28943853
2016-05-27 21:09:22 +00:00
Jorim Jaggi
c5fc6c602c Merge "Close IME when attaching dock stack" into nyc-dev 2016-05-27 21:08:51 +00:00
Chong Zhang
0b56cc2804 Merge "Revert commits related to wallpaper cropping" into nyc-dev 2016-05-27 21:08:41 +00:00
Jorim Jaggi
3c5d0f1041 Close IME when attaching dock stack
So we don't end up with animation weirdness.

Bug: 28905720
Change-Id: I04124995dd99fa26d2e9be467c5976d7b20810a7
2016-05-27 21:08:39 +00:00
Selim Cinek
8854328be0 Merge "Added strings for translation with the expand affordance" into nyc-dev am: 08c46581a2
am: fb9d25e14a

* commit 'fb9d25e14a7b46c0ab314930630c476af1a07d5c':

Change-Id: Ie1b3879e2d9eb2cf360cfc4003b5abf1f0264be0
2016-05-27 21:03:14 +00:00
Selim Cinek
4ded23e0ab Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev am: 2fba229166
am: 0d33e08779

* commit '0d33e0877903a6791a6c2e2e3ab9c89695e0555a':

Change-Id: Ifcaec781b920725759c30ea7f4607638acfbd727
2016-05-27 21:03:09 +00:00
Selim Cinek
cbbac3d499 Merge "Added strings for translation with the expand affordance" into nyc-dev am: 08c46581a2
am: 96b28a7e67

* commit '96b28a7e67ea0546d459c1543fa52db9efa4f95d':
  Added strings for translation with the expand affordance

Change-Id: Idff3860aa1cd650e0a66f303f44c21654f833dcc
2016-05-27 20:56:29 +00:00
Selim Cinek
056712327a Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev am: 2fba229166
am: 48eb3702fe

* commit '48eb3702fe8d5d3e3c46a6ef819796f05e0b31f7':
  Fixed a bug where a notification could be stuck in the overlay

Change-Id: I19f1b905ea5233e6aa9677a3e5cb0bb1d47eacc1
2016-05-27 20:56:24 +00:00
Selim Cinek
fb9d25e14a Merge "Added strings for translation with the expand affordance" into nyc-dev
am: 08c46581a2

* commit '08c46581a28a90c108e6a548f39a829446464d4d':
  Added strings for translation with the expand affordance

Change-Id: Iedf280b61c678bd97054e07acae7466760aed5dd
2016-05-27 20:53:17 +00:00
Selim Cinek
96b28a7e67 Merge "Added strings for translation with the expand affordance" into nyc-dev
am: 08c46581a2

* commit '08c46581a28a90c108e6a548f39a829446464d4d':
  Added strings for translation with the expand affordance

Change-Id: Id31b5d85093644e65f63b4b0da8914330ca165e1
2016-05-27 20:53:15 +00:00
Selim Cinek
0d33e08779 Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev
am: 2fba229166

* commit '2fba229166213fe755ce9d1c982ff191e885c854':
  Fixed a bug where a notification could be stuck in the overlay

Change-Id: I139233be3769760c0b7b9730a246cc6358dbd21f
2016-05-27 20:53:10 +00:00
Selim Cinek
48eb3702fe Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev
am: 2fba229166

* commit '2fba229166213fe755ce9d1c982ff191e885c854':
  Fixed a bug where a notification could be stuck in the overlay

Change-Id: I3ad2960fe0c077b7db539ac094269034c4558757
2016-05-27 20:53:09 +00:00
Ian Rogers
310ddc313f Fix NaN test.
Found by Error Prone.
Bug: 27723540

Change-Id: Ia4fc511a634e76508384c83dc74d6d01ab1bc839
2016-05-27 13:51:40 -07:00
Selim Cinek
08c46581a2 Merge "Added strings for translation with the expand affordance" into nyc-dev 2016-05-27 20:47:22 +00:00
Selim Cinek
2fba229166 Merge "Fixed a bug where a notification could be stuck in the overlay" into nyc-dev 2016-05-27 20:47:07 +00:00
Hall Liu
7dac366a7f Disable app pinning when emergency call button pressed
Also disables app pinning when the "return to call" button is pressed
and brings up the in-call screen when app pinning is stopped if there is
an existing call.

Bug: 28558307
Change-Id: I7672123bfa6ba6b5e960bd5166876c50425d3f76
2016-05-27 13:46:27 -07:00
Daniel Yu
0cc7c69bf7 docs: Updating GuidedStepFragment for 23.2, new action types
Adding docs for some updates for GuidedStepFragment and GuidedAction
done in support lib v23.2. Includes docs on date picker actions,
subactions (new subsection), button actions (new subsection).
Adding docs for popBackStackToGuidedStepFragment and
finishGuidedStepFragments convenience methods.
Also updating page keywords so this page has better search
discoverability.

Staged: https://android-dot-devsite.googleplex.com/training/tv/playback/guided-step.html

Bug: 26902886
Original SHA1: I792bbe6696cd144dbb6319b3c4eb44e67390217d

Change-Id: I57aeb9deb59bb2cdf5a062b24916b625e1553cf0
2016-05-27 13:44:04 -07:00
Philip P. Moltmann
9ae33a0a81 Allow to select range unless we are finishing
Fixes: 29004971
Change-Id: I6b76a1f315cce64deab9b1561e5e784aac8ef1b1
2016-05-27 13:30:53 -07:00
Felipe Leme
0128d64c38 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860
am: feaa8982fc

* commit 'feaa8982fcd19ec9dbaa2eb5cd19dcfd349dfebf':

Change-Id: I212cf91074757314c749114457416296a9206e08
2016-05-27 20:14:18 +00:00
Felipe Leme
d786355405 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860
am: 8c8ea506d9

* commit '8c8ea506d91db44de1d312612a8f63ab107af799':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Iaffe5981b299eca5756666bd03c67a84c8e15283
2016-05-27 20:08:59 +00:00
The Android Automerger
6f2f02e4ae Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
  docs: Refinements for testing
  Fix toast with accessibility and app pinning
  Updated link to material design page.
  Change overdraw test to use windowbackground
  Prevent callbacks during DrawableContainer child initialization
  Fixing crash in SysUI due to invalid group.
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
  Fix Activity Transition mess-up.
  Time to #NameAndroidN!
  Prevent use of a null sCallbackObj by Hardware FLP
  Fixed the relative time spoken with accessibility
  Use backstop timeouts on asynchronous countdown during preflight
2016-05-27 20:05:56 +00:00