Commit Graph

6847 Commits

Author SHA1 Message Date
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
Yohei Yukawa
1a932852d4 Merge \"Automatically grant URI permission as needed.\" into nyc-mr1-dev
am: d2e046a720

Change-Id: I376fdeddb57a923fd3a71086ef6f8e6021347cbb
2016-07-01 01:23:27 +00:00
Yohei Yukawa
f3806f57a5 Automatically grant URI permission as needed.
With this CL, the system automatically grants a temporary URI permission
to the target application when the IME calls
InputConnection#commitContent() with
InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION.  The temporary
permission will be revoked by any of the following events:
 - InputContentInfo#releasePermission() is explicitly called by the
   target application.
 - The target application returned false in
   InputConnection#commitContent().
 - All the InputContentInfo instances copied from the original one are
   GC-ed.

If we do not do this and there is an application that forgot to call
that method then there is no way for IME developers to prevent
permission denial from happening in the application except for relaxing
the default permission of the ContentProvider just because of such an
application.

Although application developers are still expected to explicitly call
InputContentInfo#{request,release}Permission(), forgetting to call
InputContentInfo#requestPermission() does not hurt the user anymore.

With this CL, calling InputContentInfo#requestPermission() after calling
InputContentInfo#releasePermission() is also allowed.

Bug: 29892936
Change-Id: Id955435dd2e72549ee7134f46b3c6951581694ad
2016-06-30 16:27:46 -07:00
Yohei Yukawa
9758d81dbe Merge \\"Revert \\"Remove InputContentInfo#requestPermission()\\"\\" into nyc-mr1-dev am: 8acb1a7570
am: 359acdee5f

Change-Id: Ia55a7e5095f93cb8f37edca65d2206fbf54316f3
2016-06-30 19:41:43 +00:00
Yohei Yukawa
359acdee5f Merge \"Revert \"Remove InputContentInfo#requestPermission()\"\" into nyc-mr1-dev
am: 8acb1a7570

Change-Id: If7fab0527a3d4f671985a663fc6aaf808d527ace
2016-06-30 19:37:35 +00:00
Yohei Yukawa
8acb1a7570 Merge "Revert "Remove InputContentInfo#requestPermission()"" into nyc-mr1-dev 2016-06-30 19:30:21 +00:00
Yohei Yukawa
79d1c75a3f Revert "Remove InputContentInfo#requestPermission()"
This reverts commit c4b8f36de5.

Having InputContentInfo#requestPermission() should not hurt developers,
but we can polish the behavior in a subsequent CL without changing
the API.

Bug: 29450031
Bug: 29892936
Change-Id: I1b43c19417b643d0c269af860db2d309b73a90d5
2016-06-30 19:24:43 +00:00
Yohei Yukawa
9047101977 Merge \\"Remove InputContentInfo#requestPermission()\\" into nyc-mr1-dev am: c80c64a97b
am: 854e6f8501

Change-Id: Ia84ebe07d1abf469ed461aa524c38ffa76a5ea53
2016-06-30 18:40:27 +00:00
Yohei Yukawa
854e6f8501 Merge \"Remove InputContentInfo#requestPermission()\" into nyc-mr1-dev
am: c80c64a97b

Change-Id: Iaaf2b610852510e604c482568c0ef1dc6495e179
2016-06-30 18:35:39 +00:00
Yohei Yukawa
c80c64a97b Merge "Remove InputContentInfo#requestPermission()" into nyc-mr1-dev 2016-06-30 18:21:48 +00:00
Yohei Yukawa
c4b8f36de5 Remove InputContentInfo#requestPermission()
It turns out that requiring editor authors to call
InputContentInfo#requestPermission() as needed is just confusing and can
cause compatibility issues, because if an editor author forgot to call
that method then there would be no way for IME developers to prevent
permission denial except for relaxing the default permission of the
ContentProvider just because of such an application. This is not what we
want to see.

My conclusion is that the system should automatically call
InputContentInfo#requestPermission() (or do any equivalent operation)
when InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION is
specified, like we have done in Context#startActivity().

With this CL, the system automatically grants a temporary URI permission
to the target application when the IME calls
InputConnection#commitContent() with
InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION, and the
temporary permission will be revoked by any of the following events:
 - InputContentInfo#releasePermission() is explicitly called by the
   target application.
 - The target application returned false in
   InputConnection#commitContent().
 - All the InputContentInfo instances copied from the original one are
   GC-ed.

Bug: 29450031
Bug: 29892936
Change-Id: I37fb744e4d3d1c59177fb0a9be4ef5c325c9a39f
2016-06-30 09:32:54 -07:00
Alan Viverette
9d2328e57c Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am: c295a4b23d

Change-Id: Icd4eac0fafdae01d95910dc084787350168a8688
2016-06-29 20:34:47 +00:00
TreeHugger Robot
c295a4b23d Merge "Remove framework dependencies on Support* demos" into nyc-mr1-dev 2016-06-29 20:31:03 +00:00
Rebecca Silberstein
62cb9dbf47 Merge changes from topic \'cherrypickWifiWatchdogResetOnTrigger\' into nyc-mr1-dev
am: b2f17f1bbb

Change-Id: Ic723498b7b486edd8f63822cb86127486a5c4657
2016-06-29 20:23:09 +00:00
Siyamed Sinir
24ae4b6d1b Merge "Fix bidi desired width calculation" 2016-06-29 01:42:34 +00:00
Rebecca Silberstein
0dbeb9e01a DO NOT MERGE StateMachine: remove final from SendMessage
Removed final from public sendMessage and sendMessageDelayed commands to
unblock unittest development.  This allows tests to verify calls to
sendMessage and sendMessageDelayed.

Also fixed one checkstyle error with import order.

BUG: 28593024
Change-Id: I26e02c3d75049d385ded7891c4fc9967273c27be
TEST: builds
TEST: runtest frameworks-wifi
2016-06-28 16:07:23 -07:00
Stan Iliev
74eb64d37f Merge "Fix wording regarding ThreadedRenderer" 2016-06-28 22:12:31 +00:00
Siyamed Sinir
79bf9d19f2 Fix bidi desired width calculation
Layout.getDesiredWidth measured text with TextDirectionHeuristics.LTR,
whereas the real calculations used the active direction heuristic set
in the TextView instance. This CL uses the same heuristics for both of
them by passing the value to Layout.getDesiredWidth function.

Bug: 28845953
Change-Id: I68d23f55fe5a86255d62e83bc62df38a047e4bca
2016-06-28 14:01:18 -07:00
Stan Iliev
45faba516e Fix wording regarding ThreadedRenderer
ThreadedRenderer is not synonymous with hardware rendering, so
remove references to hardware rendering when referring to
ThreadedRenderer.

Change-Id: Ic66a482ccf05f556ebe6ec194ce4f858f75bbb8b
2016-06-28 16:40:05 -04:00
Alan Viverette
3c5a1c8124 Remove framework dependencies on Support* demos
Required on nyc-mr1-dev since support library branch was reset.

Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
(cherry picked from commit 80bf1f8a3c)
2016-06-28 19:26:36 +00:00
Dan Sandler
0e272e6593 One final tweak to the platlogo. am: 4b7e415803 am: 3fae8ae0c6
am: 5643d0a5f8

Change-Id: Ic1ebdee84229863d6146fac0974ab31379165e6f
2016-06-28 08:20:34 +00:00
Dan Sandler
5643d0a5f8 One final tweak to the platlogo. am: 4b7e415803
am: 3fae8ae0c6

Change-Id: Icf198e2c7d34703a4cd8856bc08f31925a20b622
2016-06-28 07:14:54 +00:00
Dan Sandler
3fae8ae0c6 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
2016-06-28 07:07:31 +00:00
Dan Sandler
d930306e13 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ibbe66c569c0be5fc1801d8af9b5810ac997854d8
2016-06-28 07:07:22 +00:00
Dan Sandler
4b7e415803 One final tweak to the platlogo.
Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f
2016-06-27 22:59:24 -04:00
Yohei Yukawa
a3fd8bfdfe Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into nyc-mr1-dev am: cb56978912\" into nyc-mr1-dev-plus-aosp
am: c58ffb3f9c

Change-Id: Iddc693412d20b86c3a916dd09764d14d23c4fcf4
2016-06-27 20:34:58 +00:00
Yohei Yukawa
badcecb2aa Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev
am: cb56978912

Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
2016-06-27 20:30:49 +00:00
Yohei Yukawa
cb56978912 Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev 2016-06-27 20:18:51 +00:00