drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,476 Commits 1 Branch 0 Tags
Commit Graph

118476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
d54a331111 am c19c3c8d: am c7f18b52: am 099d842b: Update javadoc to fix the build. 
* commit 'c19c3c8d045059614aaef62e3553ccd06d50782c':
  Update javadoc to fix the build.
 2013-10-28 16:44:28 -07:00
Svetoslav
c19c3c8d04 am c7f18b52: am 099d842b: Update javadoc to fix the build. 
* commit 'c7f18b526f2029e78ea609db688854439e180d31':
  Update javadoc to fix the build.
 2013-10-28 16:39:41 -07:00
Svetoslav
c7f18b526f am 099d842b: Update javadoc to fix the build. 
* commit '099d842bdac481ea94527ab1f702342e41dca440':
  Update javadoc to fix the build.
 2013-10-28 16:34:55 -07:00
Svetoslav
099d842bda Update javadoc to fix the build. 
Change-Id: Ib6e8c17f10a7f17785876681baf8fb07eac9af55
 2013-10-28 15:56:48 -07:00
Svetoslav
cdc2280a6e am 0298ebb2: am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev 
* commit '0298ebb2db5b7c24d68fd3817b11e2f887471d0c':
  Complete implementation of the advanced print options.
 2013-10-28 15:15:45 -07:00
Svetoslav
0298ebb2db am 60fb1e28: am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev 
* commit '60fb1e28375b9c0dc7505214f3ab33bdd38f7aa8':
  Complete implementation of the advanced print options.
 2013-10-28 15:12:26 -07:00
Svetoslav
60fb1e2837 am 714ba345: Merge "Complete implementation of the advanced print options." into klp-dev 
* commit '714ba34556572d36b1f9f8d9b860c4da24da6361':
  Complete implementation of the advanced print options.
 2013-10-28 15:09:12 -07:00
Lajos Molnar
128537f600 am f57530e4: am fcd69ca4: am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev 
* commit 'f57530e449631658cf9dddfa774ffc3df2383513':
  MediaPlayer: MTP: update state only based on source events
 2013-10-28 15:09:02 -07:00
Dianne Hackborn
93a8c8e028 am a03fc2c2: am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev 
* commit 'a03fc2c296407a42a568f9acfdf63cb5db536cb4':
  Fix issue #11391003: Allow dumpsys meminfo to be used with native processes
 2013-10-28 15:08:58 -07:00
Svetoslav
714ba34556 Merge "Complete implementation of the advanced print options." into klp-dev 2013-10-28 22:07:03 +00:00
Lajos Molnar
f57530e449 am fcd69ca4: am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev 
* commit 'fcd69ca4cc1fb9f1f837afc8cf5aece9520aaded':
  MediaPlayer: MTP: update state only based on source events
 2013-10-28 15:05:50 -07:00
Dianne Hackborn
a03fc2c296 am 1c18c5d4: am 3a702cb5: Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev 
* commit '1c18c5d40ce7004d28aaa8f6c6713efcc72e6706':
  Fix issue #11391003: Allow dumpsys meminfo to be used with native processes
 2013-10-28 15:05:46 -07:00
Lajos Molnar
fcd69ca4cc am 66b753b0: Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev 
* commit '66b753b06bb265d3f5b25244856f8d827a9dc5af':
  MediaPlayer: MTP: update state only based on source events
 2013-10-28 15:02:35 -07:00
Dianne Hackborn
1c18c5d40c am 3a702cb5: Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev 
* commit '3a702cb5d7eac0d8504c67145dded5d45a9c1027':
  Fix issue #11391003: Allow dumpsys meminfo to be used with native processes
 2013-10-28 15:02:32 -07:00
Lajos Molnar
66b753b06b Merge "MediaPlayer: MTP: update state only based on source events" into klp-dev 2013-10-28 21:59:55 +00:00
Dianne Hackborn
3a702cb5d7 Merge "Fix issue #11391003: Allow dumpsys meminfo to be used with native processes" into klp-dev 2013-10-28 21:59:18 +00:00
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
e694c95d25 am 6639f734: (-s ours) am 51ef6f68: (-s ours) am 170735d4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '6639f734716a34c7abcabcfa686f67da08d8e068':
  Import translations. DO NOT MERGE
 2013-10-28 12:46:12 -07:00
Baligh Uddin
0d71415242 am c7d7e071: (-s ours) am 24c97e4c: (-s ours) am c98c6cc6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c7d7e071970e70c0bb8039949b0c4d097ebaa5cb':
  Import translations. DO NOT MERGE
 2013-10-28 12:46:08 -07:00
Baligh Uddin
0e682265ca am 04cebc99: (-s ours) am 53ffdcc0: (-s ours) am 9b16d131: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '04cebc99c29f681df897260c1d8091f6df64bd86':
  Import translations. DO NOT MERGE
 2013-10-28 12:46:05 -07:00
Baligh Uddin
6639f73471 am 51ef6f68: (-s ours) am 170735d4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '51ef6f688a0aaf7f0ee201096bac58381bcb9f20':
  Import translations. DO NOT MERGE
 2013-10-28 12:44:03 -07:00
Baligh Uddin
c7d7e07197 am 24c97e4c: (-s ours) am c98c6cc6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '24c97e4c66fdc4086e6dbe362193188698716262':
  Import translations. DO NOT MERGE
 2013-10-28 12:44:00 -07:00
Baligh Uddin
04cebc99c2 am 53ffdcc0: (-s ours) am 9b16d131: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '53ffdcc0aac3a61e3b28f264127f5c2ca273998a':
  Import translations. DO NOT MERGE
 2013-10-28 12:43:57 -07:00
Baligh Uddin
51ef6f688a am 170735d4: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '170735d46001659e64522f451681a0618685efc6':
  Import translations. DO NOT MERGE
 2013-10-28 12:37:55 -07:00
Baligh Uddin
24c97e4c66 am c98c6cc6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c98c6cc64916e57010e005902dbd304a6c811f95':
  Import translations. DO NOT MERGE
 2013-10-28 12:37:51 -07:00
Baligh Uddin
53ffdcc0aa am 9b16d131: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '9b16d1313fc1c81e356c0dcb39d0bf8f67b90161':
  Import translations. DO NOT MERGE
 2013-10-28 12:37:48 -07:00
Baligh Uddin
789abf4c07 Merge "Import translations. DO NOT MERGE" 2013-10-28 19:34:17 +00:00
Baligh Uddin
170735d460 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-28 19:34:13 +00: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
Baligh Uddin
4a17f25538 Merge "Import translations. DO NOT MERGE" 2013-10-28 19:33:42 +00:00
Baligh Uddin
9b16d1313f Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-28 19:33:31 +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
Christopher Tate
54e54f4050 am 16e85886: am e5f477ff: am ad7c57db: Merge "Always re-evaluate kernel alarm setpoints when a new alarm is added" into klp-dev 
* commit '16e85886649f7dfa165452f984e15b10e93c1f4f':
  Always re-evaluate kernel alarm setpoints when a new alarm is added
 2013-10-28 11:23:10 -07:00
Christopher Tate
16e8588664 am e5f477ff: am ad7c57db: Merge "Always re-evaluate kernel alarm setpoints when a new alarm is added" into klp-dev 
* commit 'e5f477fff50dd121f8fc3dc3cfe1ba83088d04b0':
  Always re-evaluate kernel alarm setpoints when a new alarm is added
 2013-10-28 11:20:24 -07:00
Christopher Tate
e5f477fff5 am ad7c57db: Merge "Always re-evaluate kernel alarm setpoints when a new alarm is added" into klp-dev 
* commit 'ad7c57db25ac4fc919a92a215ec2a4609c0f91a9':
  Always re-evaluate kernel alarm setpoints when a new alarm is added
 2013-10-28 11:18:21 -07:00
Christopher Tate
ad7c57db25 Merge "Always re-evaluate kernel alarm setpoints when a new alarm is added" into klp-dev 2013-10-28 18:16:27 +00:00
Baligh Uddin
ae446604c6 Import translations. DO NOT MERGE 
Change-Id: I2b6a89191ddaf3f5417a453116daad90d6f6aab0
Auto-generated-cl: translation import
 2013-10-28 10:47:58 -07:00
Baligh Uddin
97ea6a0648 Import translations. DO NOT MERGE 
Change-Id: I1ef363e676ff75e85aece9789cdb7c86b55281d3
Auto-generated-cl: translation import
 2013-10-28 10:45:56 -07:00
Christopher Tate
7d57ed88c9 Always re-evaluate kernel alarm setpoints when a new alarm is added 
...even if the new one is later than some other existing alarms.

Bug 11392699

Change-Id: I80dccd76300acb4729f0337665b91e897a770571
 2013-10-28 10:34:54 -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
Jeff Sharkey
2e05b6777a am e643e337: am 99dcb2eb: am 10e509dc: Merge "Use inotify to update DocumentsUI." into klp-dev 
* commit 'e643e33736e14a59f1f9a8acb4d630b2ea671a31':
  Use inotify to update DocumentsUI.
 2013-10-28 10:00:09 -07:00
Craig Mautner
c847c883af am f65dd213: am 2534c16b: am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev 
* commit 'f65dd213900603116c7b064bfdfb57662f7682c3':
  Change order of operations so flag is not overwritten
 2013-10-28 10:00:04 -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
Jeff Sharkey
e643e33736 am 99dcb2eb: am 10e509dc: Merge "Use inotify to update DocumentsUI." into klp-dev 
* commit '99dcb2eb3578c3d14658b3850cb3e32608e173b1':
  Use inotify to update DocumentsUI.
 2013-10-28 09:57:20 -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