Commit Graph

246497 Commits

Author SHA1 Message Date
Makoto Onuki
5b11a81f9f Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 2016-05-27 22:48:33 +00:00
Android Build Merger (Role)
ddb8133841 Merge "Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90 am: 25967b7577" into nyc-dev 2016-05-27 22:46:28 +00:00
Joe Fernandez
3ccb88b97a Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs am: 580bff3d90
am: 25967b7577

* commit '25967b7577b427b81417848678dad3916b92d6ba':
  docs: update redirects for GMS and GCM reference docs

Change-Id: I383c15867a5a0334b856bedf27ccb93f464a9751
2016-05-27 22:46:01 +00:00
TreeHugger Robot
49b515a2a5 Merge "Fix issue #28930592: Scoring service binding is not reestablished." into nyc-dev 2016-05-27 22:44:19 +00:00
Adrian Roos
2608cc891d Fix crash with intent-less actions
Follow-up to I00d46036a2cbb73f7f733fd35bf0b743a02807a1

Bug: 28818704
Change-Id: I9a444b9dd4cea92b4a770d7051c05c48818892ad
2016-05-27 15:36:30 -07:00
Joe Fernandez
25967b7577 Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs
am: 580bff3d90

* commit '580bff3d90bc08fa6db0edb32abffee8d1bdd563':
  docs: update redirects for GMS and GCM reference docs

Change-Id: Idfd86984163c495995e331e99d182dd33e1bab96
2016-05-27 22:35:26 +00:00
Suprabh Shukla
4ec430e062 Adding Reset Demo Notification
RetailDemoMOdeService adds a notification which allows user to wipe
current session and start a fresh demo session.

Bug: 27280140
Change-Id: I59dd82d236287206a2ca747210b3423fdc62c185
2016-05-27 15:34:54 -07:00
Hang Yin
5c950a8078 Merge "Code Patch for camera preview switch tests" into nyc-dev 2016-05-27 22:34:47 +00:00
Joe Fernandez
580bff3d90 Merge "docs: update redirects for GMS and GCM reference docs" into mnc-io-docs 2016-05-27 22:31:02 +00:00
Winson
399d21e37c Tweaking layout to make two-task stacks to closer match design.
- In the small-stack cases, set the initial state to top-align the
  back-most task.  In addition to offsetting the position, ensure that
  the dim for the back-most task is offset by this new position.
- Fixing issue with wrong return value when update insets.
- Fixing issue where tasks disappear after rotating while scrolling the
  stack, due to the scrollering setting the stack scroll to an invalid
  scroll position in the new layout in the new orientation.

Bug: 27859654
Change-Id: Ia4aaa3fe445032493c94a8dee7f6fea33bee36ec
2016-05-27 15:30:06 -07:00
Joe Fernandez
faaa13e0cb docs: update redirects for GMS and GCM reference docs
b/29003935

Change-Id: I5ad833276dbbfc21a3c5e55a4b2e37d6b3a40dda
2016-05-27 15:24:25 -07:00
Doris Liu
fceaa60e24 Merge "Copy native tree's property when mutate vector drawable" into nyc-dev 2016-05-27 22:17:00 +00:00
Robert Shih
ed78114ffd Fix deadlock when showing subtitles MediaPlayer
Move all SubtitleTrack operations to TimeProvider's event handler thread.

Bug: 28784397
Change-Id: Iff848635390e99ffb19add03277a9d62feece4cc
2016-05-27 15:16:47 -07:00
Doris Liu
3c85983996 Add more doc for Object animators defined with a single value
Bug: 28104516
Change-Id: I181b2817ceda5dfaf87e12c81b21e7d0d2f002fc
2016-05-27 15:08:46 -07:00
Adrian Roos
a7d66aa6b8 Merge "Change app crash dialog strings" into nyc-dev 2016-05-27 22:03:22 +00:00
Adrian Roos
9764fea483 Merge "Simplify crash dialog" into nyc-dev 2016-05-27 22:02:45 +00:00
Adrian Roos
5dbb9ff674 Merge "Fix bad one-line MessagingStyle" into nyc-dev 2016-05-27 22:02:38 +00:00
Adrian Roos
2c69d1ecae Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev 2016-05-27 22:02:14 +00:00
Hang Yin
39aafafa9a Code Patch for camera preview switch tests
This cl will fix the bug: b/28982885. It enables Raw10 Size Array
only when the device support Raw10.

Change-Id: I6a7a9d47708017f71c47fb5bbb15f3e98b555af4
2016-05-27 14:56:14 -07:00
Hemal Patel
8d8718fc53 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43
am: 202017dcbf

* commit '202017dcbf35e54f8aec6f98e5e8b6fe4231f8d5':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I8181c5d1679be85be720fe16fd85561a883ab4ce
2016-05-27 21:45:46 +00:00
Hemal Patel
2b9497069d Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
am: 7a62915c51

* commit '7a62915c51294fcbf491fbe0f0a406ac420e2d34':
  Docs: Removed note in "Platform Versions" section

Change-Id: I4da67d6b00c0e33f6eb99b06479bafb8049f1b8b
2016-05-27 21:45:39 +00:00
Android Build Merger (Role)
d63315e535 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev 2016-05-27 21:42:25 +00:00
Hemal Patel
5c1cd3ec6c Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378
am: 7ff4ee303b

* commit '7ff4ee303bca5372a925453e043375a728eb8d1d':
  Docs: Fixed the end-of-comment tag

Change-Id: I79abb2406163de3928ec9bb473e18c31aa146efa
2016-05-27 21:41:57 +00:00
Hemal Patel
202017dcbf Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs
am: 50f57d1d63

* commit '50f57d1d631eb08744609f9440c935b1e8e86992':
  Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub.

Change-Id: I3c60c8a347283c4f107eef0e4efe3cabd9c8795e
2016-05-27 21:41:48 +00:00
Hemal Patel
7a62915c51 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs
am: 9dfa75ef43

* commit '9dfa75ef43782c596d55de582704566afc540d06':
  Docs: Removed note in "Platform Versions" section

Change-Id: Ie09047db04155b7f37aafdc3ac6a85e390d54143
2016-05-27 21:41:43 +00:00
Akshay Thakker
82a8c5f246 Merge "Revert "Finalize resource IDs for N."" into nyc-dev 2016-05-27 21:41:26 +00:00
Hemal Patel
7ff4ee303b Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs
am: d09caa1378

* commit 'd09caa137854596bb082188b7073eead8b844449':
  Docs: Fixed the end-of-comment tag

Change-Id: I27a07c1d00f840b34683cfb333b8b338ffe60dd3
2016-05-27 21:37:15 +00:00
Christopher Tate
64613753d6 Merge "Purge an app\'s scheduled jobs when the whole package is disabled" into nyc-dev
am: bf932b0067

* commit 'bf932b006743e25e50f5e493b011e520141536d1':
  Purge an app's scheduled jobs when the whole package is disabled

Change-Id: I2bcd03235f2a804d5784c78992276c9e055dcede
2016-05-27 21:32:49 +00:00
Hemal Patel
50f57d1d63 Merge "Docs: Changed GitHub samples link to point to "Google Samples" page on GitHub." into mnc-io-docs 2016-05-27 21:32:25 +00:00
Hemal Patel
9dfa75ef43 Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs 2016-05-27 21:32:05 +00:00
Hemal Patel
d09caa1378 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs 2016-05-27 21:31:24 +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
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
Adrian Roos
e88f60b8bb Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev 2016-05-27 21:18:57 +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
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
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
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
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
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
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
Felipe Leme
8c8ea506d9 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

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

Change-Id: Ibd09b082140b66d25bd8583040761581bb20af76
2016-05-27 20:04:22 +00:00