Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,311 Commits 3 Branches 0 Tags
552ed5a4ab7044473ec0099ac9f87f82b3c2ef6c
Commit Graph

237311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Cinek
552ed5a4ab Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev am: 8316fac9c0 
am: f78f8345ca

* commit 'f78f8345ca1143459d0bd524fcab63626aa517a2':
  Adjusted the behavior when expanding the notification panel
 2016-03-03 02:05:00 +00:00
Chris Craik
a47dc93c63 Merge "Fix merged bitmap mesh generation and reenable merging" into nyc-dev am: 3f445f0eee 
am: 884d3fbe10

* commit '884d3fbe10dd6ab804dd147352994ef92ea1ff21':
  Fix merged bitmap mesh generation and reenable merging
 2016-03-03 02:02:44 +00:00
Renat Aksitov
e6a7d979de Merge "Voice Messaging Intent API." into nyc-dev am: 8351ff25a1 
am: 6bfc3bd8f8

* commit '6bfc3bd8f872e717723fd04d89f47fdec09aabf7':
  Voice Messaging Intent API.
 2016-03-03 02:00:22 +00:00
Doris Liu
0e7f4adee1 Merge "Handle multiple animation actions within one frame" into nyc-dev am: 352fcaeb20 
am: 1763519a08

* commit '1763519a088f256b9136866d876ebb1ef67784e3':
  Handle multiple animation actions within one frame
 2016-03-03 01:57:44 +00:00
Yohei Yukawa
6b7e4d2c60 Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev am: 3d68c9d30f 
am: c4759151c4

* commit 'c4759151c43d9d18da6b60e08975603cc1213172':
  Add more JavaDoc to InputConnectionWrapper.
 2016-03-03 01:54:58 +00:00
Jeff Sharkey
c0f95b58a6 Merge "More protected broadcasts!" into nyc-dev am: be3c6041ad 
am: b0eda79209

* commit 'b0eda792097d7091288b2428b958a9a29eb58340':
  More protected broadcasts!
 2016-03-03 01:52:44 +00:00
Steve McKay
aab0194119 Merge "Use device model and name for internal storage." into nyc-dev am: d53f0df7df 
am: 8020fecc40

* commit '8020fecc40b7bed8cd28d45985c9d45d725cedf9':
  Use device model and name for internal storage.
 2016-03-03 01:50:14 +00:00
Jim Miller
2b37a70a18 Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev am: 042a68ae32 
am: f0060709ff

* commit 'f0060709ffc1435f4c70b7f4982064c32dfe76e6':
  Attempt to fix bug where OwnerInfo gets lost.
 2016-03-03 01:46:59 +00:00
Hyunyoung Song
e3810aac3b Merge "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a" into nyc-dev am: 5d634d7828 
am: 477e1c6124

* commit '477e1c61241a86380c789c6de1b29a90da1c4ea4':
  Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a
 2016-03-03 01:43:41 +00:00
Selim Cinek
f78f8345ca Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev 
am: 8316fac9c0

* commit '8316fac9c0772b1908d45b2286298b5b791d3ca7':
  Adjusted the behavior when expanding the notification panel
 2016-03-03 01:29:21 +00:00
Chris Craik
884d3fbe10 Merge "Fix merged bitmap mesh generation and reenable merging" into nyc-dev 
am: 3f445f0eee

* commit '3f445f0eeea0c856916bd1170b5f09c0a3acc99f':
  Fix merged bitmap mesh generation and reenable merging
 2016-03-03 01:27:32 +00:00
Renat Aksitov
6bfc3bd8f8 Merge "Voice Messaging Intent API." into nyc-dev 
am: 8351ff25a1

* commit '8351ff25a1ef25dad69cf45431ba8aa82487bcd5':
  Voice Messaging Intent API.
 2016-03-03 01:25:56 +00:00
Doris Liu
1763519a08 Merge "Handle multiple animation actions within one frame" into nyc-dev 
am: 352fcaeb20

* commit '352fcaeb2067ee488d69e4da192fa4b96ee78bd8':
  Handle multiple animation actions within one frame
 2016-03-03 01:24:21 +00:00
Yohei Yukawa
c4759151c4 Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev 
am: 3d68c9d30f

* commit '3d68c9d30fa9c95b49a9d6c8ba6db12dac47c2d7':
  Add more JavaDoc to InputConnectionWrapper.
 2016-03-03 01:22:45 +00:00
Jeff Sharkey
b0eda79209 Merge "More protected broadcasts!" into nyc-dev 
am: be3c6041ad

* commit 'be3c6041ad9a07822f0e83d60387b040eb569fdb':
  More protected broadcasts!
 2016-03-03 01:21:12 +00:00
Steve McKay
8020fecc40 Merge "Use device model and name for internal storage." into nyc-dev 
am: d53f0df7df

* commit 'd53f0df7dfb1eee22f7953870ed9d24688596712':
  Use device model and name for internal storage.
 2016-03-03 01:19:13 +00:00
Jim Miller
f0060709ff Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev 
am: 042a68ae32

* commit '042a68ae3297db27c4bd6aca7f1c39001261b85e':
  Attempt to fix bug where OwnerInfo gets lost.
 2016-03-03 01:17:35 +00:00
Hyunyoung Song
477e1c6124 Merge "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a" into nyc-dev 
am: 5d634d7828

* commit '5d634d7828ed345c1cca46818a6beab1de0ab626':
  Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a
 2016-03-03 01:15:52 +00:00
Selim Gurun
12a563f457 Merge "Revert "Add some View methods overrides and WebViewDelegate interfaces."" 2016-03-03 00:52:39 +00:00
Selim Gurun
7ef5429637 Revert "Add some View methods overrides and WebViewDelegate interfaces." 
This reverts commit 73a7494231.

Change-Id: I3a403c224a074cfc9952d3b421027c9538eaa30b
 2016-03-03 00:52:11 +00:00
Shasidhar Ganiga
b25963e639 Merge "Fix for framework reboot on connecting to TV through HDMI." am: 7585cbfd34 am: d3747baad2 
am: 7010387500

* commit '7010387500d922e542fbf9ebe258a842c41b7f50':
  Fix for framework reboot on connecting to TV through HDMI.
 2016-03-03 00:17:13 +00:00
Shasidhar Ganiga
7010387500 Merge "Fix for framework reboot on connecting to TV through HDMI." am: 7585cbfd34 
am: d3747baad2

* commit 'd3747baad2d90fcbc375eb53fe3ec1015f1d2aab':
  Fix for framework reboot on connecting to TV through HDMI.
 2016-03-03 00:09:49 +00:00
Shasidhar Ganiga
d3747baad2 Merge "Fix for framework reboot on connecting to TV through HDMI." 
am: 7585cbfd34

* commit '7585cbfd34a46bc8332bf066a5d0f69677d3a7e1':
  Fix for framework reboot on connecting to TV through HDMI.
 2016-03-02 23:57:28 +00:00
Selim Cinek
8316fac9c0 Merge "Adjusted the behavior when expanding the notification panel" into nyc-dev 2016-03-02 23:55:31 +00:00
Chris Craik
3f445f0eee Merge "Fix merged bitmap mesh generation and reenable merging" into nyc-dev 2016-03-02 23:55:28 +00:00
Selim Cinek
d1ad9ab312 Adjusted the behavior when expanding the notification panel 
The topmost notification is now not collapsed anymore but slides in
expanded from the top. Therefore it's layout doesn't need to animate
anymore. This also cleans up a lot of code in the algorithm which was
depending on this resizing which isn't needed anymore.
In order to have that transition working perfectly, the padding when
collapsing a card is now the same as the slowdown length.
Also improved the logic when notification contents are allowed to
animate and when not.
Also fixed a bug where the top notification was cut off when QS was
expanded.

Bug: 27402534
Bug: 18434284
Change-Id: I31afa199d38d94e74fd45500c2236ffdb51d989d
 2016-03-02 23:54:38 +00:00
Renat Aksitov
8351ff25a1 Merge "Voice Messaging Intent API." into nyc-dev 2016-03-02 23:47:25 +00:00
Michael Wright
7585cbfd34 Merge "Fix for framework reboot on connecting to TV through HDMI." 2016-03-02 23:45:38 +00:00
Doris Liu
352fcaeb20 Merge "Handle multiple animation actions within one frame" into nyc-dev 2016-03-02 23:39:06 +00:00
Yohei Yukawa
3d68c9d30f Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev 2016-03-02 23:35:35 +00:00
Chris Craik
f6c20e4b42 Fix merged bitmap mesh generation and reenable merging 
bug:26793764
bug:26569206
Change-Id: I54628e99b61f58f5726a387ea3599c29695c0efc
 2016-03-02 15:34:02 -08:00
Jeff Sharkey
be3c6041ad Merge "More protected broadcasts!" into nyc-dev 2016-03-02 23:24:23 +00:00
Jeff Sharkey
925cc2a066 More protected broadcasts! 
Bug: 26144973
Change-Id: I56f047d7e4b9d7bcf1ac40c98ee381badd909057
 2016-03-02 16:21:58 -07:00
Wale Ogunwale
a0c55d2700 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev am: 3716e52be5 
am: feb39e5ba8

* commit 'feb39e5ba8f6866360ff0fcc48317f73ed4aed68':
  config_supportsMultiWindow for device to specify multi-window support
 2016-03-02 23:11:00 +00:00
Eino-Ville Talvala
0fd379edd6 Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev am: 74989b4d3f 
am: 72071de87c

* commit '72071de87c62717cc85937b319df8df10cf4b7e9':
  Camera2: Switch to auto-gen C++ binder interfaces
 2016-03-02 23:08:24 +00:00
Steve McKay
d53f0df7df Merge "Use device model and name for internal storage." into nyc-dev 2016-03-02 23:03:40 +00:00
Jim Miller
042a68ae32 Merge "Attempt to fix bug where OwnerInfo gets lost." into nyc-dev 2016-03-02 23:01:59 +00:00
Steve McKay
ecec7cb062 Use device model and name for internal storage. 
Bug: 27157923
Change-Id: I1d723e33fa871565fbd187509ffb05f691f030ac
 2016-03-02 14:57:12 -08:00
Wale Ogunwale
feb39e5ba8 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev 
am: 3716e52be5

* commit '3716e52be592482534943d32ba0f72309305a224':
  config_supportsMultiWindow for device to specify multi-window support
 2016-03-02 22:55:55 +00:00
Hyunyoung Song
5d634d7828 Merge "Revert the default wall paper for framework / emulator b/27451024 Change-Id: I68ed094f44f1b4c48407497790f809147ec0ad5a" into nyc-dev 2016-03-02 22:54:05 +00:00
Svetoslav Ganov
59bb19a416 Merge "Fix a regression in SettingsProvider" into nyc-dev am: e7f82ec533 
am: 668661452b

* commit '668661452bc04ecdce274170906b9790d23ebd6c':
  Fix a regression in SettingsProvider
 2016-03-02 22:51:46 +00:00
Eino-Ville Talvala
72071de87c Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev 
am: 74989b4d3f

* commit '74989b4d3ffdcd3def599e1f973d481062ba8e6f':
  Camera2: Switch to auto-gen C++ binder interfaces
 2016-03-02 22:50:14 +00:00
Ido Ofir
89348096d9 Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev am: 51e06e011d 
am: 379db962ef

* commit '379db962ef703e7ad7bb2d8abeb789f0abbf06df':
  checking additional metadata and completed categories before displaying suggested actions in settings.
 2016-03-02 22:49:30 +00:00
Pierre-Laurent Coirier
eaa2f5aeec Merge "Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-e-dev am: 54c3808802 am: 0048acfc16 -s ours am: 3be2727d28 
am: b1309db19a

* commit 'b1309db19a4713a3fec8e0802ae3b0b67b5730a5':
  Grant fixed SMS & Phone permission to package handling the twinning settings intent.
 2016-03-02 22:47:23 +00:00
Jason Monk
3144393d96 Merge "Guard against battery tile crash" into nyc-dev am: f2bf0c4ba0 
am: 58add15bb3

* commit '58add15bb340dc12c2d07e5afd6637a14e209a21':
  Guard against battery tile crash
 2016-03-02 22:43:35 +00:00
Jason Monk
8eb253b2f5 Merge "Fix crash while editing QS" into nyc-dev am: 25b86cca0f 
am: 61964371d9

* commit '61964371d9085a6a33cee24760732f69d20d6a9e':
  Fix crash while editing QS
 2016-03-02 22:40:31 +00:00
Wale Ogunwale
3716e52be5 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev 2016-03-02 21:55:22 +00:00
Julia Reynolds
4cb6ecd7d5 Merge "Allow notifications to be hidden from lockscreen at a package level." into nyc-dev am: c523dc1ff9 
am: 387ede7593

* commit '387ede75938b7beee1c38bfc887c7449fef9b68c':
  Allow notifications to be hidden from lockscreen at a package level.
 2016-03-02 21:53:48 +00:00
Jeff Sharkey
e50adc8e46 Merge "Delay power broadcasts until system is booted." into nyc-dev am: c9a91cc050 
am: 99723c720d

* commit '99723c720dfd009c05ef4717cb6597ae245a98d8':
  Delay power broadcasts until system is booted.
 2016-03-02 21:52:02 +00:00
Chong Zhang
3021300491 Merge "Force disconnect when the surface is about to be saved." into nyc-dev am: f8fd852060 
am: d1f8eb3f7b

* commit 'd1f8eb3f7b387af17b6fa0412293782d64d5828d':
  Force disconnect when the surface is about to be saved.
 2016-03-02 21:50:27 +00:00