Jeff Sharkey
16da11eb9e
am 89e86555: Merge "Separate active state from open/close." into lmp-dev
...
* commit '89e865552f42db5cc31ef48ad35f3392e4ed1ac2':
Separate active state from open/close.
2014-09-05 23:38:00 +00:00
Jeff Sharkey
5341f94a19
Merge "Separate active state from open/close." into lmp-dev
2014-09-05 23:28:31 +00:00
Jeff Sharkey
bc7bce38b2
Separate active state from open/close.
...
Also change name to setStagingProgress() to make it clearer that
system may adjust the range. Start throwing from openSession() in
preparation for ASEC allocation moving.
Bug: 17405741
Change-Id: Id7da51a32d5d89cb512ddafbd7ceaafbcd41cac6
2014-09-05 16:16:39 -07:00
Svetoslav
acc90bd72a
am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev
...
* commit '3b42928c318d2732d75bb9c0ed7b864c47a265a2':
Print spooler UI polish and bug fixes.
2014-09-05 22:45:50 +00:00
Chris Craik
ce1a912e34
am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev
...
* commit '6f6a8f2c49aaf07f74310e405abc799c8d05fa19':
Add shadow/clipping properties to HierarchyViewer
2014-09-05 22:45:47 +00:00
Svetoslav
d89c5ad3d3
Merge "Print spooler UI polish and bug fixes." into lmp-dev
2014-09-05 22:37:39 +00:00
Chris Craik
83eb430270
Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev
2014-09-05 22:36:41 +00:00
Chris Craik
5c75c52e04
Add shadow/clipping properties to HierarchyViewer
...
bug:15777980
Change-Id: Ic3d24326f585d2d2b9889486f0ed322eb98b5af8
2014-09-05 15:23:08 -07:00
Svetoslav
6552bf3da6
Print spooler UI polish and bug fixes.
...
1. Added an empty state for pages that are being rendered.
2. Fixed a NPA on a binder thread when destoroying the
remote print adapter.
3. Fixed a rare crash when the print activity gets an
activity class callback while initializing.
4. Changed the preview pages on phone in land to four.
5. Fixed a flicker from a list of pages to an empty state
and then back to the list of pages.
bug:15704969
bug:16966145
Change-Id: I0eea2f30a102d8fefcbf90187fa6d8612fb19434
Conflicts:
packages/PrintSpooler/src/com/android/printspooler/widget/PageContentView.java
2014-09-05 15:21:50 -07:00
Griff Hazen
c37c9708c3
am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev
...
* commit 'fd7d35d0ce4f9fc585b42f11c1844ddbaab6307f':
Reduce chance of notification listener dropped messages.
2014-09-05 21:58:25 +00:00
Griff Hazen
69dd40d08a
Merge "Reduce chance of notification listener dropped messages." into lmp-dev
2014-09-05 21:52:44 +00:00
Aravind Akella
65e74377d9
am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev
...
* commit '6a7a06ee74ec3c63a4096be5bf2e3d18c9867170':
Documentation fix for Sensor.getMaxDelay()
2014-09-05 21:05:19 +00:00
Jim Miller
9e349078ab
am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev
...
* commit '2dfada6c875acffd17f541aaac47aafb265b0164':
Cleanup - Change name of confirm credentials method after API review
2014-09-05 21:05:15 +00:00
Aravind Akella
b67d7e2345
Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev
2014-09-05 20:58:53 +00:00
Jim Miller
fd5bf4ea77
Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev
2014-09-05 20:58:17 +00:00
Eino-Ville Talvala
0eeac755df
am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev
...
* commit '8a52744d343dee6cc4958d0cc59484c036f3bf9f':
Camera2: Final API revisions
2014-09-05 20:52:48 +00:00
Eino-Ville Talvala
71aa8ab5d7
Merge "Camera2: Final API revisions" into lmp-dev
2014-09-05 20:43:52 +00:00
Michael Wright
59f709836c
am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev
...
* commit 'd2300a5972a9bb3e7530302cbf1a52550618bad9':
Allow for event dispatching when in non-interactive states.
2014-09-05 20:04:01 +00:00
Michael Wright
a6863ad622
Merge "Allow for event dispatching when in non-interactive states." into lmp-dev
2014-09-05 19:58:12 +00:00
Amith Yamasani
0b4c65f577
am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev
...
* commit '221281ce8bf1a1c99806ca4cd6137e7b77fd82a3':
Rename getLocalApprovalIntent to createLocalApprovalIntent
2014-09-05 19:53:30 +00:00
Amith Yamasani
4b278afa0d
Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev
2014-09-05 19:43:44 +00:00
Eino-Ville Talvala
fd887436bd
Camera2: Final API revisions
...
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.
Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
2014-09-05 12:43:11 -07:00
Michael Wright
f195dca3a1
am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev
...
* commit 'e252525f6fda8dad56566d78a4881ab35778e9a6':
Add extra to ASSIST intent to indicate potential input type
2014-09-05 19:42:54 +00:00
Michael Wright
57b4ad9f5a
Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev
2014-09-05 19:36:47 +00:00
Jim Miller
2f2ebcd688
Cleanup - Change name of confirm credentials method after API review
...
Fixes bug 17288988
Change-Id: I3d69b52e7ffc9f0268fb4dc9647f8704453668b7
2014-09-05 12:11:48 -07:00
Ruben Brunk
74155c2ea8
am eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev
...
* commit 'eb08250a9bb7ad87518be9454eb9451d9b08c62f':
camera2: Undo mirror for front camera in legacy mode.
2014-09-05 19:00:27 +00:00
Wei Wang
135b3f4668
am 294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev
...
* commit '294383ccc75090a4c616bef02dcd7572dcca6004':
Unregister app when advertise failed after registration.
2014-09-05 19:00:19 +00:00
Ruben Brunk
8eca9e0f0b
Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev
2014-09-05 18:52:54 +00:00
Wei Wang
6550557f99
Merge "Unregister app when advertise failed after registration." into lmp-dev
2014-09-05 18:49:27 +00:00
Svetoslav
ef88eea8e8
am b1d65d18: Merge "Fix runtime restart" into lmp-dev
...
* commit 'b1d65d187db52c541ac71b5b9e3f34f15eb3001f':
Fix runtime restart
2014-09-05 18:38:11 +00:00
Svetoslav
df11867be3
Merge "Fix runtime restart" into lmp-dev
2014-09-05 18:30:42 +00:00
Svetoslav
7de2abb16c
Fix runtime restart
...
Change-Id: Ic50c8b3b06603ad517fdc8a2392ad12318d46817
2014-09-05 11:28:00 -07:00
Jeff Sharkey
e167e433ba
am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev
...
* commit 'a32e4e6b1fafed78546f8084eea78e641a92124d':
Allow badging updates to install sessions.
2014-09-05 17:59:14 +00:00
Eino-Ville Talvala
eeb04cf2db
am f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev
...
* commit 'f62fb8f94ac595d31da73fd791a2738737a13efa':
Camera2: Document supported target combinations for a session.
2014-09-05 17:59:10 +00:00
Chris Craik
3fa19375c9
am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev
...
* commit '8ff3e227327d21bf8269af47efa4d91b6a32613b':
Replace native crash with IAE when calling picture.draw() w/ a HW canvas
2014-09-05 17:59:06 +00:00
Jeff Sharkey
43a2d06166
Merge "Allow badging updates to install sessions." into lmp-dev
2014-09-05 17:56:39 +00:00
Eino-Ville Talvala
48980da14d
Merge "Camera2: Document supported target combinations for a session." into lmp-dev
2014-09-05 17:54:01 +00:00
Amith Yamasani
51a0e5b546
Rename getLocalApprovalIntent to createLocalApprovalIntent
...
Based on API review.
Bug: 17389920
Change-Id: I84674f25a84d317f017473b6f4ac19c849079323
2014-09-05 10:51:13 -07:00
Chris Craik
def8a37128
Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev
2014-09-05 17:49:20 +00:00
George Mount
5db55f2605
am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev
...
* commit '1377fe31f3d655e5d764b213904131f7e75a870d':
API Review: Improve javadoc.
2014-09-05 17:35:48 +00:00
Chris Craik
96890564bd
Replace native crash with IAE when calling picture.draw() w/ a HW canvas
...
bug:17397958
Change-Id: I75f942db0e604f9fd6ab31e6c81f718c0f57b16a
2014-09-05 10:33:39 -07:00
George Mount
0ff16cf43a
Merge "API Review: Improve javadoc." into lmp-dev
2014-09-05 17:29:29 +00:00
George Mount
f9557619a7
API Review: Improve javadoc.
...
Bug 17189781
Also rename PatternMotion to PatternPathMotion
Change-Id: I1c4dcbdd65e33cf9de1504277e31f9f7ede0380d
2014-09-05 10:27:27 -07:00
Jeff Sharkey
ec9bad2015
Allow badging updates to install sessions.
...
For the system restore use-case, an installer may need to enqueue
their sessions quickly before badging details, like icons, have been
downloaded. This change relaxes to allow an installer to update
their session badging after the session has been created. Notify
observers when badging changes.
Rename callback registration methods to match style guide. Relax
constraint that observers are home app. Fix bug around internal
progress reporting.
Bug: 17376797, 17389236, 17334199
Change-Id: I5fb88508baea2f08e89a1504fcf5ef972afad4a7
2014-09-05 10:15:15 -07:00
Svetoslav
ba2957829e
am 4c8c9ac0: Merge "Update FrameStats API per api-council request." into lmp-dev
...
* commit '4c8c9ac06fc213d9bc9d82c39d55f425fee5b429':
Update FrameStats API per api-council request.
2014-09-05 17:12:44 +00:00
Svetoslav
59c1be6684
am 6f0cf112: Merge "Addressing API council comments for UserManager." into lmp-dev
...
* commit '6f0cf112a712cd1a9e77a9b2b66e5f771d4e061e':
Addressing API council comments for UserManager.
2014-09-05 17:12:40 +00:00
Amith Yamasani
116b5865cf
am 3c0a511d: Merge "Remove class that was moved to a different package." into lmp-dev
...
* commit '3c0a511dee505d46ebab80a9b5a1579d39e597fd':
Remove class that was moved to a different package.
2014-09-05 17:12:31 +00:00
Svetoslav
c5564b8c0e
Merge "Update FrameStats API per api-council request." into lmp-dev
2014-09-05 17:09:45 +00:00
Svetoslav
e2da374d6e
Merge "Addressing API council comments for UserManager." into lmp-dev
2014-09-05 17:08:12 +00:00
Svetoslav
53dcd394aa
Update FrameStats API per api-council request.
...
bug:17390382
Change-Id: I50518834569f4d0ec394709294537256f03530e0
2014-09-05 10:07:02 -07:00