46180 Commits

Author SHA1 Message Date
Alan Viverette
222cd91d23 Merge "Add support for using ColorStateList in GradientDrawable" 2013-10-28 20:36:57 +00:00
Alan Viverette
519494e207 Add support for using ColorStateList in GradientDrawable
BUG: 11373225
Change-Id: Ie62f1546e8694822aadafe9ef1e57ce458a363d6
2013-10-28 13:15:39 -07:00
Baligh Uddin
9421689ba9 Merge "Import translations. DO NOT MERGE" 2013-10-28 19:33:50 +00:00
Baligh Uddin
c98c6cc649 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-28 19:33:46 +00:00
Svetoslav
b4fda13476 Complete implementation of the advanced print options.
1. Implemented the advanced printer options integration. Now a print service
    may declare an advanced print options activity which may be launched by
    the user if the current printer supports advanced print options. These options
    are visible only to the print service that added them and it is the only party
    that will interpret the options.

2. Fixed a couple of bugs in the saved print jobs parsing. One was that if there
    are more than one page range, a half of the print job properties was not
    properly parsed. The other was that the media size constructor was using
    incorrect argument order, thus creating a media size with wring width.

3. Fixed and edge case where old print jobs and their docs can get stuck in
    the spooler. If the app did not write the requested pages we were not showing
    an error message, rather just finish the activity without canceling the print
    job and this print job is stuck in the spooler. Now we show an error message
    and the user may retry, cancel. If the user cancels the print job is also
    cancelled, thus no leftover in the spooler.

4. Fixed the background color of the print dialog to meet UX spec.

bug:11241800

Change-Id: I352440bc86aec824a805883fc9579d96a06d11e6
2013-10-28 11:44:07 -07:00
Baligh Uddin
070f1a2529 Import translations. DO NOT MERGE
Change-Id: If9e9a86e391a1e42da0a45d3fe7a8763f059af27
Auto-generated-cl: translation import
2013-10-28 10:10:51 -07:00
Vineeta Srivastava
e01dbb672e am e1b16b09: am ccf1a88d: am 2ead7510: Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
* commit 'e1b16b09d055f65043bd898daa8f28e7fdc5e00e':
  Do not show roaming icon for Videotron operator when access Canada network
2013-10-28 10:00:13 -07:00
Vineeta Srivastava
e1b16b09d0 am ccf1a88d: am 2ead7510: Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
* commit 'ccf1a88daf17726a72d643439bc8b7456c1bed92':
  Do not show roaming icon for Videotron operator when access Canada network
2013-10-28 09:57:23 -07:00
Vineeta Srivastava
ccf1a88daf am 2ead7510: Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev
* commit '2ead75109cf21223b7754fc3906c86d2fbd145cb':
  Do not show roaming icon for Videotron operator when access Canada network
2013-10-28 09:51:27 -07:00
Vineeta Srivastava
2ead75109c Merge "Do not show roaming icon for Videotron operator when access Canada network" into klp-dev 2013-10-28 16:48:53 +00:00
Baligh Uddin
55e168f544 Import translations. DO NOT MERGE
Change-Id: Ic80d15c427e2f67465a6c45ab08d0ffcb618ae62
Auto-generated-cl: translation import
2013-10-28 09:47:23 -07:00
Sungmin Choi
119e24f987 Do not show roaming icon for Videotron operator when access Canada network
Bug: 11260638
Change-Id: I70b3c2c190707b41ca04110851b7c9581d1c196f
2013-10-28 09:11:36 -07:00
Michael Wright
62ce65d6ed Speculatively schedule input consumption
With the new tuned vsync offset, vsyncs are likely to occur shortly
after the input is received, meaning we will empty the input queue,
and thus won't schedule input consumption until more input is
received. If an application then speculatively posts draw commands to
the main looper faster than 60 hz, it will eventually end up blocking
in eglSwapBuffers. Since we're blocking in eglSwapBuffers, we won't
even schedule consumption until after the current frame (8-16ms), and
it's entirely likely we won't actually get around to consuming input
until after the next frame (another 16 ms of latency). This means we
can often go 16-32ms without processing any input events, causing
very noticeable amounts of jank.

Rather than waiting for the next input event to schedule input
consumption, speculatively schedule it every frame as long as we've
consumed some motion batch during this frame.

Bug: 11398045
Change-Id: I25e46308e00e9f9de00a1d8906f6b0e0f2e845b4
2013-10-26 12:18:00 -07:00
Christopher Tate
c95bae5010 am 13c4645b: am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev
* commit '13c4645bfc9c3bbd6ae2508ef8cc24412fe237c8':
  Un-deprecate setInexactRepeating() and tweak docs
2013-10-25 18:22:26 -07:00
Jeff Sharkey
8b5f453a82 am de9b66fe: am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit 'de9b66fee1bdbc914c287fb9a2aa832dc2d3e6f9':
  Extra to always show advanced devices.
2013-10-25 18:22:22 -07:00
Christopher Tate
13c4645bfc am f7d74870: am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev
* commit 'f7d74870db6f8b1275d4b93268b0210e351647b3':
  Un-deprecate setInexactRepeating() and tweak docs
2013-10-25 18:17:56 -07:00
Jeff Sharkey
de9b66fee1 am 3ac436b7: am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit '3ac436b758830eb938c62d5ed91caa7808b5b63e':
  Extra to always show advanced devices.
2013-10-25 18:17:52 -07:00
Christopher Tate
f7d74870db am 6364c26c: Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev
* commit '6364c26cb385ea654b7c8af8a1ef2f5cb4a556c2':
  Un-deprecate setInexactRepeating() and tweak docs
2013-10-25 18:13:36 -07:00
Jeff Sharkey
3ac436b758 am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev
* commit '80f103ae12c4eb90fc2e06a6921dde2f092a181b':
  Extra to always show advanced devices.
2013-10-25 18:13:33 -07:00
Christopher Tate
6364c26cb3 Merge "Un-deprecate setInexactRepeating() and tweak docs" into klp-dev 2013-10-26 00:42:01 +00:00
Christopher Tate
109e4db471 Un-deprecate setInexactRepeating() and tweak docs
Bug 10461371

Change-Id: Ic62a0e94c83c0c7b50e21a7bee19c3d92255d231
2013-10-25 16:55:36 -07:00
Dianne Hackborn
e77187d018 Fix issue #11391003: Allow dumpsys meminfo to be used with native processes
Change-Id: I005e4dc763deafac95dc3aa6261c06d1808fdaff
2013-10-25 16:32:41 -07:00
Jeff Sharkey
96c620595b Extra to always show advanced devices.
Also always lower-case extension to extract MIME type correctly,
we may want to fix in MimeUtils at some point.

Bug: 11354402
Change-Id: I77d0c06a663cd0c4320c41553ff1980b6f9a7778
2013-10-25 16:30:54 -07:00
Igor Murashkin
560ce7738c am ee46eab2: am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev
* commit 'ee46eab2d026c9d22d6243cc945c150c877edc16':
  Trace: add ALOGVs for easier debugging
2013-10-25 16:14:10 -07:00
Christopher Tate
dde92b755f am 66f6fa7b: am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev
* commit '66f6fa7b3617ecf919d879157d6205321685db61':
  DOCS: document API 19+ Alarm Manager API and behaviors
2013-10-25 16:14:04 -07:00
Igor Murashkin
ee46eab2d0 am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev
* commit 'ba111ef9b5ed90d6b5021086548fcc9c35953ecf':
  Trace: add ALOGVs for easier debugging
2013-10-25 15:17:31 -07:00
Igor Murashkin
ba111ef9b5 am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev
* commit 'c802a6614095660bccfd0cdf4f15404ad1863b76':
  Trace: add ALOGVs for easier debugging
2013-10-25 15:15:12 -07:00
Igor Murashkin
c802a66140 Merge "Trace: add ALOGVs for easier debugging" into klp-dev 2013-10-25 22:11:07 +00:00
Christopher Tate
66f6fa7b36 am 9a995257: am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev
* commit '9a9952571a19eb849558885215b0bbe564a9176c':
  DOCS: document API 19+ Alarm Manager API and behaviors
2013-10-25 15:06:15 -07:00
Christopher Tate
9a9952571a am 6aedab9b: Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev
* commit '6aedab9b64b0ba23ffb760f5b6b8c45675372030':
  DOCS: document API 19+ Alarm Manager API and behaviors
2013-10-25 15:02:53 -07:00
Marco Nelissen
a22010ebe5 am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev
* commit 'd19385bf58225069c8ea0a7ce5075ed28861b039':
  Add a method to set a list of uids for a wake lock
2013-10-25 15:01:34 -07:00
Christopher Tate
6aedab9b64 Merge "DOCS: document API 19+ Alarm Manager API and behaviors" into klp-dev 2013-10-25 21:59:41 +00:00
Marco Nelissen
d19385bf58 am 21657181: Merge "Add a method to set a list of uids for a wake lock" into klp-dev
* commit '2165718153c1288dee7e106f0c61d952f515600b':
  Add a method to set a list of uids for a wake lock
2013-10-25 14:58:12 -07:00
Marco Nelissen
2165718153 Merge "Add a method to set a list of uids for a wake lock" into klp-dev 2013-10-25 21:55:55 +00:00
Svetoslav Ganov
9f598351ca am 01b1e661: am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev
* commit '01b1e66135f3e727be47300510443d149d8679cd':
  Update the documentaton of the android.print package.
2013-10-25 14:04:56 -07:00
Christopher Tate
062bce7d87 DOCS: document API 19+ Alarm Manager API and behaviors
Bug 9941334

Change-Id: I65473bd62f7113c74ed6277d61db56c76441ff1b
2013-10-25 13:59:44 -07:00
Svetoslav Ganov
01b1e66135 am 1aae2c47: am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev
* commit '1aae2c477772378b447da35717882c76aa39fb67':
  Update the documentaton of the android.print package.
2013-10-25 13:54:07 -07:00
Svetoslav Ganov
1aae2c4777 am 2a40da55: Merge "Update the documentaton of the android.print package." into klp-dev
* commit '2a40da558b267b91ed0b0c9090656bdc02db2833':
  Update the documentaton of the android.print package.
2013-10-25 13:51:45 -07:00
Svetoslav Ganov
2a40da558b Merge "Update the documentaton of the android.print package." into klp-dev 2013-10-25 20:48:45 +00:00
Jeff Sharkey
92706ac8df am d8a81d06: am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev
* commit 'd8a81d06e4649498b3ba884f2e5443701e13d023':
  Skip writing PFD status when comm is closed.
2013-10-25 13:28:50 -07:00
Jeff Sharkey
d8a81d06e4 am fd38f940: am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev
* commit 'fd38f940f4283f9ea68142185426a7cf45d58ae0':
  Skip writing PFD status when comm is closed.
2013-10-25 13:25:31 -07:00
Jeff Sharkey
fd38f940f4 am ac4bf7fd: Merge "Skip writing PFD status when comm is closed." into klp-dev
* commit 'ac4bf7fd9ade1bf8448b67feb3935bf4620714d5':
  Skip writing PFD status when comm is closed.
2013-10-25 13:22:12 -07:00
Jeff Sharkey
ac4bf7fd9a Merge "Skip writing PFD status when comm is closed." into klp-dev 2013-10-25 20:17:03 +00:00
Marco Nelissen
738ffdc9da Add a method to set a list of uids for a wake lock
Cherrypicked from master.

b/9464621

Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
2013-10-25 12:49:55 -07:00
Dianne Hackborn
27dab38891 am f09a1b88: am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev
* commit 'f09a1b88ae87abb750bda62f97fce1633a9cab7d':
  Fix issue #11290095: Parcel change causing crashing in KLP...
2013-10-25 12:26:43 -07:00
Dianne Hackborn
f09a1b88ae am aec8fbb3: am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev
* commit 'aec8fbb354621dc49a4ac971a64706bee01e5806':
  Fix issue #11290095: Parcel change causing crashing in KLP...
2013-10-25 12:21:26 -07:00
Dianne Hackborn
aec8fbb354 am df033aed: Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev
* commit 'df033aed9d403993ca65a54cc4bfbdbe36f376bb':
  Fix issue #11290095: Parcel change causing crashing in KLP...
2013-10-25 12:18:16 -07:00
Dianne Hackborn
df033aed9d Merge "Fix issue #11290095: Parcel change causing crashing in KLP..." into klp-dev 2013-10-25 19:15:45 +00:00
Jeff Sharkey
d99f9caba6 Skip writing PFD status when comm is closed.
If the remote side of PFD has already written a status message, then
they've also closed their end of the comm FD, and we're going to
EPIPE if we try sending our own status.  So, skip writing status if
a remote status is present.

Only one end of the openFile() comm socket needs to be blocking,
otherwise detachFd() would end up blocking forever.

Bug: 11385467
Change-Id: I346d40cc1ca4a6683cec4c2d2b7db2b32ac94a55
2013-10-25 11:34:35 -07:00
Svetoslav Ganov
4d4c66dd38 Update the documentaton of the android.print package.
bug:10551786
bug:10551697
bug:10705082
bug:10741641
bug:11318976
bug:10550979
bug:10551761

Change-Id: I46ceb66a69b6d32d6b417356178f67f2e25e891a
2013-10-25 11:33:34 -07:00