Commit Graph

44883 Commits

Author SHA1 Message Date
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
John Reck
f5945a0c8b Disable RT-anim for AnimatorSet
Bug: 17317184

 Unfortunately this will disable *all* RT animations in a scene,
 but we don't have more selective targetting currently

Change-Id: I57e1c0ae43957f45229473bdcdaf34c05825fab7
2014-09-05 15:58:26 -07:00
Svetoslav
a757f99d97 am 1458f58e: am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev
* commit '1458f58e697e0079fc7fb90ea4094052f14a9688':
  Print spooler UI polish and bug fixes.
2014-09-05 22:56:45 +00:00
Chris Craik
33f71d9b32 am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev
* commit '7ec137b7f9edb41117f822ef16bdaf5accbcc31c':
  Add shadow/clipping properties to HierarchyViewer
2014-09-05 22:56:41 +00: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
6c62705d50 am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev
* commit '26c00d5a4bdbdcdbefe7f5d7e3ce34d92382bbc0':
  Reduce chance of notification listener dropped messages.
2014-09-05 22:10:10 +00: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
Aravind Akella
701141cd1f am f109a7de: am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev
* commit 'f109a7de857d21ec11c6020a5556d7adc78a3c08':
  Documentation fix for Sensor.getMaxDelay()
2014-09-05 21:57:47 +00:00
Jim Miller
09629ec160 am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev
* commit 'bb9e9c7b0586dc35158529e8d10cd6b10f5e7498':
  Cleanup - Change name of confirm credentials method after API review
2014-09-05 21:57:42 +00:00
Eino-Ville Talvala
663debf045 am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev
* commit 'a42873d60a55a65fe36de12c032714403e3e161f':
  Camera2: Final API revisions
2014-09-05 21:57:16 +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
Mark Doliner
d0646dca40 Small documentation fixes across many files.
Change-Id: I3e8787ce4bc6018ea1dc9aef2a2cd4e0a8dde663
2014-09-05 13:57:51 -07:00
Chris Wren
7381daa0b9 remove unused matchesCallFilter(Bundle, int)
Bug: 17402728
Change-Id: I0be7c70597a629ca0bd60b7230ffcc58e8e7aeac
2014-09-05 16:53:14 -04: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
415627ba39 am 3a448381: am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev
* commit '3a4483814783cfa108263ea2707b7f9e9b4dd9e2':
  Allow for event dispatching when in non-interactive states.
2014-09-05 20:21:52 +00:00
Amith Yamasani
0859c2c760 am 6b71eada: am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev
* commit '6b71eadab04964e8fe28ff98c3747ffe937f89ac':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
2014-09-05 20:21:19 +00:00
Michael Wright
215e31e6ca am 58f5f69b: am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev
* commit '58f5f69b7763fa846cfa58ec945f2ad6600ed031':
  Add extra to ASSIST intent to indicate potential input type
2014-09-05 20:21:05 +00:00
Alan Viverette
a3e49a4b1d Propagate drawable hotspots when duplicate parent state is enabled
Makes hotspot-centered ripples "just work" everywhere that old-style
pressed states work.

BUG: 17407652
Change-Id: Id4802662aea537959122f029e85aa576cf51b641
2014-09-05 13:10:12 -07: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
George Mount
21f54f3940 Only call setHasTransientState in captureHierarchy.
Bug 17390936

Change-Id: I1a8cdc2820b53f6ca9f6edc41a7e87f45bea7811
2014-09-05 12:13:49 -07: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
0ae884a051 am bb02db9f: am eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev
* commit 'bb02db9fa368fc0c630acba16eb59af9fbd46729':
  camera2: Undo mirror for front camera in legacy mode.
2014-09-05 19:10:42 +00:00
Wei Wang
69b4a9cd53 am 368a0cb9: am 294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev
* commit '368a0cb949d4cd57dfa64f46211320ecd8f964a8':
  Unregister app when advertise failed after registration.
2014-09-05 19:10:36 +00: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
c420140874 am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev
* commit '590f0f345077cb40068e86db5a30185d454b7734':
  Fix runtime restart
2014-09-05 18:48:47 +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
11d4400318 am 27264229: am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev
* commit '27264229839c03a5530250b7e93de49694fed235':
  Allow badging updates to install sessions.
2014-09-05 18:10:14 +00:00
Eino-Ville Talvala
9e6dd8d9ef am 51c48521: am f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev
* commit '51c485212506ca8d4b99c12cd72cffb2b1298847':
  Camera2: Document supported target combinations for a session.
2014-09-05 18:09:57 +00:00
Chris Craik
aab1c9bfec am 12902a44: am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev
* commit '12902a4442cb985e9494d944a7d7e9921e561fa1':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
2014-09-05 18:09:52 +00:00