Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
255,075 Commits 3 Branches 0 Tags
bcbed91c2fd96fbe96c8d2633c0c6ecb4e2df481
Commit Graph

255075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hang Yin
a23ed40af7 Merge "Code Patch for camera preview switch tests" into nyc-dev 
am: 5c950a8078

* commit '5c950a8078e37eb9057da4aa5b3355189b675291':
  Code Patch for camera preview switch tests

Change-Id: I90e4880c7ec7d41c7b4b402b66c6e25b0006eb64
 2016-05-27 22:40:26 +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
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
8fc70289b5 Merge "Copy native tree\'s property when mutate vector drawable" into nyc-dev 
am: fceaa60e24

* commit 'fceaa60e249575021e41b873673e12d9b4123fbe':
  Copy native tree's property when mutate vector drawable

Change-Id: I86969033da46b58268df0ea026749f992068bc2b
 2016-05-27 22:22:14 +00: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
ca89f7b69f Merge "Change app crash dialog strings" into nyc-dev 
am: a7d66aa6b8

* commit 'a7d66aa6b86865b223bd3b0d906b9a0f95e7c3b5':
  Change app crash dialog strings

Change-Id: Ib8a6a2972671b1b60b02afcda9e8b93508b98c27
 2016-05-27 22:08:23 +00:00
Adrian Roos
20962d345a Merge "Simplify crash dialog" into nyc-dev 
am: 9764fea483

* commit '9764fea48350e9148b606f8e10686e298437e440':
  Simplify crash dialog

Change-Id: I99e6f68890067cc55422ef11686bd40a6185fd1a
 2016-05-27 22:08:15 +00:00
Adrian Roos
d70126ec78 Merge "Fix bad one-line MessagingStyle" into nyc-dev 
am: 5dbb9ff674

* commit '5dbb9ff67468979214542eb6a448711d2d614cdb':
  Fix bad one-line MessagingStyle

Change-Id: I3dd2c32f3fee1e61d63da8903ae468d9e8da19c0
 2016-05-27 22:08:06 +00:00
Adrian Roos
85e60d203e Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev 
am: 2c69d1ecae

* commit '2c69d1ecae5efff06a29bec3d73f9654b8851972':
  Fix IME and NavBar overlap with Direct Reply

Change-Id: I6a3b377cc8604561927c416b18e46eee167233c8
 2016-05-27 22:07:56 +00: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
2e63ef3cac Merge "Docs: Removed note in "Platform Versions" section" into mnc-io-docs am: 9dfa75ef43 am: 202017dcbf 
am: 8d8718fc53

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

Change-Id: Ic71122b66262a62a26c043d25f45120a46c4c5cd
 2016-05-27 21:48:39 +00:00
Hemal Patel
6501ac3bf9 Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7a62915c51 
am: 2b9497069d

* commit '2b9497069dbabdd1f3fd6668c86922d52b9246fd':
  Docs: Removed note in "Platform Versions" section

Change-Id: I172d2d3ccef84e13dbd6167c60a91f938fae0102
 2016-05-27 21:48:36 +00:00
Hemal Patel
3921ba2f61 Merge "Merge "Docs: Fixed the end-of-comment tag" into mnc-io-docs am: d09caa1378 am: 7ff4ee303b" into nyc-dev 
am: d63315e535

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

Change-Id: I463b3de64c12e0619677dd5d4ecd83c74f70528e
 2016-05-27 21:45:52 +00:00
Michael Wright
7eb543ef2c Merge "Revert "Finalize resource IDs for N."" into nyc-dev 
am: 82a8c5f246

* commit '82a8c5f24653baf98a77f050f14e7256e864cbf9':
  Revert "Finalize resource IDs for N."

Change-Id: I2b1f1ba907bc2348fc24de63cfc0c195f2d313fd
 2016-05-27 21:45:48 +00: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
447e93dffc 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: Id2964531b7332369a30fabfaf2c9cf9167737c6b
 2016-05-27 21:33:04 +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
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
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
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
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
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