OSDN Git Service
Keisuke Kuroyanagi [Thu, 17 Dec 2015 08:50:42 +0000 (17:50 +0900)]
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
Tomasz Mikolajewski [Thu, 17 Dec 2015 08:05:36 +0000 (08:05 +0000)]
Merge "Add support to virtual and typed files in StubProvider."
Wonsik Kim [Thu, 17 Dec 2015 07:05:51 +0000 (07:05 +0000)]
Merge "TIF: add signal detection feature for HW inputs"
Wonsik Kim [Thu, 26 Nov 2015 09:51:09 +0000 (18:51 +0900)]
TIF: add signal detection feature for HW inputs
Bug:
23820259
Change-Id: If7f03b49f7510ec405dfc4fb2b6f709b8c8b820d
Tomasz Mikolajewski [Mon, 14 Dec 2015 09:50:24 +0000 (18:50 +0900)]
Add support to virtual and typed files in StubProvider.
Bug:
26147488
Change-Id: I40a75547ff16bb7d45f36843c29692268b4291b6
Tomasz Mikolajewski [Thu, 17 Dec 2015 06:03:44 +0000 (06:03 +0000)]
Merge "Append a correct extension in case of copying virtual files."
Vladislav Kaznacheev [Thu, 17 Dec 2015 04:07:39 +0000 (04:07 +0000)]
Merge "Rename and simplify DropPermissionHolder"
Keisuke Kuroyanagi [Thu, 17 Dec 2015 04:05:49 +0000 (04:05 +0000)]
Merge "Change cursor shape to STYLE_HAND on ClickableSpans"
Shreyas Basarge [Thu, 17 Dec 2015 03:00:00 +0000 (03:00 +0000)]
Merge "Fixes NPE bug in JobScheduler.getAllPendingJobs()"
Tomasz Mikolajewski [Wed, 16 Dec 2015 08:08:37 +0000 (17:08 +0900)]
Append a correct extension in case of copying virtual files.
Bug:
26147488
Change-Id: I3e310c102e7c819ea16b47dfe7902d389cfc9d00
Tomasz Mikolajewski [Thu, 17 Dec 2015 02:04:22 +0000 (02:04 +0000)]
Merge "Fix CopyService after recent refactoring."
Tomasz Mikolajewski [Wed, 16 Dec 2015 06:19:01 +0000 (15:19 +0900)]
Fix CopyService after recent refactoring.
My recent CL broke tests badly. This time double checked.
Bug:
26218041
Bug:
26176231
Change-Id: Ia1f68d7cff83ec9c3cfb9bccb9c91ff092b25ced
Vladislav Kaznacheev [Tue, 15 Dec 2015 20:16:28 +0000 (12:16 -0800)]
Rename and simplify DropPermissionHolder
Rename DropPermissionHolder to DropPermissions and move
all server-side implementation details into a separate class.
Rename DragEvent.getDropPermissionHolder to
requestDropPermissions and make it take the permissions
implicitly.
Change-Id: Ia83f7cb8af07ce13ba9536d24b0f9d63331d8736
Bryce Lee [Thu, 17 Dec 2015 00:42:08 +0000 (00:42 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b am:
fc3762aafd am:
0ccc3a1cb5
am:
972c616ce2
* commit '
972c616ce2f83622e5529ef86c9d7f243a60b601':
Add UUID to BluetoothHeadsetClientCall
Adam Lesinski [Thu, 17 Dec 2015 00:40:32 +0000 (00:40 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2 am:
8c9209183f am:
7f5ad22330 am:
1f7a36b8e6
am:
087e0fcba6 -s ours
* commit '
087e0fcba687bce677f39fd2b708a9cbb1defcd0':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Eino-Ville Talvala [Thu, 17 Dec 2015 00:39:07 +0000 (00:39 +0000)]
Merge "Revert "Camera2: create new streams if surface size has changed"" am:
79ac3edc57
am:
6e49caeaab
* commit '
6e49caeaabeb852f0b6cd1e75d9871bc6b70b981':
Revert "Camera2: create new streams if surface size has changed"
Eino-Ville Talvala [Thu, 17 Dec 2015 00:37:41 +0000 (00:37 +0000)]
Merge "Camera2: create new streams if surface size has changed" am:
bcb636d423
am:
c8a16ab564
* commit '
c8a16ab564532cbbdd781d0528c825945c63e907':
Camera2: create new streams if surface size has changed
Bryce Lee [Thu, 17 Dec 2015 00:28:04 +0000 (00:28 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b am:
fc3762aafd
am:
0ccc3a1cb5
* commit '
0ccc3a1cb5487fb2640d749be698866475a2c435':
Add UUID to BluetoothHeadsetClientCall
Bryce Lee [Thu, 17 Dec 2015 00:20:34 +0000 (00:20 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am:
cae2f2415b
am:
fc3762aafd
* commit '
fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
Add UUID to BluetoothHeadsetClientCall
Filip Gruszczynski [Thu, 17 Dec 2015 00:11:28 +0000 (00:11 +0000)]
Merge "If pinned stack is focused, look for the one below for logging."
Bryce Lee [Thu, 17 Dec 2015 00:09:56 +0000 (00:09 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
am:
cae2f2415b
* commit '
cae2f2415ba04eb854fdcdc6aa66c857ad7148d0':
Add UUID to BluetoothHeadsetClientCall
Tyler Gunn [Thu, 17 Dec 2015 00:09:55 +0000 (00:09 +0000)]
Merge "Remove dependency on android.telecom.Call in VideoCallImpl for testing."
Chris Craik [Thu, 17 Dec 2015 00:05:49 +0000 (16:05 -0800)]
Fix build
Change-Id: I1fc72636afc070257526ce1500e96e9b39089640
Bryce Lee [Thu, 17 Dec 2015 00:02:41 +0000 (00:02 +0000)]
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
Chris Craik [Wed, 16 Dec 2015 23:48:27 +0000 (23:48 +0000)]
Merge "Add TextureView support to new renderer/reorderer"
Adam Lesinski [Wed, 16 Dec 2015 23:44:25 +0000 (23:44 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2 am:
8c9209183f am:
7f5ad22330
am:
1f7a36b8e6
* commit '
1f7a36b8e6aa55dcb22a63c250fb318260ac349f':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Chris Craik [Wed, 16 Dec 2015 22:27:20 +0000 (14:27 -0800)]
Add TextureView support to new renderer/reorderer
bug:
22480459
Change-Id: I2e4c0bc6b904706132f3f5087ededc9cac9b40fb
Adam Lesinski [Wed, 16 Dec 2015 23:35:17 +0000 (23:35 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2 am:
8c9209183f
am:
7f5ad22330
* commit '
7f5ad223306a482bdf33d213971af041e9fba590':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Bryce Lee [Wed, 16 Dec 2015 23:33:59 +0000 (15:33 -0800)]
Add UUID to BluetoothHeadsetClientCall
This will allow for unique identification of a call as id only provides
uniqueness per session.
Bug:
26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
Adam Lesinski [Wed, 16 Dec 2015 23:25:45 +0000 (23:25 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638 am:
40d1ab91d2
am:
8c9209183f
* commit '
8c9209183fa67953bebe1adb5dfb529c1b6273f0':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Eino-Ville Talvala [Wed, 16 Dec 2015 23:20:29 +0000 (23:20 +0000)]
Merge "Revert "Camera2: create new streams if surface size has changed""
am:
79ac3edc57
* commit '
79ac3edc57f93d6b8e8187b549dd23512b841fb2':
Revert "Camera2: create new streams if surface size has changed"
Adam Lesinski [Wed, 16 Dec 2015 23:16:18 +0000 (23:16 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am:
b2c5155638
am:
40d1ab91d2
* commit '
40d1ab91d2a0ed1f066b6a8de821c9c4c70ca512':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Wale Ogunwale [Wed, 16 Dec 2015 23:16:03 +0000 (23:16 +0000)]
Merge "Added config_defaultPictureInPictureBounds"
Eino-Ville Talvala [Wed, 16 Dec 2015 23:09:29 +0000 (23:09 +0000)]
Merge "Camera2: create new streams if surface size has changed"
am:
bcb636d423
* commit '
bcb636d4232bedfb421ecaa157f67b96a1b26944':
Camera2: create new streams if surface size has changed
Adam Lesinski [Wed, 16 Dec 2015 23:09:27 +0000 (23:09 +0000)]
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
am:
b2c5155638
* commit '
b2c51556382acd3981e5a6380e2fb3d85c2f68a5':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
Fyodor Kupolov [Wed, 16 Dec 2015 23:07:20 +0000 (23:07 +0000)]
Merge "Introduced PRIVATE_FLAG_REQUIRED_FOR_SYSTEM_USER"
Adam Lesinski [Wed, 16 Dec 2015 23:02:16 +0000 (23:02 +0000)]
Merge "Fix positional arguments in strings"
Eino-Ville Talvala [Wed, 16 Dec 2015 23:01:43 +0000 (23:01 +0000)]
Merge "Revert "Camera2: create new streams if surface size has changed""
Ben Kwa [Wed, 16 Dec 2015 22:53:13 +0000 (22:53 +0000)]
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.
Yin-Chia Yeh [Wed, 16 Dec 2015 22:50:48 +0000 (22:50 +0000)]
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.
Adam Lesinski [Wed, 2 Dec 2015 23:40:19 +0000 (15:40 -0800)]
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)
Filip Gruszczynski [Wed, 16 Dec 2015 22:40:04 +0000 (14:40 -0800)]
If pinned stack is focused, look for the one below for logging.
Bug:
26230638
Change-Id: Ibe0b993286c4669e0f565bd2d4af6077553a29e2
Winson Chung [Wed, 16 Dec 2015 22:37:21 +0000 (22:37 +0000)]
Merge "Minor fixes to freeform workspace"
Chris Craik [Wed, 16 Dec 2015 22:35:45 +0000 (22:35 +0000)]
Merge "Add TextOnPath support to new reorderer/renderer"
Adam Lesinski [Wed, 16 Dec 2015 22:33:32 +0000 (14:33 -0800)]
Fix positional arguments in strings
Change-Id: Id5768adba6b0422b5bb81e800a32be19db2a8626
Winson Chung [Wed, 16 Dec 2015 20:43:12 +0000 (15:43 -0500)]
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
Makoto Onuki [Wed, 16 Dec 2015 22:31:44 +0000 (22:31 +0000)]
Merge "Add SQLiteDatabase.validateSql()"
Todd Kennedy [Wed, 16 Dec 2015 22:22:05 +0000 (22:22 +0000)]
Merge "Remove 2nd line from failure"
Makoto Onuki [Wed, 16 Dec 2015 22:02:01 +0000 (14:02 -0800)]
Add SQLiteDatabase.validateSql()
This API checks the SQL syntax by compiling it. This is useful to
detect SQL injection, for example.
Change-Id: I956548a34f664950246856966e5601dcac3daf00
Eino-Ville Talvala [Wed, 16 Dec 2015 22:18:13 +0000 (22:18 +0000)]
Merge "Camera2: create new streams if surface size has changed"
Winson Chung [Wed, 16 Dec 2015 22:08:34 +0000 (22:08 +0000)]
Merge "Fixing merge issue from ag/830529"
Winson Chung [Wed, 16 Dec 2015 22:07:19 +0000 (17:07 -0500)]
Fixing merge issue from ag/830529
- A whole slew of changes didn't make that CL
Bug:
26043233
Change-Id: I470005f1afbf4ca23e6cfe40a497c5c67bb794aa
Ben Kwa [Thu, 10 Dec 2015 23:21:18 +0000 (15:21 -0800)]
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
Ben Kwa [Mon, 7 Dec 2015 21:25:27 +0000 (13:25 -0800)]
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
Todd Kennedy [Wed, 16 Dec 2015 21:47:14 +0000 (13:47 -0800)]
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
Wale Ogunwale [Mon, 7 Dec 2015 03:39:01 +0000 (19:39 -0800)]
Added config_defaultPictureInPictureBounds
Allows device to specify the default launch bounds
for the pinned stack.
Bug:
25580820
Change-Id: I477781aec910553d3b3645a0ac6106cf616949ed
Wale Ogunwale [Wed, 16 Dec 2015 21:30:51 +0000 (21:30 +0000)]
Merge "API for an Activity to enter picture-in-picture mode."
Winson Chung [Wed, 16 Dec 2015 21:27:55 +0000 (21:27 +0000)]
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.
Julia Reynolds [Wed, 16 Dec 2015 20:40:17 +0000 (20:40 +0000)]
Merge "Clean up orphaned zen rules, synchronize better."
Julia Reynolds [Tue, 15 Dec 2015 18:54:41 +0000 (13:54 -0500)]
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
Alan Viverette [Wed, 16 Dec 2015 20:28:23 +0000 (15:28 -0500)]
Remove DayNight themes from public API (again)
Bug:
22628106
Change-Id: Id55c9e626813c70671a93aedf8b1e0cdaed45ec1
Winson Chung [Tue, 15 Dec 2015 19:46:23 +0000 (14:46 -0500)]
Allowing tasks to be swiped away in the history view.
Change-Id: Ide26856c291bcdd1b4ab5e15ae9eb876a9af719b
Winson Chung [Mon, 14 Dec 2015 18:57:36 +0000 (13:57 -0500)]
Loading activity icons in History view.
Change-Id: I68bbef59d380ce7abe251fca75135775528429d5
Winson Chung [Fri, 11 Dec 2015 15:24:21 +0000 (10:24 -0500)]
Ensuring that the undocked task is visible in Overview.
Bug:
26043233
Change-Id: I2186bdfc64af161b8e828061a8e064f90c5cae24
Felipe Leme [Wed, 16 Dec 2015 19:55:08 +0000 (19:55 +0000)]
Merge "Changed the action executed when "Take bug report" is selected."
Jason Monk [Sat, 12 Dec 2015 02:39:54 +0000 (21:39 -0500)]
Switch Tuner to support prefs (and some improvements)
Change-Id: I2ef62c0c56d4af69f9f34e1cfd297999d59b7da6
Felipe Leme [Wed, 16 Dec 2015 19:39:11 +0000 (19:39 +0000)]
Merge "Allows users to add details about a bugreport in progress."
Filip Gruszczynski [Wed, 16 Dec 2015 19:38:50 +0000 (19:38 +0000)]
Merge "Fix sysui crash."
Felipe Leme [Fri, 11 Dec 2015 23:07:14 +0000 (15:07 -0800)]
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
Filip Gruszczynski [Wed, 16 Dec 2015 19:31:12 +0000 (11:31 -0800)]
Fix sysui crash.
Bug:
26228707
Change-Id: I34e2362fecda06380e4640483a71365311f99d57
John Reck [Wed, 16 Dec 2015 19:09:12 +0000 (19:09 +0000)]
Merge "resolve merge conflicts of
04ce46db64 to "
John Reck [Wed, 16 Dec 2015 19:07:53 +0000 (11:07 -0800)]
resolve merge conflicts of
04ce46db64 to master.
Change-Id: I935bb47718f0e7d5fb48945dd8de6e28dac136e5
Wale Ogunwale [Mon, 7 Dec 2015 02:42:57 +0000 (18:42 -0800)]
API for an Activity to enter picture-in-picture mode.
Bug:
25580820
Change-Id: I5c1bf17dd5dd92622458a61517bc9941e4ee5277
Alan Viverette [Wed, 16 Dec 2015 18:56:08 +0000 (18:56 +0000)]
Merge "Check for null MenuHelper before setting presenter callback"
John Reck [Wed, 16 Dec 2015 18:44:57 +0000 (18:44 +0000)]
Merge "libhwui: make setSurface asynchronous"
am:
738a5d4f18
* commit '
738a5d4f18e69c03700b77af0ea7e2a101da2c34':
libhwui: make setSurface asynchronous
Shreyas Basarge [Wed, 16 Dec 2015 18:10:05 +0000 (18:10 +0000)]
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
Winson Chung [Wed, 16 Dec 2015 18:33:47 +0000 (18:33 +0000)]
Merge "Adding catch for b/
26221779"
Derek Sollenberger [Wed, 16 Dec 2015 18:32:39 +0000 (18:32 +0000)]
Merge "Remove onDrawSprite API as it is no longer exposed via SkCanvas"
John Reck [Wed, 16 Dec 2015 18:27:24 +0000 (18:27 +0000)]
Merge "libhwui: make setSurface asynchronous"
Chris Craik [Tue, 15 Dec 2015 18:34:36 +0000 (10:34 -0800)]
Add TextOnPath support to new reorderer/renderer
bug:
22480459
Change-Id: I302048ec09901420c15003e21e44a551cc59c7ad
Chris Craik [Wed, 16 Dec 2015 18:25:35 +0000 (18:25 +0000)]
Merge "Allow RT animation of new renderer"
Winson Chung [Wed, 16 Dec 2015 18:18:43 +0000 (13:18 -0500)]
Adding catch for b/
26221779
Change-Id: Id0cf455cd65bf5b202a6249b0b51351addb0bd17
Chris Craik [Wed, 16 Dec 2015 03:17:32 +0000 (19:17 -0800)]
Allow RT animation of new renderer
Change-Id: I60136dc080dc4fd853ac8c3d37fefa85da1181df
Andrei Stingaceanu [Thu, 26 Nov 2015 15:26:28 +0000 (15:26 +0000)]
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
Jeff Sharkey [Wed, 16 Dec 2015 17:57:17 +0000 (17:57 +0000)]
Merge "Relax isUserRunning() when asking about self."
Geoff Mendal [Wed, 16 Dec 2015 17:36:36 +0000 (17:36 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Wed, 16 Dec 2015 17:22:45 +0000 (10:22 -0700)]
Relax isUserRunning() when asking about self.
When a caller is asking about locked state of themselves, don't
require the INTERACT_ACROSS_USERS permission.
Bug:
26178790
Change-Id: I0f02ebfed87b2e1cddc1cb044a9f04272f85483b
Jason Monk [Wed, 16 Dec 2015 17:17:13 +0000 (17:17 +0000)]
Merge "Fix bootloops from new zen changed broadcast"
Jason Monk [Wed, 16 Dec 2015 17:06:51 +0000 (12:06 -0500)]
Fix bootloops from new zen changed broadcast
Bug:
26226057
Change-Id: Ie1e0cbfdbb44c6eea3dafed777fe8ad49ca696a5
Geoff Mendal [Wed, 16 Dec 2015 17:03:59 +0000 (18:03 +0100)]
Import translations. DO NOT MERGE
Change-Id: Idc2d12d6616f6b406b078a5662fe864f616d29e2
Auto-generated-cl: translation import
Derek Sollenberger [Wed, 16 Dec 2015 16:46:50 +0000 (11:46 -0500)]
Remove onDrawSprite API as it is no longer exposed via SkCanvas
Change-Id: Id6f0bb7a9b4eaad0d0442d4ab4212f6a56070c66
Geoff Mendal [Wed, 16 Dec 2015 16:45:52 +0000 (16:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
d0dd157ade -s ours am:
4893042569 -s ours am:
1d81716044 -s ours
am:
079a994976 -s ours
* commit '
079a9949765dad88c901f3c7ab0deaa3abba0925':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:43:58 +0000 (16:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
8b4b230174 -s ours am:
82ce2a6cdb -s ours am:
86c9eb83ce -s ours
am:
edb3565ba9 -s ours
* commit '
edb3565ba93e4990249327b8def457db50e5207e':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:42:28 +0000 (16:42 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
10bc1c7000 -s ours am:
c8ddc96f01 -s ours am:
5b1b0a8224 -s ours
am:
00c44332d9 -s ours
* commit '
00c44332d91b375892d5521c41f4da050775b212':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:41:05 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
df5dd062a0 -s ours am:
a32b362f00 -s ours am:
4cab51620b -s ours
am:
ae767ad74a -s ours
* commit '
ae767ad74a254cf51d6d297e5f81c82f4801e738':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:39:44 +0000 (16:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
531eb5b484 -s ours am:
57a89670cb -s ours am:
b16da9aef2 -s ours
am:
67da1e8dd3 -s ours
* commit '
67da1e8dd3376bd208554eba38d114485cab402d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:38:24 +0000 (16:38 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev am:
327d917865 -s ours am:
7babe8de9e -s ours am:
0750798334 -s ours
am:
3b290555ef -s ours
* commit '
3b290555ef9d92949a0e5339c2d9cb7ea3e82b35':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 16 Dec 2015 16:37:03 +0000 (16:37 +0000)]
Import translations. DO NOT MERGE am:
22dea4e16f -s ours am:
d8004c03d2 -s ours am:
b295f8112c -s ours
am:
8cd03afa2b -s ours
* commit '
8cd03afa2bc9725f67922ac0f19059cbd841dcba':
Import translations. DO NOT MERGE
Jeff Sharkey [Wed, 16 Dec 2015 16:25:11 +0000 (16:25 +0000)]
Merge "Roll back some broadcasts."
Jeff Sharkey [Wed, 16 Dec 2015 16:23:58 +0000 (09:23 -0700)]
Roll back some broadcasts.
Bug:
26219971,
26219772
Change-Id: Ic45691419f8fcd1b472a380f09408caf29d3c13d