Mikhail Naganov
232ac757fb
Merge "Protect MIDI framework against client blocks in MidiReceiver.onSend"
2016-07-19 22:50:06 +00:00
Michael Kwan
b20f4f0efb
Merge \\"Fix padding on round devices for AlertDialogs.\\" into nyc-mr1-dev am: 0cd4addd36
...
am: e42b256d0d
Change-Id: Ia1d0a12f8ec520325ef0ece2c74faed0a51dbfd3
2016-07-19 19:12:00 +00:00
Michael Kwan
e42b256d0d
Merge \"Fix padding on round devices for AlertDialogs.\" into nyc-mr1-dev
...
am: 0cd4addd36
Change-Id: I5287b5cae2d18edc5dc2c5fbc2998c63fadbe583
2016-07-19 18:57:11 +00:00
TreeHugger Robot
0cd4addd36
Merge "Fix padding on round devices for AlertDialogs." into nyc-mr1-dev
2016-07-19 18:48:31 +00:00
Yuichi Biwa
9cead0d166
Merge \\"ChooserActivity: Cannot start app that the icon overflows the layout\\" into nyc-mr1-dev am: 586f23c14b
...
am: 8b059e8aa1
Change-Id: I13f36de289f0990967e4e5fc967ea64ecfbc0ab8
2016-07-19 18:38:52 +00:00
Yuichi Biwa
8b059e8aa1
Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev
...
am: 586f23c14b
Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d
2016-07-19 18:33:40 +00:00
Michael Kwan
814508166c
Fix padding on round devices for AlertDialogs.
...
Bug: 27482353
Change-Id: Ic9ee4abe84f9172db64dba398af2c0058921fa3f
2016-07-19 10:18:41 -07:00
Yuichi Biwa
4f3a843ea9
ChooserActivity: Cannot start app that the icon overflows the layout
...
Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.
Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.
Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).
Bug: 30153542
Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
2016-07-19 10:04:41 -07:00
Adam Lesinski
daa3e9cd80
Merge \\"Record UID of wakeup packets\\" into nyc-mr1-dev am: 117cf8de91
...
am: d279c1291e
Change-Id: I6973342d48a8a8cebe8f4515c6d67d271dbcf7f7
2016-07-18 21:29:56 +00:00
Adam Lesinski
d279c1291e
Merge \"Record UID of wakeup packets\" into nyc-mr1-dev
...
am: 117cf8de91
Change-Id: Id4e843eef00a623353fe3027de13460aa92e699f
2016-07-18 21:15:48 +00:00
Jim Miller
6097da897a
Merge \\"Fix vulnerability in LockSettings service\\" into nyc-mr1-dev am: 6ad9c16ffd
...
am: 623362c5ab
Change-Id: I7d604ab0a4c76672a765a064011574cd427aac64
2016-07-18 21:15:43 +00:00
Jim Miller
623362c5ab
Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev
...
am: 6ad9c16ffd
Change-Id: Id4db555de3df2d73046aa6358e6b559f4529890d
2016-07-18 21:09:37 +00:00
TreeHugger Robot
117cf8de91
Merge "Record UID of wakeup packets" into nyc-mr1-dev
2016-07-18 20:58:15 +00:00
TreeHugger Robot
6ad9c16ffd
Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev
2016-07-18 20:54:45 +00:00
Adam Lesinski
5f056f6d87
Record UID of wakeup packets
...
Bug:28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73
2016-07-18 12:30:46 -07:00
Abodunrinwa Toki
73746d5d24
Merge \"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\" into nyc-mr1-dev
...
am: 63b31d5729
Change-Id: I77c82ad4ce15368c92041d994e10c8a44a33667c
2016-07-18 18:05:32 +00:00
Felipe Leme
8e1ed51e51
Merge "Added missing copyright notice."
2016-07-18 17:25:58 +00:00
Abodunrinwa Toki
cc59a84490
Merge \\"FloatingActionMode: Fix screen coordinates.\\" into nyc-mr1-dev am: 3b8e0fdf92
...
am: c749762107
Change-Id: If82be88fcf267aef7f239e9ab30e3e594fcf945e
2016-07-17 18:26:40 +00:00
Abodunrinwa Toki
97dd8eee10
DO NOT MERGE: FloatingToolbar - Check that app supports RTL.
...
Port I36c0d72984e0abc7c6430cc7d52d8efd7341820e to nyc-mr1-dev.
Bug: 29932935
Change-Id: Icd085508f7d1dd412f4d0805e8fd01734743648e
2016-07-17 19:25:27 +01:00
Abodunrinwa Toki
c749762107
Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev
...
am: 3b8e0fdf92
Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
2016-07-17 18:20:11 +00:00
Jim Miller
29d157bf05
Fix vulnerability in LockSettings service
...
Fixes bug 30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
2016-07-15 17:28:53 -07:00
Abodunrinwa Toki
afb38c5cc4
FloatingActionMode: Fix screen coordinates.
...
Use application context to get the screen's display metrics.
Bug: 30127070
Change-Id: I2c453c494ef210c12d89fc7e3ff026728f9ecb0f
2016-07-15 14:40:26 +01:00
Selim Cinek
7c2097fb1f
Merge \"Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am: a7ebd4f4bb\" into nyc-mr1-dev-plus-aosp
...
am: 36c6cf1bdc
Change-Id: I5ecebb835b60f163ad1d6cdff41b30c5590eb8cc
2016-07-14 02:06:34 +00:00
Selim Cinek
46aeea5dc1
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
...
am: a7ebd4f4bb
Change-Id: Id3ffe5addb5e036eeda993d8dd6603b88c785804
2016-07-14 01:58:52 +00:00
TreeHugger Robot
a7ebd4f4bb
Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
...
* changes:
Fixed a bug where the headsup would be stuck disappearing
Changed the appearance of phone call notifications
2016-07-14 01:38:53 +00:00
Selim Cinek
06e9e1fe00
Changed the appearance of phone call notifications
...
Change-Id: Ibf8f9b266428fdd5374ee824ec4c2df10daeb9a7
Fixes:28269355
2016-07-13 14:56:05 -07:00
Mikhail Naganov
382cb48848
Protect MIDI framework against client blocks in MidiReceiver.onSend
...
Make the server-side socket non-blocking when creating MidiOutputPort
for clients. Thus if a client ceases to read from its side of the
socket pair, the server will just fail to write instead of blocking.
One drawback is that the MidiOutputPort on the client can't indicate
that it has become dysfunctional, but it's not possible without
changing the API.
Bug: 29413812
Change-Id: I9dfcbdd214a815cea8fd1365324fd78ca459268a
2016-07-13 13:50:17 -07:00
Adrian Roos
a47967b820
Merge \\"Allow LockPatternUtils usage on non-looper threads\\" into nyc-mr1-dev am: feaa2bfb39
...
am: 1642d8df0d
Change-Id: I0bfc272cef3cee1e76f1b3bc5f8f0908bd24f2e5
2016-07-13 02:15:39 +00:00
Adrian Roos
1642d8df0d
Merge \"Allow LockPatternUtils usage on non-looper threads\" into nyc-mr1-dev
...
am: feaa2bfb39
Change-Id: I22afcc4e7307e3c64a92fdcef82f2d1344fbb5df
2016-07-13 02:09:03 +00:00
Adrian Roos
7a3bf7c46e
Allow LockPatternUtils usage on non-looper threads
...
Fixes an issue where LPU could no longer
be used on a non-looper thread even though
the looper is only used for a certain callback.
Now only using that callback mechanism is fatal
on a non-looper thread.
Change-Id: I2d766bd6c913e345ed6a3500b486263c8bc12b07
Fixes: 30076804
2016-07-12 15:32:04 -07:00
Selim Cinek
d1c50f66f6
resolve merge conflicts of 6e57aae to master
...
Change-Id: I929929ad41df4439996755b605d084bfdcf3428a
2016-07-11 11:20:32 -07:00
Jorim Jaggi
6e57aae680
Merge \"Improve initial unlock delay (1/2)\" into nyc-mr1-dev
...
am: 165b011a74
Change-Id: Ib7bfefcd59288d144a22434e5a99124c66fa4826
2016-07-08 22:08:37 +00:00
TreeHugger Robot
165b011a74
Merge "Improve initial unlock delay (1/2)" into nyc-mr1-dev
2016-07-08 22:03:49 +00:00
Justin Klaassen
029c2f4e3f
Merge \\"Add Night display feature\\" into nyc-mr1-dev am: 76262b8e14
...
am: 1228803cde
Change-Id: I855bf48a271b15f671957b1451caab24d08d8293
2016-07-08 21:46:23 +00:00
Justin Klaassen
1228803cde
Merge \"Add Night display feature\" into nyc-mr1-dev
...
am: 76262b8e14
Change-Id: I03912016390820f61fb515b1f206edd9bfea9ccf
2016-07-08 21:15:35 +00:00
Jorim Jaggi
e8fde5d966
Improve initial unlock delay (1/2)
...
When checking for the credentials, we add a new callback
onEarlyVerified which gets called as soon as we know that the
credential was correct.
In KeyguardUpdateMonitor, we track the unlocked state of the user,
and if it's still locked, we slow down all the transitions to allow
for a more gradual unlock experience.
Bug: 29007436
Change-Id: I406d228f9f3e41e07fe3292a61df175a7f579e4d
2016-07-08 11:50:54 -07:00
Justin Klaassen
911e88939c
Add Night display feature
...
Bug: 28615069
Tints the display at night automatically according to your schedule or
using the sunrise/sunset corresponding to your current location.
Change-Id: Ie56b4eed88cc2fcbae88002492b1edad5820b6b1
2016-07-08 11:47:50 -07:00
Annie Chin
f83ada9e8a
Merge \\"Add callbacks to VoiceInteractionManagerService\\" into nyc-mr1-dev am: d58f07f58a
...
am: d99252358b
Change-Id: I809b459045a0606abc6ea5d4ad2d186f752b8bfb
2016-07-06 23:35:03 +00:00
Annie Chin
d99252358b
Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
...
am: d58f07f58a
Change-Id: I6a9c537b71084696915e744102a6a12f532942d5
2016-07-06 23:29:50 +00:00
Annie Chin
d58f07f58a
Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev
2016-07-06 23:22:10 +00:00
Daniel Nishi
3fd8c801ba
resolve merge conflicts of 7145cac to master
...
Change-Id: Idd0a8de30697687309953fd37b568207d2fc0be8
2016-07-06 14:04:36 -07:00
Daniel Nishi
7145cace64
Merge \"Move the MIME type icon detection into the platform.\" into nyc-mr1-dev
...
am: 9459f93c97
Change-Id: I151a72b8ee1c16ef94da70e85378dd44b4ac077c
2016-07-06 20:02:45 +00:00
Daniel Nishi
9459f93c97
Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev
2016-07-06 19:54:27 +00:00
Daniel Nishi
c29d2b0492
Move the MIME type icon detection into the platform.
...
This allows the MIME type icons to be used in other system apps.
In this instance, the StorageManager app needs to show file icons
for a given file. By moving the icon mapping into a static library,
we can avoid duplicating the mapping and resources.
Bug: 29826961
Change-Id: Ic2dc7970cc5a5ca430e33425eb9f1ecbd733fe9a
2016-07-06 10:57:06 -07:00
Robin Lee
eac929cda9
Merge \\"Update isValidLockdownProfile to block PPTP\\" into nyc-mr1-dev am: da68f0614c
...
am: dfc9007e9a
Change-Id: Ieca6c0f30e69a0a122553b95510d4957d1da7182
2016-07-06 16:27:57 +00:00
Robin Lee
dfc9007e9a
Merge \"Update isValidLockdownProfile to block PPTP\" into nyc-mr1-dev
...
am: da68f0614c
Change-Id: Ie2d433c537fc27cbe04f80cd74c464e4a216238e
2016-07-06 16:21:00 +00:00
Robin Lee
bae6d820d2
Update isValidLockdownProfile to block PPTP
...
Since this isn't supported and it will take a framework update to make
it work.
Bug: 28807474
Change-Id: I12371134a1c51a53af26fe8c4db1f04b0f687abe
2016-07-06 09:41:05 +00:00
Annie Chin
ecb9f3e9b8
Add callbacks to VoiceInteractionManagerService
...
Bug: 29582254
Change-Id: I548d01bd1c7e261b2d2e0afd606d964e5553124e
2016-07-01 13:00:09 -07:00
Abodunrinwa Toki
49482f83e8
FloatingToolbar: Check that app supports RTL.
...
The FloatingToolbar rendering is buggy when running in RTL mode
for apps that do not support RTL. The CL checks if the running
app supports RTL before running RTL-related logic.
Bug: 29932935
Change-Id: I36c0d72984e0abc7c6430cc7d52d8efd7341820e
2016-07-01 19:57:50 +01:00
Yohei Yukawa
664e6d18db
Merge \\"Automatically grant URI permission as needed.\\" into nyc-mr1-dev am: d2e046a720
...
am: 1a932852d4
Change-Id: I1b54d8e32c4813d641df66075f3845f94858c63b
2016-07-01 01:28:47 +00:00