OSDN Git Service
Filip Gruszczynski [Wed, 14 Oct 2015 16:53:56 +0000 (16:53 +0000)]
Merge "Keep freeform window surface translucent during resize."
Filip Gruszczynski [Wed, 14 Oct 2015 01:00:29 +0000 (18:00 -0700)]
Keep freeform window surface translucent during resize.
Freeform window surfaces are translucent because most of the time they
have shadows. During a resize we stop displaying the shadow, which
might change the surface opacity from translucent to opaque. This change
only happens if the activity gets recreated during the resize, as this
triggers recalculation of the necessary opacity. If configuration change
happens the relayout will now contain new, opaque pixel format and cause
the recreation. The second blink will happen after we finish resizing,
as the surface needs to become translucent again.
Bug:
24668341
Change-Id: I450323276c49f176f0f6dfb3b21a5f6d742a8418
Geoff Mendal [Wed, 14 Oct 2015 16:09:59 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 14 Oct 2015 16:07:10 +0000 (11:07 -0500)]
Import translations. DO NOT MERGE
Change-Id: I471a04797e169a5fc481526e8aa9c3ec915639f0
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 14:22:31 +0000 (14:22 +0000)]
am
82c0f1c4: (-s ours) am
62679a1f: (-s ours) am
c095272a: (-s ours) am
7013f0c8: (-s ours) Import translations. DO NOT MERGE
* commit '
82c0f1c413273ddf6e04412f4502682dc81a6a20':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 14:17:05 +0000 (14:17 +0000)]
am
62679a1f: (-s ours) am
c095272a: (-s ours) am
7013f0c8: (-s ours) Import translations. DO NOT MERGE
* commit '
62679a1f6d04a554e452b5126ccb784c3870a035':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 14:13:42 +0000 (14:13 +0000)]
am
c095272a: (-s ours) am
7013f0c8: (-s ours) Import translations. DO NOT MERGE
* commit '
c095272a807880bca2848b102438ec9a13dec749':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 14:07:29 +0000 (14:07 +0000)]
am
7013f0c8: (-s ours) Import translations. DO NOT MERGE
* commit '
7013f0c8f2adcc14acd052f4066827ad31f17195':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 14 Oct 2015 13:59:48 +0000 (06:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iefcade8293a0fa228423e3eef730910af4a76853
Auto-generated-cl: translation import
Geoff Mendal [Wed, 14 Oct 2015 12:50:48 +0000 (05:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9a9548a9eaf6b7a0dd4909853c257ef97aedba5a
Auto-generated-cl: translation import
Jun Mukai [Wed, 14 Oct 2015 08:20:45 +0000 (08:20 +0000)]
Merge "Fix the condition of hovering at the edge."
Jun Mukai [Wed, 14 Oct 2015 07:07:52 +0000 (07:07 +0000)]
Merge "Fix the logic for mouse event handling."
Matthew Williams [Wed, 14 Oct 2015 03:20:39 +0000 (03:20 +0000)]
am
70facd58: am
f23e617b: am
6c8ddfcc: am
40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev
* commit '
70facd5836cee17ce4b344bd60a84b1490564c4d':
Correctly reschedule failed periodic
Matthew Williams [Wed, 14 Oct 2015 03:16:32 +0000 (03:16 +0000)]
am
f23e617b: am
6c8ddfcc: am
40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev
* commit '
f23e617bcd8090ef96a5449907c4db39f7efb6a5':
Correctly reschedule failed periodic
Matthew Williams [Wed, 14 Oct 2015 03:10:08 +0000 (03:10 +0000)]
am
6c8ddfcc: am
40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev
* commit '
6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213':
Correctly reschedule failed periodic
Matthew Williams [Wed, 14 Oct 2015 03:03:42 +0000 (03:03 +0000)]
am
40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev
* commit '
40ec3a924663c831e47f5e851b2978b96ff428fb':
Correctly reschedule failed periodic
Matthew Williams [Wed, 14 Oct 2015 03:00:16 +0000 (03:00 +0000)]
Merge "Correctly reschedule failed periodic" into mnc-dr-dev
Jean-Michel Trivi [Wed, 14 Oct 2015 01:37:59 +0000 (01:37 +0000)]
am
6135f320: am
acb867f1: am
bf76eb7c: am
a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit '
6135f32004c3e1e20bb4d2003c7380b5192f95da':
NotificationPlayer supports MediaPlayer errors
Jean-Michel Trivi [Wed, 14 Oct 2015 01:32:38 +0000 (01:32 +0000)]
am
acb867f1: am
bf76eb7c: am
a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit '
acb867f17c34828d14b3c71186253a269d85707c':
NotificationPlayer supports MediaPlayer errors
Jean-Michel Trivi [Wed, 14 Oct 2015 01:27:30 +0000 (01:27 +0000)]
am
bf76eb7c: am
a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit '
bf76eb7cdaf1e2199217354bd6cbeaf37657486f':
NotificationPlayer supports MediaPlayer errors
Jean-Michel Trivi [Wed, 14 Oct 2015 01:22:32 +0000 (01:22 +0000)]
am
a2ed535c: NotificationPlayer supports MediaPlayer errors
* commit '
a2ed535c67a6c6fbe2ae4a086193ad68711e2129':
NotificationPlayer supports MediaPlayer errors
Adrian Roos [Tue, 13 Oct 2015 23:21:38 +0000 (23:21 +0000)]
am
5ca30808: am
f3c9215a: am
66536146: am
4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev
* commit '
5ca3080825a6f294b70c3b1409f3f0f0247a5294':
Show charging speed in all locales
Michael Lentine [Tue, 13 Oct 2015 23:17:21 +0000 (23:17 +0000)]
am
5f49de1e: am
83663c5b: am
202538ee: am
50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
* commit '
5f49de1ed1ea6a3932de2e98fce3a490bfd8b3eb':
Remove ColorFade resouces when screen off.
Adrian Roos [Tue, 13 Oct 2015 23:13:25 +0000 (23:13 +0000)]
am
f3c9215a: am
66536146: am
4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev
* commit '
f3c9215afbd3b0100a7762a91d7e4db56b902224':
Show charging speed in all locales
Michael Lentine [Tue, 13 Oct 2015 23:09:19 +0000 (23:09 +0000)]
am
83663c5b: am
202538ee: am
50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
* commit '
83663c5b6871f7cf01fe2378a54d2c27cb98c832':
Remove ColorFade resouces when screen off.
Adrian Roos [Tue, 13 Oct 2015 23:08:26 +0000 (23:08 +0000)]
am
66536146: am
4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev
* commit '
66536146bfeac90346b898f56c7e955ad83cd005':
Show charging speed in all locales
Adrian Roos [Tue, 13 Oct 2015 23:01:55 +0000 (23:01 +0000)]
am
4673b259: Merge "Show charging speed in all locales" into mnc-dr-dev
* commit '
4673b259bc1b362fee206c7476c5fde3f53b4e20':
Show charging speed in all locales
Michael Lentine [Tue, 13 Oct 2015 23:01:28 +0000 (23:01 +0000)]
am
202538ee: am
50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
* commit '
202538eef0d9d9d40b650bdb1b449e1b404ed274':
Remove ColorFade resouces when screen off.
Jean-Michel Trivi [Fri, 21 Aug 2015 00:37:50 +0000 (17:37 -0700)]
NotificationPlayer supports MediaPlayer errors
If an error is reported while trying to play a notification,
behave as if the playback had completed.
Bug
21093153
Change-Id: Iedc7691d0b8f4d68ad75cb04292a5d7d9350552f
(cherry picked from commit
a25f6fcfed280136a16ce5800fcaabae17291dd7)
Michael Lentine [Tue, 13 Oct 2015 22:57:11 +0000 (22:57 +0000)]
am
50e79632: Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
* commit '
50e796326a39cd15af9031a41e3fe30b1f0f35f6':
Remove ColorFade resouces when screen off.
Adrian Roos [Tue, 13 Oct 2015 22:55:11 +0000 (22:55 +0000)]
Merge "Show charging speed in all locales" into mnc-dr-dev
Michael Lentine [Tue, 13 Oct 2015 22:51:12 +0000 (22:51 +0000)]
Merge "Remove ColorFade resouces when screen off." into mnc-dr-dev
Winson [Tue, 13 Oct 2015 22:13:40 +0000 (15:13 -0700)]
Fixing issue with transparent recents.
Bug:
24742707
Change-Id: I4ef66bdb15b2c8f8a98c9d1f87d12e1c191733d4
Wei Jia [Tue, 13 Oct 2015 22:08:22 +0000 (22:08 +0000)]
am
92a1b8ca: am
559f28ec: am
d32df662: am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
92a1b8cab2c7151831b9a66fb87bf853dfcaee8d':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Wei Jia [Tue, 13 Oct 2015 22:02:44 +0000 (22:02 +0000)]
am
559f28ec: am
d32df662: am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
559f28ec67636f7bed82550be7590db46b47f1d0':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Adrian Roos [Fri, 25 Sep 2015 22:15:17 +0000 (15:15 -0700)]
Show charging speed in all locales
Bug:
24167496
Change-Id: I3e883eeca002e86d4df30c2b238e18bd63bbddea
Wei Jia [Tue, 13 Oct 2015 21:52:33 +0000 (21:52 +0000)]
am
d32df662: am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
d32df6623e78efc173e5ff2534056543f963a58a':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Wei Jia [Tue, 13 Oct 2015 21:47:04 +0000 (21:47 +0000)]
am
de612dc1: MediaPlayer: remove obsolete function setPlaybackRate from comments.
* commit '
de612dc1d10d25e017ac911d0e7cca6709bdbb96':
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Wei Liu [Tue, 13 Oct 2015 21:42:42 +0000 (21:42 +0000)]
am
2bc05482: am
595a93ec: am
430a769a: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev
* commit '
2bc05482f820147ded11235a13802d29ef5a89cc':
Use wear style dialog for ICC hotswap restart dialog.
Wei Liu [Tue, 13 Oct 2015 21:36:28 +0000 (21:36 +0000)]
am
595a93ec: am
430a769a: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev
* commit '
595a93ec03ec3ff5785032db04a087cdeafa2fe2':
Use wear style dialog for ICC hotswap restart dialog.
Michael Lentine [Fri, 25 Sep 2015 17:55:26 +0000 (10:55 -0700)]
Remove ColorFade resouces when screen off.
This will not destroy the surface but will free up everything else used by
ColorFade when the screen is turned off. When it is turned on the surface is
dismissed.
Bug:
24371570
Change-Id: Iba455cdf225a68b320896f8b35d1e873e694b1e3
Wei Jia [Wed, 7 Oct 2015 22:38:12 +0000 (15:38 -0700)]
MediaPlayer: remove obsolete function setPlaybackRate from comments.
Bug:
24260668
Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332
(cherry picked from commit
cd860ac06ca7a46e9638dd741ba731f066705eb5)
Wei Liu [Tue, 13 Oct 2015 21:30:46 +0000 (21:30 +0000)]
am
430a769a: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev
* commit '
430a769a9485a31788670a353d6d47d704c432b8':
Use wear style dialog for ICC hotswap restart dialog.
Wei Liu [Tue, 13 Oct 2015 21:23:35 +0000 (21:23 +0000)]
Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev
Daichi Hirono [Tue, 13 Oct 2015 21:05:47 +0000 (21:05 +0000)]
Merge "Add constans for MTP event codes."
Jeff Hao [Tue, 13 Oct 2015 20:22:06 +0000 (20:22 +0000)]
am
9b10f2e1: am
a14c5795: am
59e52b9f: am
1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev
* commit '
9b10f2e1a7131be7a0d81be54e77cdc327780527':
Shorten first boot time by filtering dexopted apps by LRU.
Jeff Hao [Tue, 13 Oct 2015 20:11:44 +0000 (20:11 +0000)]
am
a14c5795: am
59e52b9f: am
1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev
* commit '
a14c5795bb2e9fa4e63c5e35900c555a78b08896':
Shorten first boot time by filtering dexopted apps by LRU.
Jeff Hao [Tue, 13 Oct 2015 20:05:56 +0000 (20:05 +0000)]
am
59e52b9f: am
1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev
* commit '
59e52b9f000ea7be9f18e25f0f741ff442710ca2':
Shorten first boot time by filtering dexopted apps by LRU.
Jeff Hao [Tue, 13 Oct 2015 19:59:52 +0000 (19:59 +0000)]
am
1c33939b: Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev
* commit '
1c33939be52a9b1d1c9881829236c014e9fb61b9':
Shorten first boot time by filtering dexopted apps by LRU.
Ben Kwa [Tue, 13 Oct 2015 19:54:23 +0000 (19:54 +0000)]
Merge "Fix the position of the "Recents" root in DocumentsUI."
Jeff Hao [Tue, 13 Oct 2015 19:54:00 +0000 (19:54 +0000)]
Merge "Shorten first boot time by filtering dexopted apps by LRU." into mnc-dr-dev
Daichi Hirono [Wed, 7 Oct 2015 15:12:33 +0000 (08:12 -0700)]
Add constans for MTP event codes.
BUG=
23368533
Change-Id: I922eb9a26812a44780ba81b8a391be45852cad08
Dianne Hackborn [Tue, 13 Oct 2015 19:34:44 +0000 (19:34 +0000)]
Merge "Revert "Fix build.""
Dianne Hackborn [Tue, 13 Oct 2015 19:34:28 +0000 (19:34 +0000)]
Revert "Fix build."
This reverts commit
7a9687f1d7693907189fc315d640c1ad770ab88d.
Change-Id: I5b2f68a4e2b4c399d87c18adc223500b0e1bfcc7
Ben Kwa [Tue, 13 Oct 2015 19:17:13 +0000 (12:17 -0700)]
Fix the position of the "Recents" root in DocumentsUI.
BUG=
24329078
Change-Id: Ia71b80b2075b34076c4f7802bcc45a13e95775e6
Phil Burk [Tue, 13 Oct 2015 19:02:20 +0000 (19:02 +0000)]
am
246b66cb: am
1bc47a6e: am
bfaa71bb: am
8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
* commit '
246b66cbcb3f88fb40b02b8c52a1020eac72ee91':
BluetoothMidiDevice: change write type to support JamStik
Phil Burk [Tue, 13 Oct 2015 18:58:26 +0000 (18:58 +0000)]
am
1bc47a6e: am
bfaa71bb: am
8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
* commit '
1bc47a6e7020799ae7eb5ee3e91bc452144a3d64':
BluetoothMidiDevice: change write type to support JamStik
Dianne Hackborn [Tue, 13 Oct 2015 18:55:07 +0000 (18:55 +0000)]
Merge "Fix build."
Dianne Hackborn [Tue, 13 Oct 2015 18:52:23 +0000 (11:52 -0700)]
Fix build.
Change-Id: Iade965d86ce5f53cf476468423db47c8e6a602b2
Phil Burk [Tue, 13 Oct 2015 18:50:54 +0000 (18:50 +0000)]
am
bfaa71bb: am
8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
* commit '
bfaa71bb316552236c78de87a96f0ee722133e78':
BluetoothMidiDevice: change write type to support JamStik
Phil Burk [Tue, 13 Oct 2015 18:43:35 +0000 (18:43 +0000)]
am
8e82755d: Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
* commit '
8e82755dfdfee837cb73d3db3f6319301d2a5903':
BluetoothMidiDevice: change write type to support JamStik
Phil Burk [Tue, 13 Oct 2015 18:36:13 +0000 (18:36 +0000)]
Merge "BluetoothMidiDevice: change write type to support JamStik" into mnc-dr-dev
Phil Burk [Tue, 13 Oct 2015 18:27:31 +0000 (18:27 +0000)]
am
61cf8277: am
92ae0a54: am
7bbb6fed: am
977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '
61cf82778f7e3f7454778e5ef7c691857dac16e9':
BLE-MIDI: change binding for BluetoothMidiService
Phil Burk [Tue, 13 Oct 2015 18:21:44 +0000 (18:21 +0000)]
am
92ae0a54: am
7bbb6fed: am
977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '
92ae0a5480f8ac2107688bf2f6bb58d49cb52bd1':
BLE-MIDI: change binding for BluetoothMidiService
Phil Burk [Tue, 13 Oct 2015 18:15:51 +0000 (18:15 +0000)]
am
7bbb6fed: am
977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '
7bbb6fedbcce05cd712b464cecbdbd80e28a6b4e':
BLE-MIDI: change binding for BluetoothMidiService
Phil Burk [Tue, 13 Oct 2015 18:10:29 +0000 (18:10 +0000)]
am
977fe03b: BLE-MIDI: change binding for BluetoothMidiService
* commit '
977fe03b36a7783f9cee8497efe550a69b128473':
BLE-MIDI: change binding for BluetoothMidiService
Filip Gruszczynski [Tue, 13 Oct 2015 17:28:22 +0000 (10:28 -0700)]
Pass target stack id when launching from recents.
This fixes recents to freeform activities animation problem when the
activities where previously in a non-freeform stack. Their stack id
still reports fullscreen, even though they will enter freeform. Because
of this we need to pass the target stack id with the call that creates
animation spec.
Bug:
24814340
Change-Id: Iea589d458c29c3644f351b29f51e8f8cfb5f90e3
Jeff Hao [Tue, 13 Oct 2015 17:00:10 +0000 (10:00 -0700)]
Shorten first boot time by filtering dexopted apps by LRU.
No longer dexopt all system apps and boot listener user apps.
Bug:
23628238
Bug: https://code.google.com/p/android/issues/detail?id=186589
(cherry-picked from commit
b84cb9e9719855d56ea74c2eb7afc49034c0e66f)
Change-Id: Id1a1ca9f46777f9e62df3d4f25e98a2837fabf37
Wei Liu [Tue, 13 Oct 2015 17:20:13 +0000 (10:20 -0700)]
Use wear style dialog for ICC hotswap restart dialog.
b/
24719054
Change-Id: I0ce6b3064959dfd2dd1a4f89e76fcc87a0d4810c
Filip Gruszczynski [Tue, 13 Oct 2015 16:59:34 +0000 (16:59 +0000)]
Merge "Set focused activity when moving task fullscreen."
Filip Gruszczynski [Tue, 13 Oct 2015 00:32:10 +0000 (17:32 -0700)]
Set focused activity when moving task fullscreen.
When maximizing docked stack & docked activity is not resumed & focused
we need to not only move stack to the top, but also mark the activity
as the focused one. Otherwise the activity that is getting hidden (since
its stack is going under fullscreen stack) will retain focus.
Bug:
24870602
Change-Id: Ie929fc95ba7aaccd67497ae6ede32e64dc1ba094
Ronghua Wu [Tue, 13 Oct 2015 15:56:53 +0000 (15:56 +0000)]
am
f807c4fc: am
c2fd35f7: am
57c332bd: am
c024de3c: media: ignore null InputStream
* commit '
f807c4fc9e9a67aeec2c761e391dc1ed7ace3b1a':
media: ignore null InputStream
Ronghua Wu [Tue, 13 Oct 2015 15:50:57 +0000 (15:50 +0000)]
am
c2fd35f7: am
57c332bd: am
c024de3c: media: ignore null InputStream
* commit '
c2fd35f7ae51d83b3d8f7f46c70e351bf0f18235':
media: ignore null InputStream
Ronghua Wu [Tue, 13 Oct 2015 15:46:00 +0000 (15:46 +0000)]
am
57c332bd: am
c024de3c: media: ignore null InputStream
* commit '
57c332bd4ad9a2120e5ca93ae5ce9175913aeedd':
media: ignore null InputStream
Ronghua Wu [Tue, 13 Oct 2015 15:40:48 +0000 (15:40 +0000)]
am
c024de3c: media: ignore null InputStream
* commit '
c024de3c946c18e8e4799eb8d372fdec3146f8cf':
media: ignore null InputStream
Phil Burk [Thu, 3 Sep 2015 21:37:03 +0000 (14:37 -0700)]
BLE-MIDI: change binding for BluetoothMidiService
Add a remote call addBluetoothDevice() using AIDL.
This was needed because onBind() is only called once.
Bug:
23219556
Bug:
23760886
Change-Id: Id7554ca55d596352d11dbd6ae3e403138a29c864
Signed-off-by: Phil Burk <philburk@google.com>
(cherry picked from commit
7cd06c0b9e087a555d2c5dd4cab5b7eac8497526)
Ronghua Wu [Tue, 11 Aug 2015 20:33:49 +0000 (13:33 -0700)]
media: ignore null InputStream
Bug:
22854896
Change-Id: I20b9e28bbba6dec73538ee6937d337c2e2b971f4
Ben Kwa [Tue, 13 Oct 2015 14:42:52 +0000 (14:42 +0000)]
Merge "Reorganize DocumentsUI roots fragment to match mocks."
Ben Kwa [Fri, 9 Oct 2015 14:48:00 +0000 (07:48 -0700)]
Reorganize DocumentsUI roots fragment to match mocks.
BUG=
24329078
Change-Id: I80fe7b939772d929236aa9e0e6fa44cdb606a038
Michael Wright [Tue, 13 Oct 2015 13:10:28 +0000 (14:10 +0100)]
Fix broken KL file.
Buttons should be L1 and R1 instead of L and R.
Change-Id: I1e345f7e28ad6b47248656a7f79d5507c62aa007
Michael Wright [Thu, 30 Jul 2015 16:03:10 +0000 (17:03 +0100)]
Update NES controller key layout
Turns out they produce an SNES controller with the same VID/PID as
their NES controller. Just remap both at once.
Change-Id: Iba94fdd69fd846f99ca1b3205de9069989635c73
Eric Laurent [Tue, 13 Oct 2015 05:21:21 +0000 (05:21 +0000)]
am
ac86c21c: (-s ours) am
8738d736: am
a14d1bd7: am
c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev
* commit '
ac86c21c4ca58466c39a0b4f674160c9f17a2a20':
MidiBluetoothService: add new device to HashMap
Yohei Yukawa [Tue, 13 Oct 2015 04:20:30 +0000 (04:20 +0000)]
am
52c77a29: (-s ours) am
4299751a: am
5b53211a: am
ce42e922: Merge "Unbind IME client when unsetting the current IME." into mnc-dr-dev
* commit '
52c77a29ba22bc019b9caee603ac45e4f605b1da':
Unbind IME client when unsetting the current IME.
Ian Pedowitz [Tue, 13 Oct 2015 02:19:09 +0000 (19:19 -0700)]
Fix Build
Mimicking what was done for
bdbd2d9c1878432eca6933e06c980663e2579d85
Change-Id: I5aef245b7a426edaa90e7e237acd4608b431c073
Svetoslav Ganov [Tue, 13 Oct 2015 02:00:13 +0000 (02:00 +0000)]
am
5d6d2988: am
d93e404e: am
1b872618: am
7a097ff1: Merge "Shared user retains permissions no longer used by any app on an app update" into mnc-dr-dev
* commit '
5d6d29882354804050baacb156ac5e59f3fd2b7b':
Shared user retains permissions no longer used by any app on an app update
Adam Powell [Tue, 13 Oct 2015 02:00:03 +0000 (02:00 +0000)]
am
d86a7f4c: am
1901a9e1: am
40ce70c9: am
11af1878: Merge "Add animation and positional stability to intent chooser UI" into mnc-dr-dev
* commit '
d86a7f4cf782db18fd0eca4374274290f7d3687a':
Add animation and positional stability to intent chooser UI
Dianne Hackborn [Tue, 13 Oct 2015 01:59:54 +0000 (01:59 +0000)]
am
a7036ce1: am
05222c34: am
829920ed: am
34c120dc: Merge ""Fix" issue #
24357296: Debug.getMemoryInfo doesn\'t include EGL mtrack..." into mnc-dr-dev
* commit '
a7036ce15a4a540fd556e220a89feffb3b88b11a':
"Fix" issue #
24357296: Debug.getMemoryInfo doesn't include EGL mtrack...
Adam Lesinski [Tue, 13 Oct 2015 01:59:44 +0000 (01:59 +0000)]
am
ae9ae6c5: am
56f9a422: am
1c9d43eb: am
bde2707f: Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev
* commit '
ae9ae6c5985c603db6811c36462e1263967e5404':
Add additional density enums to android:screenDensity attribute
Phil Burk [Tue, 13 Oct 2015 01:59:24 +0000 (01:59 +0000)]
am
42fcca16: am
ff1e8f7e: am
1b3eb741: am
ca296978: Merge "MidiManager: fix double BTLE callback" into mnc-dr-dev
* commit '
42fcca169cb91e858aecfc22bb6fae88125c2f00':
MidiManager: fix double BTLE callback
Phil Burk [Tue, 13 Oct 2015 01:59:12 +0000 (01:59 +0000)]
am
ae885d65: am
69ddaafa: am
0a64b146: am
e39def48: MidiService: update listener with current status when registered
* commit '
ae885d65209cc221963a5999aee8c5ffedce0c93':
MidiService: update listener with current status when registered
Alan Viverette [Tue, 13 Oct 2015 01:59:02 +0000 (01:59 +0000)]
am
bbd8315d: am
ff953294: am
d9635e60: am
c83a6121: Merge "Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR" into mnc-dr-dev
* commit '
bbd8315daa82f9761c21d72ed22a3f001c28a6ca':
Move ASSIST_BLOCKED flag to avoid collision with SCROLL_INDICATOR
Wale Ogunwale [Tue, 13 Oct 2015 01:58:05 +0000 (01:58 +0000)]
Merge "Don't set incorrect stack bounds when rotating screen in docked mode"
Wale Ogunwale [Sat, 10 Oct 2015 20:05:45 +0000 (13:05 -0700)]
Don't set incorrect stack bounds when rotating screen in docked mode
Both window manager and activity manager could decide what the bounds
of other stacks should be when the docked stack exist which can get
out of sync. Now window manager does the bounds calculation and
activity manager asks window manager what the bounds should be when
it needs to resize the stack.
Bug:
24738105
Change-Id: I97356f008b676d2f58a8b54fdb08735ab51394af
Eric Laurent [Tue, 13 Oct 2015 01:41:30 +0000 (01:41 +0000)]
am
8738d736: am
a14d1bd7: am
c1c462cb: Merge "MidiBluetoothService: add new device to HashMap" into mnc-dr-dev
* commit '
8738d736592554d9a814a3cbd676206992fd81a0':
MidiBluetoothService: add new device to HashMap
Dianne Hackborn [Tue, 13 Oct 2015 01:25:47 +0000 (01:25 +0000)]
am
a7d5cc54: am
ff71f26f: am
51591b91: am
6cc3735a: Merge "Fix issue #
23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev
* commit '
a7d5cc547dd277f10670998be6cafede3a9648e7':
Fix issue #
23581553: Ignore Battery Optimization not work for re-install app
Wale Ogunwale [Tue, 13 Oct 2015 01:25:37 +0000 (01:25 +0000)]
am
3340407e: am
9fc47b08: am
b394e6de: am
5c18d051: Use effectiveUid instead of callingUid to set lockTaskMode
* commit '
3340407e62b28ef2a08c3cd6e873c2687fb867cf':
Use effectiveUid instead of callingUid to set lockTaskMode
Adam Lesinski [Tue, 13 Oct 2015 01:24:48 +0000 (01:24 +0000)]
am
b8f8ca51: am
651cb804: am
fe1934e4: Merge "RRO: idmap: allow flock(2) to block"
* commit '
b8f8ca5139e3268c7447565940b63a543ebe9ed5':
RRO: idmap: allow flock(2) to block
Adam Lesinski [Tue, 13 Oct 2015 01:24:38 +0000 (01:24 +0000)]
am
41bf75c6: am
287cd2d1: am
bac309ca: Merge "RRO: idmap: fix sorting of overlays.list"
* commit '
41bf75c606fa19b473bc87145f766757525ae96c':
RRO: idmap: fix sorting of overlays.list
Adam Lesinski [Tue, 13 Oct 2015 01:24:29 +0000 (01:24 +0000)]
am
89eaa06a: am
6382a950: am
2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '
89eaa06a10ed399ae9919de2795f76c2af932adc':
Handle 'root' pseudo-package in the appops command
Adam Lesinski [Tue, 13 Oct 2015 01:24:16 +0000 (01:24 +0000)]
am
d0c806b1: am
6029dfa8: am
7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit '
d0c806b10c8e45dcfa950adc36742b15edababea':
Make 'idmap --scan' accept more than one input directory