Jaewan Kim
963ad1bf33
am f9867af2: am 29b588a3: Merge "Add documentation for media router\'s palette dependency." into mnc-ub-dev
...
* commit 'f9867af26af8d13c5df7996a0c45ae02de71b1de':
Add documentation for media router's palette dependency.
2015-08-25 01:53:16 +00:00
Jaewan Kim
f9867af26a
am 29b588a3: Merge "Add documentation for media router\'s palette dependency." into mnc-ub-dev
...
* commit '29b588a3b738f2bcfb572fdfe541bba19374e44b':
Add documentation for media router's palette dependency.
2015-08-25 01:44:30 +00:00
Jaewan Kim
29b588a3b7
Merge "Add documentation for media router's palette dependency." into mnc-ub-dev
2015-08-25 01:40:11 +00:00
Eino-Ville Talvala
170e089551
am d9a24b1b: am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd9a24b1b907fabc76a9c4bdc07ac26b6959db811':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-25 00:46:50 +00:00
Jorim Jaggi
95d16bffbf
resolved conflicts for merge of 7dea1b3b to master
...
Change-Id: I51acda15b42952cda1838d7124fc991d367f0693
2015-08-24 17:42:02 -07:00
Adrian Roos
ece91acc03
am 523be967: am a6774c5c: am 7edca79e: am 8a8885b9: am def6896d: Fix shifted wallpaper after OTA
...
* commit '523be967bdf2a61ff1390e158e0f4b834e358cad':
Fix shifted wallpaper after OTA
2015-08-24 23:40:28 +00:00
Erik Wolsheimer
6f89a394bf
am 5f6fad05: (-s ours) am 307bd0bf: am 379e7343: Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev
...
* commit '5f6fad05b08675d3bf15311b37581f86dd1597f7':
DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983
2015-08-24 23:40:03 +00:00
Jorim Jaggi
1169f7da63
am 86c0ac7e: am 8373cf7d: am 5d552f2c: am 414985c4: Remove window from mWaitingForDrawn when policy hidden
...
* commit '86c0ac7ebd5a4f0a4b2c758fec734c0fbf93326a':
Remove window from mWaitingForDrawn when policy hidden
2015-08-24 23:39:57 +00:00
Joe Fernandez
d7cca50cfb
am 49aadbce: am f2a7fed4: am c9a110b0: am 8c8a0c00: am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
...
* commit '49aadbce6efc0b8f5fca6be84e89f53c1d3a2035':
docs: Add Studio 1.3.2 release notes and download links
2015-08-24 23:39:39 +00:00
Eino-Ville Talvala
b8079c5c49
am f76d558b: am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'f76d558bb0ea3bbac422a90febfdb0417b5397d6':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 23:39:22 +00:00
Vineeta Srivastava
09adb49eda
am 5916f342: am 4888cdf9: am 7fd1014f: am 21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
...
* commit '5916f342a245dc2eca0c053716bf48e7f310621d':
Don't show roaming icon when connecting HT HR network with Tele2 SIM
2015-08-24 23:39:14 +00:00
Eino-Ville Talvala
d9a24b1b90
am d7f3dfb7: am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'd7f3dfb7c8f40308a95a56f90ef7a1157897cce6':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:38:17 +00:00
Eino-Ville Talvala
d7f3dfb7c8
am cd05509a: am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit 'cd05509a81fff64e28dd1d7a2f482af5f269c6fc':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:31:49 +00:00
Eino-Ville Talvala
cd05509a81
am 6393275f: am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '6393275f5f8daa2d14dbc3fbd6511a78978999cd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:21:16 +00:00
Eino-Ville Talvala
6393275f5f
am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
...
* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
2015-08-24 23:12:16 +00:00
Eino-Ville Talvala
2bf7b98a2a
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
2015-08-24 23:08:00 +00:00
Jorim Jaggi
7dea1b3bdf
am 044826a4: am 7166ae1d: am d94d3a2a: Fix issues with light status bar and fp wake-and-unlock
...
* commit '044826a4dd0c5a04205a978ee1e793ae5553ed7d':
Fix issues with light status bar and fp wake-and-unlock
2015-08-24 22:11:31 +00:00
Adrian Roos
523be967bd
am a6774c5c: am 7edca79e: am 8a8885b9: am def6896d: Fix shifted wallpaper after OTA
...
* commit 'a6774c5cbb11cf305abfe29f011f98aaf0d396f5':
Fix shifted wallpaper after OTA
2015-08-24 22:07:00 +00:00
Jorim Jaggi
044826a4dd
am 7166ae1d: am d94d3a2a: Fix issues with light status bar and fp wake-and-unlock
...
* commit '7166ae1d19269d536442572e35063f624350000e':
Fix issues with light status bar and fp wake-and-unlock
2015-08-24 22:05:05 +00:00
Adrian Roos
a6774c5cbb
am 7edca79e: am 8a8885b9: am def6896d: Fix shifted wallpaper after OTA
...
* commit '7edca79ede391a058b690c7ed203099dd24e7145':
Fix shifted wallpaper after OTA
2015-08-24 21:59:58 +00:00
Jorim Jaggi
7166ae1d19
am d94d3a2a: Fix issues with light status bar and fp wake-and-unlock
...
* commit 'd94d3a2aa5cd1f177f61f73733217c952e356c43':
Fix issues with light status bar and fp wake-and-unlock
2015-08-24 21:56:17 +00:00
Adrian Roos
7edca79ede
am 8a8885b9: am def6896d: Fix shifted wallpaper after OTA
...
* commit '8a8885b91de361b3a6a975e380e4a00fa92f8d7d':
Fix shifted wallpaper after OTA
2015-08-24 21:51:09 +00:00
Jorim Jaggi
d94d3a2aa5
Fix issues with light status bar and fp wake-and-unlock
...
- When wake-and-unlocking, make sure to skip the light status bar
transition.
- Fix race condition with window manager when unlocking when device
is interactive for supplying the timings for the light status bar
transition.
- Fix media artwork when wake-and-unlocking while pulsing.
Bug: 23365544
Change-Id: I209ca1e6684811f5f313354ca1614a0ebd49388c
2015-08-24 21:49:49 +00:00
Daniel Estrada Alva
5876daff38
Merge "Update pretty-printed capabilities in GpsLocationProvider."
2015-08-24 21:46:15 +00:00
Alan Viverette
b197610ab0
Merge "Reverse order of RT animations so enter animation works correctly"
2015-08-24 21:45:43 +00:00
Adrian Roos
8a8885b91d
am def6896d: Fix shifted wallpaper after OTA
...
* commit 'def6896d10ce4869831bf91eb73709e8a9714b27':
Fix shifted wallpaper after OTA
2015-08-24 21:41:43 +00:00
Alan Viverette
191ac0a72b
Reverse order of RT animations so enter animation works correctly
...
Bug: 23428182
Change-Id: Id54ad19c6ee71e01656f79d413e45cf2e19bd1ea
2015-08-24 17:25:36 -04:00
destradaa
25e8cafc46
Update pretty-printed capabilities in GpsLocationProvider.
...
Change-Id: I4c8b7f6b65b5b774860930c6f3d33537f2f96267
2015-08-24 14:14:44 -07:00
Eino-Ville Talvala
e3f5483977
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices
...
Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.
As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.
Guard the filtering correctly, to correctly support such
devices.
Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701
2015-08-24 14:08:58 -07:00
Erik Wolsheimer
5f6fad05b0
am 307bd0bf: am 379e7343: Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev
...
* commit '307bd0bfdf37bfc61dd4cbadc3c7b8fe42fe90af':
DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983
2015-08-24 21:06:05 +00:00
Jorim Jaggi
86c0ac7ebd
am 8373cf7d: am 5d552f2c: am 414985c4: Remove window from mWaitingForDrawn when policy hidden
...
* commit '8373cf7d7583098c9fd47c23e4e411caea7441ee':
Remove window from mWaitingForDrawn when policy hidden
2015-08-24 21:06:00 +00:00
Erik Wolsheimer
307bd0bfdf
am 379e7343: Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev
...
* commit '379e73435ff1ed5c0fd3dabd6ae2d50174085d22':
DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983
2015-08-24 21:00:08 +00:00
Jorim Jaggi
8373cf7d75
am 5d552f2c: am 414985c4: Remove window from mWaitingForDrawn when policy hidden
...
* commit '5d552f2cf733f39677fa4a8617e69566624b8cae':
Remove window from mWaitingForDrawn when policy hidden
2015-08-24 21:00:02 +00:00
Erik Wolsheimer
379e73435f
Merge "DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983" into cw-e-dev
2015-08-24 20:53:45 +00:00
Adrian Roos
def6896d10
Fix shifted wallpaper after OTA
...
Fixes a bug where WindowManager's and SurfaceFlinger's
view of the wallpaper's position could get out of sync.
Bug: 13020924
Change-Id: Iad17b0f516fffacd2877ceac40fcc8e2647c06b2
2015-08-24 20:52:21 +00:00
Jorim Jaggi
5d552f2cf7
am 414985c4: Remove window from mWaitingForDrawn when policy hidden
...
* commit '414985c422664c7f8d5dec5562b502907b965876':
Remove window from mWaitingForDrawn when policy hidden
2015-08-24 20:52:21 +00:00
Erik Wolsheimer
4d0a2d22fd
DO NOT MERGE
...
guard against null DimLayer instances in TaskStack
BUG: 23452983
Change-Id: I8edaafe01b7bca93bfa6a15be0ae49c5e34eff40
2015-08-24 13:49:54 -07:00
Joe Fernandez
49aadbce6e
am f2a7fed4: am c9a110b0: am 8c8a0c00: am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
...
* commit 'f2a7fed4f8cd170fac0e4553ff97408cde95cf3e':
docs: Add Studio 1.3.2 release notes and download links
2015-08-24 20:49:35 +00:00
Jorim Jaggi
414985c422
Remove window from mWaitingForDrawn when policy hidden
...
When doing a wake-and-unlock sequence and the app underneath hides
the status bar, we are dismissing Keyguard, the app gets focus, the
app hides the status bar BUT we haven't finished drawn yet, so we
are waiting until the timeout because w.hasDrawnLw() always returns
false. Remove window from pending list if it gets policy hidden.
Bug: 23431343
Change-Id: I27e8c6d4efb435a4d3b632a4a37c0de5b021c2e7
2015-08-24 20:47:41 +00:00
Joe Fernandez
f2a7fed4f8
am c9a110b0: am 8c8a0c00: am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
...
* commit 'c9a110b0a873306e3219f1de17050cdaee6bc486':
docs: Add Studio 1.3.2 release notes and download links
2015-08-24 20:43:51 +00:00
Joe Fernandez
c9a110b0a8
am 8c8a0c00: am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
...
* commit '8c8a0c0034cd87ae80392164a67af13648b29b40':
docs: Add Studio 1.3.2 release notes and download links
2015-08-24 20:37:57 +00:00
Joe Fernandez
8c8a0c0034
am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
...
* commit 'c550a6fa945c0eeb5d766d0a54a50af54eddd67f':
docs: Add Studio 1.3.2 release notes and download links
2015-08-24 20:30:20 +00:00
Joe Fernandez
c550a6fa94
Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
2015-08-24 20:25:04 +00:00
Joe Fernandez
0b4d170bee
docs: Add Studio 1.3.2 release notes and download links
...
- Added Studio 1.3.2 release notes
- Added Studio 1.3.2 download link information
- Added ADT 23.0.7 release notes (catch up from 8/17)
Change-Id: I930059d9bf85f7063eb3f55e0c77d46a064c75b0
2015-08-24 13:22:03 -07:00
Eino-Ville Talvala
f76d558bb0
am 93826c7e: am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit '93826c7ebd3d5c6d6372a8bc6050d276727f7464':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 19:42:49 +00:00
Eino-Ville Talvala
93826c7ebd
am f2c5ce5d: am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'f2c5ce5db149e320299896b1afdcb7c63378663d':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 19:34:50 +00:00
Steve McKay
135531239b
Merge "Use resource aliases in-lieu of ViewStubs."
2015-08-24 19:31:15 +00:00
Eino-Ville Talvala
f2c5ce5db1
am a42cf680: Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
...
* commit 'a42cf680a57e73eb4ed874bb78b7f47c6d5d76d3':
Camera: Add support for notifying NFC stack when camera is active
2015-08-24 19:27:42 +00:00
Vineeta Srivastava
5916f342a2
am 4888cdf9: am 7fd1014f: am 21490522: Merge "Don\'t show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev
...
* commit '4888cdf9f60954817748ac4d69c88423f41a25a4':
Don't show roaming icon when connecting HT HR network with Tele2 SIM
2015-08-24 19:23:18 +00:00
Eino-Ville Talvala
a42cf680a5
Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev
2015-08-24 19:22:04 +00:00
