228211 Commits

Author SHA1 Message Date
Adam Lesinski
906fd73e11 Merge "Fix positional arguments in strings" 2015-12-16 23:02:16 +00:00
Eino-Ville Talvala
79ac3edc57 Merge "Revert "Camera2: create new streams if surface size has changed"" 2015-12-16 23:01:43 +00:00
Ben Kwa
79aa087811 Merge changes from topic 'directoryfragment-stable-ids'
* changes:
  Wrap up the stable ID refactor.
  Re-enable sorting in the DirectoryFragment.
  Fix file deletion after the move to Model IDs.
  Transition selection to use Model IDs.
  Switch DirectoryFragment code to use model IDs.
2015-12-16 22:53:13 +00:00
Yin-Chia Yeh
e94b3fe953 Revert "Camera2: create new streams if surface size has changed"
This change is redundant after the following change is merged:

Camera2: Handle surface size change

When comparing if two OutputConfigurations are equal, also check
the width, height, format, dataspace when the output configurations
were created. With this, CameraDeviceImpl knows that the surface has
changed sizes and will reconfigure the stream.

Bug: 12250682
Change-Id: I4216260a0a08ad87b835ed97e9eaddf1df317fcc
This reverts commit f49f8b0bad0c6cd5db1b603233ad008c5bac4a60.
2015-12-16 22:50:48 +00:00
Adam Lesinski
b2c5155638 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Include <uses-permission-sdk-23> permissions in dump badging and dump permissions.

This will also add implied features for that permission, marked as -sdk-23 features.

Ex:

uses-permission: name='android.permission.ACCESS_FINE_LOCATION'
uses-permission-sdk-23: name='android.permission.CAMERA'

feature-group: label=''
  uses-feature: name='android.hardware.location'
  uses-implied-feature: name='android.hardware.location' reason='...'
  uses-feature-sdk-23: name='android.hardware.camera'
  uses-implied-feature-sdk-23: name='android.hardware.camera' reason='...'

Bug:24939655
Change-Id: Ifb374696ed4760b0ba2f1cc3516f3bf08e6cb6a3
(cherry picked from commit 5f3b2ecb3e9d27e77bd59c7b9006a6239b773944)
2015-12-16 22:43:07 +00:00
Filip Gruszczynski
caae14e478 If pinned stack is focused, look for the one below for logging.
Bug: 26230638
Change-Id: Ibe0b993286c4669e0f565bd2d4af6077553a29e2
2015-12-16 14:40:04 -08:00
Winson Chung
d27dae2085 Merge "Minor fixes to freeform workspace" 2015-12-16 22:37:21 +00:00
Chris Craik
09d7a93bed Merge "Add TextOnPath support to new reorderer/renderer" 2015-12-16 22:35:45 +00:00
Adam Lesinski
cf982aa2e3 Fix positional arguments in strings
Change-Id: Id5768adba6b0422b5bb81e800a32be19db2a8626
2015-12-16 14:35:37 -08:00
Winson Chung
509d0d0c9e Minor fixes to freeform workspace
- Fixing regression where we were clobbering the freeform stack order
- Ensure there is padding between tasks
- Fix the header bar animation

Change-Id: I69ced3e3cb2f0c761ddf0c3bd00b17c847d74c0b
2015-12-16 17:34:32 -05:00
Makoto Onuki
60df01c522 Merge "Add SQLiteDatabase.validateSql()" 2015-12-16 22:31:44 +00:00
Todd Kennedy
88476417cd Merge "Remove 2nd line from failure" 2015-12-16 22:22:05 +00:00
Makoto Onuki
17aa1b7ac7 Add SQLiteDatabase.validateSql()
This API checks the SQL syntax by compiling it.  This is useful to
detect SQL injection, for example.

Change-Id: I956548a34f664950246856966e5601dcac3daf00
2015-12-16 14:18:28 -08:00
Eino-Ville Talvala
bcb636d423 Merge "Camera2: create new streams if surface size has changed" 2015-12-16 22:18:13 +00:00
Winson Chung
6545fbfa51 Merge "Fixing merge issue from ag/830529" 2015-12-16 22:08:34 +00:00
Winson Chung
9756755db7 Fixing merge issue from ag/830529
- A whole slew of changes didn't make that CL

Bug: 26043233
Change-Id: I470005f1afbf4ca23e6cfe40a497c5c67bb794aa
2015-12-16 17:07:19 -05:00
Ben Kwa
fcb54d8be7 Wrap up the stable ID refactor.
- Rationalize band selection: make it internally a range selection
  operation, that translates positions to IDs only when updating the
  Selection.
- Clean up TODOs and comments.
- Fix selection adjustment when things are removed from the view.

Change-Id: If917eb9dd18e755c5a0ce83c84409902c4ef3d2e
2015-12-16 14:04:24 -08:00
Ben Kwa
862b9641e3 Re-enable sorting in the DirectoryFragment.
- Move sorting from the back-end (using SortingCursorWrapper) to the the
  front-end (in DocumentsAdapter).  This makes it such that re-sorting
  the directory contents doesn't necessitate a reload.
- Update DirectoryLoaders to just return unsorted results, and rely on
  the UI to sort them.
- Remove the (now-unused) SortingCursorWrapper.
- Update Model tests to test sorting.

BUG=26024369

Change-Id: I871cc0e496267d381ae546e0309125d04649415a
2015-12-16 13:54:01 -08:00
Todd Kennedy
8d9366cfe9 Remove 2nd line from failure
In an attempt to provide more detailed information to the end-user, we
caused tests to fail [they parse the output of the 'pm' command]. Remove
the 2nd line of the output that was causing the failure.

Also took the opportunity to merge changes from the Pm command to the
Cmd command.

Bug: 26131598
Change-Id: I459f9ec8978d87dd571136222f780039e426474e
2015-12-16 13:47:14 -08:00
Wale Ogunwale
d88f651da8 Added config_defaultPictureInPictureBounds
Allows device to specify the default launch bounds
for the pinned stack.

Bug: 25580820
Change-Id: I477781aec910553d3b3645a0ac6106cf616949ed
2015-12-16 13:40:19 -08:00
Wale Ogunwale
c51fd1d8cf Merge "API for an Activity to enter picture-in-picture mode." 2015-12-16 21:30:51 +00:00
Winson Chung
75ca185730 Merge changes Ide26856c,I68bbef59,I2186bdfc
* changes:
  Allowing tasks to be swiped away in the history view.
  Loading activity icons in History view.
  Ensuring that the undocked task is visible in Overview.
2015-12-16 21:27:55 +00:00
Alan Viverette
189d4f5b77 Propagate TextView drawable state after resolving RTL drawables
Bug: 24502082
Change-Id: Iec9c44041622d19401fc074947e15b4843f79d86
2015-12-16 16:06:23 -05:00
Alan Viverette
713a5cdb53 Don't call public non-final getResources() from getAssets()
Refactors to getResourcesInternal() and calls that from both methods.
Adds documentation on Context.getResources() and getAssets() that the
instances returned should be consistent with each other.

Bug: 26228895
Change-Id: I41b09f1e9a3a0315bcdf1c08a7b431a9a697bb6f
2015-12-16 15:46:32 -05:00
Julia Reynolds
98a400edb7 Merge "Clean up orphaned zen rules, synchronize better." 2015-12-16 20:40:17 +00:00
Julia Reynolds
5a43aaa6a4 Clean up orphaned zen rules, synchronize better.
(If a rule was restored to the device but the user didn't restore
the matching app).

Bug: 25472361
Change-Id: Icaefd0d1fca78ff351937fbe553ae72922a5457f
2015-12-16 20:37:15 +00:00
Alan Viverette
ba398eaafe Remove DayNight themes from public API (again)
Bug: 22628106
Change-Id: Id55c9e626813c70671a93aedf8b1e0cdaed45ec1
2015-12-16 15:28:23 -05:00
Winson Chung
4e5fb2f4e1 Allowing tasks to be swiped away in the history view.
Change-Id: Ide26856c291bcdd1b4ab5e15ae9eb876a9af719b
2015-12-16 15:27:12 -05:00
Winson Chung
b169ebd4c4 Loading activity icons in History view.
Change-Id: I68bbef59d380ce7abe251fca75135775528429d5
2015-12-16 15:27:05 -05:00
Winson Chung
062667710e Ensuring that the undocked task is visible in Overview.
Bug: 26043233
Change-Id: I2186bdfc64af161b8e828061a8e064f90c5cae24
2015-12-16 15:26:57 -05:00
Felipe Leme
eb2094ce24 Merge "Changed the action executed when "Take bug report" is selected." 2015-12-16 19:55:08 +00:00
Jason Monk
87ccd55e8a Switch Tuner to support prefs (and some improvements)
Change-Id: I2ef62c0c56d4af69f9f34e1cfd297999d59b7da6
2015-12-16 19:41:25 +00:00
Felipe Leme
b1a523b458 Merge "Allows users to add details about a bugreport in progress." 2015-12-16 19:39:11 +00:00
Filip Gruszczynski
6eba3bb352 Merge "Fix sysui crash." 2015-12-16 19:38:50 +00:00
Felipe Leme
bc73ffc06f Allows users to add details about a bugreport in progress.
The "bugreport in progress" notification now have a "DETAILS" button
that when clicked opens a dialog window displaying the following fields:

  - Name: short name for the bugreport, will be used as part of the
    final files (and by default is the timestamp sent by dumpstate)
  - Title: a 1-line title for the bugreport, will be used as the subject
    in the final message.
  - Description: a detailed description for the bug.

The main advantage of such dialog is that it allows users to enter more
info about a bugreport while it's being generated, rather then when the
bugreport is finished (since of the user doesn't remember what the
context was when the problem happened).

BUG: 25794470
BUG: 10676443
Change-Id: I0d1dba2a94ad989e541415a2a59475619a2e3d13
2015-12-16 11:36:04 -08:00
Filip Gruszczynski
1d61863bd8 Fix sysui crash.
Bug: 26228707
Change-Id: I34e2362fecda06380e4640483a71365311f99d57
2015-12-16 11:31:12 -08:00
John Reck
fc5151106f Merge "resolve merge conflicts of 04ce46db64 to master." 2015-12-16 19:09:12 +00:00
John Reck
bf4b31f7b2 resolve merge conflicts of 04ce46db64 to master.
Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5
2015-12-16 11:07:53 -08:00
Wale Ogunwale
9c604c7c1d API for an Activity to enter picture-in-picture mode.
Bug: 25580820
Change-Id: I5c1bf17dd5dd92622458a61517bc9941e4ee5277
2015-12-16 11:01:46 -08:00
Alan Viverette
0550f1b804 Merge "Check for null MenuHelper before setting presenter callback" 2015-12-16 18:56:08 +00:00
John Reck
04ce46db64 Merge "libhwui: make setSurface asynchronous"
am: 738a5d4f18

* commit '738a5d4f18e69c03700b77af0ea7e2a101da2c34':
  libhwui: make setSurface asynchronous
2015-12-16 18:44:57 +00:00
Shreyas Basarge
d09973bc35 Fixes NPE bug in JobScheduler.getAllPendingJobs()
The extras persistable bundle in JobInfo is
parcelled/unparcelled from different threads
simultaneously for IPC and persisting jobInfo.
The extras bundle in now copied before writing
it to disk.

Bug: 25344172
Change-Id: Ia190181c869d3e5d216dccee9637d3d3a4fb5cb3
2015-12-16 18:34:52 +00:00
Winson Chung
636e71c326 Merge "Adding catch for b/26221779" 2015-12-16 18:33:47 +00:00
Derek Sollenberger
24fa70c2ac Merge "Remove onDrawSprite API as it is no longer exposed via SkCanvas" 2015-12-16 18:32:39 +00:00
John Reck
738a5d4f18 Merge "libhwui: make setSurface asynchronous" 2015-12-16 18:27:24 +00:00
Chris Craik
d7448e65e2 Add TextOnPath support to new reorderer/renderer
bug:22480459

Change-Id: I302048ec09901420c15003e21e44a551cc59c7ad
2015-12-16 10:27:17 -08:00
Chris Craik
47a9fb3b5d Merge "Allow RT animation of new renderer" 2015-12-16 18:25:35 +00:00
Winson Chung
f4fdabf698 Adding catch for b/26221779
Change-Id: Id0cf455cd65bf5b202a6249b0b51351addb0bd17
2015-12-16 18:20:59 +00:00
Chris Craik
adfeec9456 Allow RT animation of new renderer
Change-Id: I60136dc080dc4fd853ac8c3d37fefa85da1181df
2015-12-16 10:20:41 -08:00
Andrei Stingaceanu
1e2839188f Wire call to suspend a package
Adds APIs in DevicePolicyManager and PackageManager for allowing
a device admin to suspend a package. PackageManagerService sets
or unsets a new PackageUserState 'suspended' setting. Terminal
command to suspend/unsuspend has been added via
PackageManagerShellCommand (as root).

Next steps:
* use the new 'suspended' setting for denying access to start app
(probably in ActivityStackSupervisor)
* broadcast a PACKAGE_(UN)SUSPENDED intent for launchers to pick up
* remove app from recents (go further and kill it if it is running)
* erase existing notifications for this app

Bug: 22776576
Change-Id: I718b3498f6a53cc0c6fdfb6d15031e53ddca4353
2015-12-16 18:14:14 +00:00