Satoshi Kataoka
02f8bf97e7
Merge "Refactor InputMethodAndSubtypeCircularList"
2013-10-30 19:16:06 +00:00
Craig Mautner
824913c95b
am 7acd5a97: am 52cb685f: am 91eb54d1: Merge "Do not fetch tasks that don\'t have activities." into klp-dev
...
* commit '7acd5a97c27d13ea0dc311a6974be24a0a943ff9':
Do not fetch tasks that don't have activities.
2013-10-30 10:25:32 -07:00
Craig Mautner
7acd5a97c2
am 52cb685f: am 91eb54d1: Merge "Do not fetch tasks that don\'t have activities." into klp-dev
...
* commit '52cb685f23ef4326345bfbe15aa9081454a77aa1':
Do not fetch tasks that don't have activities.
2013-10-30 10:20:54 -07:00
Craig Mautner
91eb54d119
Merge "Do not fetch tasks that don't have activities." into klp-dev
2013-10-30 17:13:20 +00:00
Craig Mautner
ff060d8605
am e2f74638: am 1dbaf904: am 18612840: Merge "Force relayout at completion of status bar animation" into klp-dev
...
* commit 'e2f7463867d5e30a7e03c800fd907136b3152d1c':
Force relayout at completion of status bar animation
2013-10-30 07:06:04 -07:00
Craig Mautner
e2f7463867
am 1dbaf904: am 18612840: Merge "Force relayout at completion of status bar animation" into klp-dev
...
* commit '1dbaf9044dcb8a9bb6300e438a05324189bd4d02':
Force relayout at completion of status bar animation
2013-10-30 07:02:39 -07:00
Craig Mautner
1861284013
Merge "Force relayout at completion of status bar animation" into klp-dev
2013-10-30 13:58:31 +00:00
Igor Murashkin
dc5699dff1
am 6ec49e58: am 73a523d9: am e5c1208e: Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev
...
* commit '6ec49e58ab6a3bf2bcad5726523629d002007550':
am: Increase dropbox buffer size to 256KB (from 128KB)
2013-10-29 14:59:40 -07:00
Igor Murashkin
6ec49e58ab
am 73a523d9: am e5c1208e: Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev
...
* commit '73a523d9bfe28ca0b1b5d5875176290b00865d14':
am: Increase dropbox buffer size to 256KB (from 128KB)
2013-10-29 14:25:30 -07:00
Igor Murashkin
e5c1208ef9
Merge "am: Increase dropbox buffer size to 256KB (from 128KB)" into klp-dev
2013-10-29 21:20:54 +00:00
Craig Mautner
5cbaaa3cb5
Do not fetch tasks that don't have activities.
...
Fixes NullPointerException bug 11432611.
Change-Id: I62e765750e2613ecfb79e13021631ed2cd4e79f3
2013-10-29 13:39:26 -07:00
Craig Mautner
81defc794b
Force relayout at completion of status bar animation
...
A final layout pass should be done whenever the status bar has
completed its incoming animation.
Fixes bug 10387660.
Change-Id: I48c19015c53116b58cf73e20be32d1f64dd682ca
2013-10-29 11:32:30 -07:00
Satoshi Kataoka
d787f69533
Refactor InputMethodAndSubtypeCircularList
...
Change-Id: I452bb01d4af7097d214f2c2e7ed58bf1ca9fa219
2013-10-28 18:57:32 -07:00
Craig Mautner
00b0de96a1
Merge "Remove starting window when activity is preempted."
2013-10-29 00:18:02 +00:00
Craig Mautner
a61bc658bb
Remove starting window when activity is preempted.
...
Activities launch starting windows before they are resumed. If another
activity is started after a first activity has launched its starting
window then it was possible that the starting window will never be
removed. An earlier fix, ag/368411, solved this by posting a delayed
message that would remove orphaned starting windows after 10 seconds.
This fix immediately removes starting windows that have been orphaned
through the above sequence.
A few code cleanups are also included in this CL.
Fixes bug 11029212.
Change-Id: I7a9befca92888aefe4000b90716c57c2aa572634
2013-10-28 15:43:18 -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
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
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
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
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
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
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
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
Craig Mautner
f65dd21390
am 2534c16b: am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev
...
* commit '2534c16b44922e19e040a999cd99b412674e63a1':
Change order of operations so flag is not overwritten
2013-10-28 07:44:08 -07:00
Craig Mautner
dfe0d9a040
Merge "Change order of operations so flag is not overwritten" into klp-dev
2013-10-28 14:38:32 +00:00
Andrew Flynn
0c3e1df77f
Check for presence of carrier app in data notification.
...
When ConnectivityService checks the mobile data connection and notices that
there is no connectivity, first do a check to see if a valid carrier app for
the current MCC/MNC exists. If so, launch that app instead of checking for a
provisioning URL or hoping for a DNS redirect in the browser. If no such app
exists, continue on as normal.
Bug: 9622645
Change-Id: Ic88b06250af89825d8eee7e4945fb8d7c28d16e1
2013-10-26 11:04:32 -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
Dianne Hackborn
b251e0794a
am 33c7520b: am 0b1ec016: am 19d79659: Merge "Fix issue #11374840 : adb shell am startservice not working any more" into klp-dev
...
* commit '33c7520b68e015c46ed1bcb277dc4faaa368cc55':
Fix issue #11374840 : adb shell am startservice not working any more
2013-10-25 16:14:19 -07:00
Dianne Hackborn
33c7520b68
am 0b1ec016: am 19d79659: Merge "Fix issue #11374840 : adb shell am startservice not working any more" into klp-dev
...
* commit '0b1ec0165a5dc98bc82670288894af446ff5bcaa':
Fix issue #11374840 : adb shell am startservice not working any more
2013-10-25 15:37:30 -07:00
Dianne Hackborn
19d79659ee
Merge "Fix issue #11374840 : adb shell am startservice not working any more" into klp-dev
2013-10-25 22:30:35 +00: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
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
Dianne Hackborn
de0e83bc39
Fix issue #11374840 : adb shell am startservice not working any more
...
The startService() and stopServie() calls had a redundant check for
the incoming user ID being valid, but with its own custom implementation
that doesn't match the normal handleIncomingUser flow. In fact, for
both of these we are going to do handleIncomingUser anyway when we get
to retrieveServiceLocked(), so there was just no need for this.
Change-Id: I14409a03781a14a5f1a786aceb31dcc77efb062c
2013-10-25 14:34:18 -07:00
Craig Mautner
2788751652
am 1f57b605: am 6f2fb33f: am d4d170de: Merge "Do not take screenshots when launching activities..." into klp-dev
...
* commit '1f57b6055ea4c80980a03a229e720bb9420cc5f9':
Do not take screenshots when launching activities...
2013-10-25 13:18:31 -07:00
Craig Mautner
1f57b6055e
am 6f2fb33f: am d4d170de: Merge "Do not take screenshots when launching activities..." into klp-dev
...
* commit '6f2fb33f907b3af246f79a72e79ea7e4192c7478':
Do not take screenshots when launching activities...
2013-10-25 13:15:13 -07:00
Craig Mautner
d4d170de39
Merge "Do not take screenshots when launching activities..." into klp-dev
2013-10-25 20:09:20 +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
Craig Mautner
b53d97c457
Change order of operations so flag is not overwritten
...
The effects of the flag, Intent.FLAG_ACTIVITY_TASK_ON_HOME was being
overwritten by the call immediately after it was set. Changing the
order of operations leaves the effect intact.
Fixes bug 11376962.
Change-Id: I27371e0efeb0c08d1e14514a9e3a63157f6d34d8
2013-10-25 11:54:37 -07:00
Erin Dahlgren
e9e31f895e
am b9705893: am 204b1e28: am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
...
* commit 'b970589321c1d398da9ae4e78c44e122a22a8365':
Have the package manager write mimetype of preferred activities to xml.
2013-10-24 16:27:56 -07:00
Erin Dahlgren
b970589321
am 204b1e28: am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
...
* commit '204b1e2817f3abb7946d9254cca666d2da1e4f7c':
Have the package manager write mimetype of preferred activities to xml.
2013-10-24 16:25:59 -07:00
Erin Dahlgren
fe470c37de
Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
2013-10-24 23:21:16 +00:00
Craig Mautner
6f6d56fd4d
Do not take screenshots when launching activities...
...
Unless they are in another task.
Fixes bug 11374158.
Change-Id: I961d4ce9520bc84a182806db2ccb072501c8357a
2013-10-24 16:02:07 -07:00
Erin Dahlgren
707a59dc9a
Have the package manager write mimetype of preferred activities to xml.
...
Issue: 11372979
Change-Id: I5ea4e94c978845426e2650946d0bba076d161c19
2013-10-24 15:13:39 -07:00
Craig Mautner
c031363cbd
am 6f90587e: am 052f7f0d: am 7c2a2ef2: Merge "Track window position with task position." into klp-dev
...
* commit '6f90587eecd8e3970c7a87cf72512ae21c0a039b':
Track window position with task position.
2013-10-24 14:36:53 -07:00
Craig Mautner
6f90587eec
am 052f7f0d: am 7c2a2ef2: Merge "Track window position with task position." into klp-dev
...
* commit '052f7f0d4e57aa4bbdffd82749ef528f62570517':
Track window position with task position.
2013-10-24 14:31:45 -07:00
Craig Mautner
7c2a2ef2ee
Merge "Track window position with task position." into klp-dev
2013-10-24 21:26:11 +00:00