Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
156,232 Commits 3 Branches 0 Tags
9092ed6c65ea07e610e249ef24ef39018b9cb46b
Commit Graph

41147 Commits

Author SHA1 Message Date
Svetoslav
a958000469 am ad1b9d87: am 1458f58e: am 3b42928c: Merge "Print spooler UI polish and bug fixes." into lmp-dev 
* commit 'ad1b9d8779447bd3eacc0dd12519f28b964b868b':
  Print spooler UI polish and bug fixes.
 2014-09-05 23:08:28 +00:00
Chris Craik
a2197d721d am 1bd57d8b: am 7ec137b7: am 6f6a8f2c: Merge "Add shadow/clipping properties to HierarchyViewer" into lmp-dev 
* commit '1bd57d8b78d214a2bdeb0f11bba1a104b14ea84b':
  Add shadow/clipping properties to HierarchyViewer
 2014-09-05 23:08:21 +00: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
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
Griff Hazen
040bb0b0ed am e9a3faa5: am 26c00d5a: am fd7d35d0: Merge "Reduce chance of notification listener dropped messages." into lmp-dev 
* commit 'e9a3faa5d20d0adeed4a5bec8f3aeb131324b3f4':
  Reduce chance of notification listener dropped messages.
 2014-09-05 22:23:55 +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
Aravind Akella
863bfe6d70 am de60d944: am f109a7de: am 6a7a06ee: Merge "Documentation fix for Sensor.getMaxDelay()" into lmp-dev 
* commit 'de60d94419de35bc2ef1aa91c2a7406e85a5890a':
  Documentation fix for Sensor.getMaxDelay()
 2014-09-05 22:09:52 +00:00
Jim Miller
260efa2fd5 am 1d7f775c: am bb9e9c7b: am 2dfada6c: Merge "Cleanup - Change name of confirm credentials method after API review" into lmp-dev 
* commit '1d7f775cca1def096906bd96f60d8767e15cbaf2':
  Cleanup - Change name of confirm credentials method after API review
 2014-09-05 22:09:47 +00:00
Eino-Ville Talvala
76bc0395b6 am 4b570b11: am a42873d6: am 8a52744d: Merge "Camera2: Final API revisions" into lmp-dev 
* commit '4b570b11d7835ea1e71e6134a932ecc6f4c15e70':
  Camera2: Final API revisions
 2014-09-05 22:09:42 +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
Michael Wright
37495c042b am 36bb5708: am 3a448381: am d2300a59: Merge "Allow for event dispatching when in non-interactive states." into lmp-dev 
* commit '36bb5708861a9cfc7677997b65e79dadebab29c6':
  Allow for event dispatching when in non-interactive states.
 2014-09-05 21:32:58 +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
71aa8ab5d7 Merge "Camera2: Final API revisions" into lmp-dev 2014-09-05 20:43:52 +00:00
Amith Yamasani
7bdb80e811 am 6de6199a: am 6b71eada: am 221281ce: Merge "Rename getLocalApprovalIntent to createLocalApprovalIntent" into lmp-dev 
* commit '6de6199a7a9df4f5c495a7a038a71b67e29acb93':
  Rename getLocalApprovalIntent to createLocalApprovalIntent
 2014-09-05 20:32:18 +00:00
Michael Wright
f415d8243d am 798d3953: am 58f5f69b: am e252525f: Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 
* commit '798d39533c258411e0c879961c7c54a76bbb99bc':
  Add extra to ASSIST intent to indicate potential input type
 2014-09-05 20:32:12 +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
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
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
57b4ad9f5a Merge "Add extra to ASSIST intent to indicate potential input type" into lmp-dev 2014-09-05 19:36:47 +00:00
Ruben Brunk
afd5b0a80e am da644495: am bb02db9f: am eb08250a: Merge "camera2: Undo mirror for front camera in legacy mode." into lmp-dev 
* commit 'da644495ead7405970100415ef7dc86dd1ad7567':
  camera2: Undo mirror for front camera in legacy mode.
 2014-09-05 19:21:36 +00:00
Wei Wang
b451e9374a am e5554ef6: am 368a0cb9: am 294383cc: Merge "Unregister app when advertise failed after registration." into lmp-dev 
* commit 'e5554ef69c57984626be06236ada7d3fb83a8b37':
  Unregister app when advertise failed after registration.
 2014-09-05 19:21:31 +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
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
Svetoslav
0497ebed94 am 084a748c: am 590f0f34: am b1d65d18: Merge "Fix runtime restart" into lmp-dev 
* commit '084a748cdfb8707bf5a28af4123a62a316a14ce1':
  Fix runtime restart
 2014-09-05 19:00:25 +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
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
cb1919278e am d64f08ff: am 27264229: am a32e4e6b: Merge "Allow badging updates to install sessions." into lmp-dev 
* commit 'd64f08ff18f7943890b2940b178313e8c00ae410':
  Allow badging updates to install sessions.
 2014-09-05 18:22:23 +00:00
Eino-Ville Talvala
91d0d9ab0e am 4b037548: am 51c48521: am f62fb8f9: Merge "Camera2: Document supported target combinations for a session." into lmp-dev 
* commit '4b037548e61fe6e90b616839ef8e416fdb1eb322':
  Camera2: Document supported target combinations for a session.
 2014-09-05 18:22:17 +00:00
Chris Craik
b73b8e8f35 am a432b4d0: am 12902a44: am 8ff3e227: Merge "Replace native crash with IAE when calling picture.draw() w/ a HW canvas" into lmp-dev 
* commit 'a432b4d090789d420f0beae177b257b56e331ed0':
  Replace native crash with IAE when calling picture.draw() w/ a HW canvas
 2014-09-05 18:22:12 +00: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
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
George Mount
9ee0ca2744 am 4b97ca76: am a0031cbc: am 1377fe31: Merge "API Review: Improve javadoc." into lmp-dev 
* commit '4b97ca7682cde8eeec281efd488189b46ca4c986':
  API Review: Improve javadoc.
 2014-09-05 17:52:27 +00:00