Commit Graph

228203 Commits

Author SHA1 Message Date
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
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
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
Wale Ogunwale
77309fa171 Merge "Use accessor methods to get/set visibleBehindActivity" 2015-12-17 19:54:40 +00:00
Julia Reynolds
1ac1e3104c Merge "Aidl it all!" 2015-12-17 19:15:30 +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
Gustav Sennton
081dcb82ff Merge "Allow several valid signatures per WebView provider." 2015-12-17 18:04:38 +00:00
Filip Gruszczynski
233c1c57c1 Merge "Only add noDisplay activities to freeform source tasks." 2015-12-17 17:57:49 +00:00
Filip Gruszczynski
3d0267143f Only add noDisplay activities to freeform source tasks.
We started adding noDisplay activities to source tasks to make the
resolver activity show up within the same task bounds as what caused it
to appear. However, in other cases it might cause to add a noDisplay
activity to a task in which we don't expect anything to appear, e.g.
home task when launching from home.

Bug: 26128908
Bug: 26023670
Change-Id: I2f64e82b3c3754cdbcb4cac3f907674344e67e04
2015-12-17 09:56:45 -08:00
Samuel Tan
a6d4744e89 Merge "Add comments to keep Java and native binder PersistableBundle in sync" am: 6de926a7d6
am: 4981ae9083

* commit '4981ae908349767fee7976cc82c54a7fb00ee4fd':
  Add comments to keep Java and native binder PersistableBundle in sync
2015-12-17 09:55:24 -08:00
Samuel Tan
76d3072dd6 Merge "Fix PersistableBundle handling in Parcel.writeValue" am: d12959193c
am: d3decff052

* commit 'd3decff052c4f7471a21fbbb116b32586181b391':
  Fix PersistableBundle handling in Parcel.writeValue
2015-12-17 09:53:44 -08:00
Samuel Tan
19091a7fad Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-12-17 09:52:47 -08:00
Samuel Tan
33d5888d7a Merge "Specify path for native PersistableBundle implementation" am: 477fa220b1
am: 0bc7647f63

* commit '0bc7647f63bcdf2d63ee71d770f9514a239eaba8':
  Specify path for native PersistableBundle implementation
2015-12-17 09:52:11 -08:00
Alan Viverette
0cc6b5a496 Merge "Propagate TextView drawable state after resolving RTL drawables" 2015-12-17 17:51:53 +00:00
Steve McKay
a8f03a2d81 Eliminate dialog mode from DocumentsUI.
DocumentsActivity to Use standard drawer layout at all display resolutions.

Bug: 26208032
Change-Id: I3b93c81bf97045744074a299e92cdea4aae7628d
2015-12-17 09:44:57 -08:00
Alan Viverette
ad52693cf3 Handle null result from getVirtualChildAt()
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.

Bug: 25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
2015-12-17 12:42:39 -05:00
Gustav Sennton
5c2454cde1 Allow several valid signatures per WebView provider.
If one of the signatures match the package signature the package is
considered valid. This makes it possible to match signatures in user
builds for both signed and unsigned builds.

Bug: 26220882

Change-Id: Ie2e7567bf518d4859d68b5fdf5b9833fcdaa7670
2015-12-17 17:10:01 +00:00
Filip Gruszczynski
92e432c30e Refactor and improve window layering.
This CL moves layer calculation into a separate class, so the whole
logic can be encapsulated. It also extracts special cases from the
general loop and instead applies them at the end. This simplifies the
logic in the main algorithm and makes it clearer what needs to happen
for special cases.

Bug: 26144888

Change-Id: I87347bf0198bd0d3cd09e4231b4652ab979f2456
2015-12-17 08:55:50 -08:00
Alan Viverette
ad217b68f8 Merge "Don't call public non-final getResources() from getAssets()" 2015-12-17 16:38:42 +00:00
Winson Chung
aaeaac1783 Refactoring to AnimatedEvent.
Change-Id: I87ce63201120dc687eccd63024801cc2c19bebd6
2015-12-17 11:11:01 -05:00
Winson Chung
aa4f800891 Fixing minor issue with freeform workspace not showing.
- Also slightly tweaking drop target sizes to be a bit smaller

Change-Id: I0e877e64acba5dd165c0d7a2cffb24dea88d673f
2015-12-17 15:31:18 +00:00
Matt Sarett
66837204a1 Merge "Clean-ups for BitmapRegionDecoder" 2015-12-17 15:13:14 +00:00
Tomasz Mikolajewski
6e690ac8dc Merge "Add tests for copying virtual typed files." 2015-12-17 13:36:20 +00:00
Esteban Talavera
f3378a29e9 Merge "Device or profile owner can let another app manage app restrictions" 2015-12-17 10:59:16 +00:00
Mahaver Chopra
699d537d1b Merge "Adding DPM.reboot" 2015-12-17 10:59:01 +00:00
Esteban Talavera
bf60f728cc Device or profile owner can let another app manage app restrictions
The device or profile owner can allow another
package to set app restrictions for any app in that user

Similar to the way it can give permission to access
CA certificate related APIs from M.

Bug: 22541936
Change-Id: I0c1b0804ad300dfa4fbdc1c7721c5d8653d77861
2015-12-17 10:57:09 +00:00
Chris Banes
12a47ac41e Fix AlertDialog.setIcon() not working when called after show() pt.2
BUG: 26183328
Change-Id: I2bd8ff0315e04dd33fe720f0e5c32dec06747afc
2015-12-17 10:00:26 +00:00
Keisuke Kuroyanagi
fbca8264e0 Merge "TextView tests: open context menu on right click." 2015-12-17 08:51:35 +00:00
Keisuke Kuroyanagi
d056081e50 TextView: Open context menu on right click.
- Construct context menu in #onCreateContextMenu.
- Ignore non-primary buttons for selection.
- Don't open context menu on long click.

Bug: 19544351
Bug: 19397276
Bug: 24872170

Change-Id: I4690e1485682be4f9b504b8fb6af936b979f13b8
2015-12-17 17:50:42 +09:00
Keisuke Kuroyanagi
a0b3c06881 TextView tests: open context menu on right click.
- Extend MouseUiController and MouseClickAction to support choosing click
button.
- Introduce ContextMenuUtils to provide useful methods for context menu
testing.

Bug: 25730231
Change-Id: I4f04716428b8cfdcf9f953fe8f8d27f5374b0425
2015-12-17 08:19:56 +00:00
Tomasz Mikolajewski
416b8ea732 Merge "Add support to virtual and typed files in StubProvider." 2015-12-17 08:05:36 +00:00