228231 Commits

Author SHA1 Message Date
George Mount
7f55215afd Merge "Reset accessibility after Activity enter transition." 2015-12-18 15:29:52 +00:00
Todd Kennedy
c366471590 Merge "Print "Success" on success" 2015-12-18 15:16:19 +00:00
Winson Chung
0583d3d188 Hiding pinned stack tasks from overview
Bug: 25381158
Change-Id: Iad442b7f5dc49109529cb5dab2168b19837af6e3
2015-12-18 10:05:13 -05:00
Daichi Hirono
87af9a03f1 Merge "Show MTP device as root when it has multiple/zero storages." 2015-12-18 05:33:38 +00:00
Daichi Hirono
81d48536ae Show MTP device as root when it has multiple/zero storages.
The CL updates MtpDocumentsProvider#queryRoots so that it fetches
devices from Database as well as storages when we don't have storages
under the device, or when we have multiple storages under the device.

BUG=26120019
Change-Id: Id2b140f00a1d49fa4da7e17d2564dbbaa1795e1e
2015-12-18 14:12:35 +09:00
Wale Ogunwale
ad1f8e69e8 Merge "Fixed some issues with tasks with the same affinity in different stacks" 2015-12-18 03:17:57 +00:00
Bryce Lee
bd17928afc resolve merge conflicts of 6b9e5bf0c2 to master.
Change-Id: Idada49313619533bfeb375ee232c942589457fa4
2015-12-18 03:05:20 +00:00
Tomasz Mikolajewski
be4904962e Merge "Cleanup StubProvider a little." 2015-12-18 02:41:30 +00:00
Tomasz Mikolajewski
c7ec678d7c Cleanup StubProvider a little.
Change-Id: I1d9f1c978850f466ff204bff97a152ba7919a096
2015-12-18 11:29:48 +09:00
Ying Wang
43d39a12f1 Merge "Fix typo in config.xml file" am: 738a557d54
am: 84d1b18b7b

* commit '84d1b18b7be03f1e15b61adcb543d1a47dec5952':
  Fix typo in config.xml file
2015-12-18 01:50:38 +00:00
Wale Ogunwale
3938197097 Fixed some issues with tasks with the same affinity in different stacks
- It is possible for tasks in different stacks to have the same root
affinity. This can be an issue when we are looking for the best task to
launch an acitivty into since there can be a better match in a different
stack based on class name. We now save the task matched by root afinity
and try to find a better match by class name. If we don't find a better
match we use the match based on root affinity.
- For pinned stack we don't allow root affinity matching as no other
task should be launching in the stack based on affinity.
- Correct ASS#moveActivityToStackLocked to use the passed in stack id
instead of the PINNED_STACK_ID.

Bug: 26015860
Change-Id: I6ec44bc97bf3c669c2305a58563518cf9bfc7804
2015-12-17 17:31:27 -08:00
Adrian Roos
365458c678 Merge "Fix NPE in processForRemoteInput" 2015-12-18 00:03:59 +00:00
Chris Craik
a2a70723b8 Simplify ClipArea to prefer Rect args
Change-Id: I8af83d01dc5dd8009a0cd235dd8b59dab61d8560
2015-12-17 23:31:44 +00:00
Chris Craik
2b17db773e Merge "Correct drawLines annotations" 2015-12-17 23:31:30 +00:00
Chris Craik
92c11864c7 Correct drawLines annotations
Change-Id: I161e419a3ce427e10d802ba692679ad671e23dde
2015-12-17 15:11:24 -08:00
Jeff Sharkey
bb0bed1f55 Merge "Send LOCKED_BOOT_COMPLETED to background apps." 2015-12-17 23:04:54 +00:00
Jeff Sharkey
fc82a8c4bb Merge "Make printing framework encryption-aware." 2015-12-17 23:04:18 +00:00
Robert Greenwalt
39d7334b09 Merge "Check permissions on getDeviceId." 2015-12-17 22:52:57 +00:00
Todd Kennedy
50ea35f669 Print "Success" on success
Change-Id: I274e2aa5d840fee4f57f5a4f2f73af01f0587847
2015-12-17 14:46:39 -08:00
Jeff Sharkey
a242f825e6 Send LOCKED_BOOT_COMPLETED to background apps.
This mirrors how we're treating the normal BOOT_COMPLETED broadcast.

Bug: 26151835
Change-Id: Ibe1df0df8b89aafbe9af073e14fdd428710a6a40
2015-12-17 15:38:20 -07:00
Winson Chung
2a43922df9 Merge changes Iac20cc7b,I87ce6320
* changes:
  Fixing potential issue with wrong task descriptions being loaded.
  Refactoring to AnimatedEvent.
2015-12-17 22:33:54 +00:00
Winson Chung
296278a067 Fixing potential issue with wrong task descriptions being loaded.
- Also cleaning up the Task to remove some confusing nomenclature
  related to task properties.  Now there is a single icon and title,
  and we keep a copy of the TaskDescription for future icon loading.
- Also changing a few cases where we should be calling isFreeformTask()

Bug: 26221779
Change-Id: Iac20cc7b4912f76c14232a323981ab2e8f62628a
2015-12-17 17:29:40 -05:00
Michael Wright
9943e0978f Merge "Start at the end of the IME dialog list, not one past." 2015-12-17 22:27:35 +00:00
Michael Wright
6db8e69afa Start at the end of the IME dialog list, not one past.
Bug: 26240994
Change-Id: Ibc20474930d8c796edb3a5d4b75571a045f0a8dd
2015-12-17 17:19:46 -05:00
Adrian Roos
a3539cb032 Fix NPE in processForRemoteInput
Bug: 26168336
Change-Id: I010fb22caee2edd85cc0263abeb729e6b952ed01
2015-12-17 22:18:11 +00:00
Jeff Sharkey
0999c0d6e9 Make printing framework encryption-aware.
Only create UserState objects when a user has been unlocked, meaning
we can connect to the spooler.  Ignore package events that occur
while a user is locked, since we'll kick off updateIfNeededLocked()
when that user is eventually unlocked.

In all other cases, throw if someone tries obtaining UserState for
a still-locked user.  This should help catch any edge cases in the
system, and communicate clearly through public APIs that printing
isn't available until the user is unlocked.

Bug: 26246836
Change-Id: If15744621890baee206d355484fe20933afc65d8
2015-12-17 15:12:26 -07:00
Julia Reynolds
9d7381e28b Merge "Allow users to set app-wide Importance default" 2015-12-17 22:12:04 +00:00
Filip Gruszczynski
05c0cfcbe3 Merge "Use correct SparseArray access method when iterating over it." 2015-12-17 21:54:00 +00:00
Julia Reynolds
a07af88b95 Allow users to set app-wide Importance default
And the associated ui changes to the notification guts.

Bug: 22451710
Change-Id: I4e0b11e7b24d70b039a432c5e6cd76c9c7cc547c
2015-12-17 16:53:36 -05:00
Jason Monk
161ccb5dfe Small fixes in TileService
Change-Id: I4d10c43d8e40697d144802067fcd4f95d866e4e0
2015-12-17 21:46:58 +00:00
Jeff Sharkey
9719fdba02 Merge "Make AppWidgets encryption-aware." 2015-12-17 21:28:06 +00:00
Chris Craik
5caba3360c Merge "Add temporary switch for new renderer in JNI" 2015-12-17 21:24:51 +00:00
Jeff Sharkey
af6ec296ec Make AppWidgets encryption-aware.
Only parse and load AppWidget configuration details after a user has
been unlocked.  Yell loudly if someone accidentally tries loading
data for a locked user.

Tidy up protected broadcast logic a bit more to handle persistent
processes.  Add backwards compatible behavior for APPWIDGET_UPDATE
broadcast simliar to APPWIDGET_CONFIGURE, since some apps are sending
it to themselves.

Add hidden USER_HANDLE extra to a handful of broadcasts to make
logic more consistent.

Bug: 26247049, 26219971
Change-Id: I54e4f2e343488571f9baa1a316962f41186c1a2c
2015-12-17 14:24:21 -07:00
Chris Craik
15d556e5d3 Add temporary switch for new renderer in JNI
bug:22480459

Change-Id: I6cb19332cb09650f20b1cc2da3473a2618a50b1e
2015-12-17 13:24:08 -08:00
Alan Viverette
e9d1869812 Merge "Clamp action bar button height to default minimum height" 2015-12-17 21:18:25 +00:00
Filip Gruszczynski
e6fd77baf4 Use correct SparseArray access method when iterating over it.
The current code works with a single display, because that display will
have id 0, so the old code will work (get(0) will return that display).

Bug: 26089885
Change-Id: If685c0ff006f353e6d56fd144acbce4d7f1e835b
2015-12-17 13:05:11 -08:00
Alan Viverette
1af6fe9fba Clamp action bar button height to default minimum height
Previously, the fixed size of 56dp would bump the landscape action bar
measured height up to 56dp but leave the minHeight at 48dp, which would
cause the buttons to be aligned incorrectly. Now the buttons are scaled
to fit the action bar.

Change-Id: I47801d1fb072d8801b7bbae5c42be3bdfb819404
2015-12-17 15:59:30 -05:00
Bryce Lee
6b9e5bf0c2 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05 am: 9eaa59a1ff
am: 132814f20d

* commit '132814f20d2e0920c419042d55c8e50ace827dba':
  Add setting for declaring disabled bluetooth profiles.
2015-12-17 19:56:12 +00:00
Wale Ogunwale
77309fa171 Merge "Use accessor methods to get/set visibleBehindActivity" 2015-12-17 19:54:40 +00:00
Bryce Lee
132814f20d Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05
am: 9eaa59a1ff

* commit '9eaa59a1ff315bbf4d9809b30bf7777aa88e6bee':
  Add setting for declaring disabled bluetooth profiles.
2015-12-17 19:51:17 +00:00
Bryce Lee
9eaa59a1ff Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
am: cf91b45c05

* commit 'cf91b45c05358c81ddaccf3ddd4b1ea6d5295faa':
  Add setting for declaring disabled bluetooth profiles.
2015-12-17 11:45:17 -08:00
Bryce Lee
cf91b45c05 Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev 2015-12-17 19:40:47 +00:00
Ying Wang
84d1b18b7b Merge "Fix typo in config.xml file"
am: 738a557d54

* commit '738a557d54153eedc74aee3dfb128f84e8ca13d4':
  Fix typo in config.xml file
2015-12-17 11:26:48 -08:00
Julia Reynolds
1ac1e3104c Merge "Aidl it all!" 2015-12-17 19:15:30 +00:00
Ying Wang
738a557d54 Merge "Fix typo in config.xml file" 2015-12-17 19:10:13 +00:00
Alan Viverette
31c2ac78d9 Merge "Handle null result from getVirtualChildAt()" 2015-12-17 19:07:29 +00:00
Todd Kennedy
36a832dd12 Merge "revert quick install" 2015-12-17 18:49:08 +00:00
Todd Kennedy
373f0b4313 revert quick install
bug: 25118622
Change-Id: I61c3a1ea9015599dc45bd9e656f99f6bf8c4ec02
2015-12-17 10:32:49 -08:00
Wale Ogunwale
1f544beb7a Use accessor methods to get/set visibleBehindActivity
The accessor methods have protection against the stack been
in a detached state. Reading the field directly can lead to
an NPE when the stack is detached.

Bug: 26209403
Change-Id: I66fc1871ea96504cf1bcbc72cae9b564d6527bce
2015-12-17 10:32:07 -08:00
Steve McKay
c75fa4a5bc Merge "Eliminate dialog mode from DocumentsUI." 2015-12-17 18:29:08 +00:00