Jim Miller
8b98e04092
am 5357f8fd: Merge "Remove \'?\' icon in layout for "Forgot pattern" button" into klp-dev
...
* commit '5357f8fd24bc578a1a584cac9c1943227816ea05':
Remove '?' icon in layout for "Forgot pattern" button
2013-10-25 13:12:02 -07:00
Craig Mautner
d4d170de39
Merge "Do not take screenshots when launching activities..." into klp-dev
2013-10-25 20:09:20 +00:00
Jim Miller
5357f8fd24
Merge "Remove '?' icon in layout for "Forgot pattern" button" into klp-dev
2013-10-25 20:08:40 +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
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
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
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
John Spurlock
c19418e3f5
Reset our status bar window fade color on screen off.
...
Previously, turning the screen off with the panel expanded would
run one time through panelExpansionChanged, leaving the background
in an intermediate state.
This has probably been around for a while, only uncovered now
that we can see it (if the status bar is translucent).
Bug:11357145
Change-Id: I55b768696c8791f82265a61d2c0f665503ad8bb0
2013-10-25 14:25:09 -04:00
Raph Levien
bea315763f
am bcd8ad2e: am ec646dc9: Merge "Change yMax of Roboto fonts from 2146 to 2163" into klp-dev
...
* commit 'bcd8ad2ed42e5e77a09da7567b52b2b5c8ecbc1f':
Change yMax of Roboto fonts from 2146 to 2163
2013-10-25 11:10:19 -07:00
Raph Levien
bcd8ad2ed4
am ec646dc9: Merge "Change yMax of Roboto fonts from 2146 to 2163" into klp-dev
...
* commit 'ec646dc9cf08d288d516521a45f343a0fd529e01':
Change yMax of Roboto fonts from 2146 to 2163
2013-10-25 11:04:48 -07:00
Raph Levien
ec646dc9cf
Merge "Change yMax of Roboto fonts from 2146 to 2163" into klp-dev
2013-10-25 18:03:02 +00:00
Dianne Hackborn
8aee64d18b
Fix issue #11290095 : Parcel change causing crashing in KLP...
...
...when reading from empty byte[]
Better handling of empty bundles and parcels.
Change-Id: Ie9182e43a52b8f163e8fb20bd1d110e0832683e6
2013-10-25 10:41:50 -07:00
Adam Powell
098bc61f6c
am fd08694e: am 215add2e: Merge "Hide TransitionManager default transition methods" into klp-dev
...
* commit 'fd08694e403b6bc06f66a31a9dda14b30695f309':
Hide TransitionManager default transition methods
2013-10-25 10:08:26 -07:00
Adam Powell
fd08694e40
am 215add2e: Merge "Hide TransitionManager default transition methods" into klp-dev
...
* commit '215add2eb5f1ec6185723465e608fd3bd431dc31':
Hide TransitionManager default transition methods
2013-10-25 10:06:17 -07:00
Adam Powell
215add2eb5
Merge "Hide TransitionManager default transition methods" into klp-dev
2013-10-25 17:04:09 +00:00
Wink Saville
568513d32c
am 4bc35650: am 604cfc2d: Merge "Enhance pin/puk support" into klp-dev
...
* commit '4bc356506429cd85773ee0b36be2a99bffe71584':
Enhance pin/puk support
2013-10-25 09:45:54 -07:00
Adam Koch
b5c9c9bec3
am 625eb8bf: am 7c900126: Doc fix: update Displaying Bitmaps training class code snippet Bug: 11372790
...
* commit '625eb8bf9ed5c7d8ca09508f720c512af353b039':
Doc fix: update Displaying Bitmaps training class code snippet Bug: 11372790
2013-10-25 09:45:51 -07:00
Wink Saville
4bc3565064
am 604cfc2d: Merge "Enhance pin/puk support" into klp-dev
...
* commit '604cfc2de963c17ed53fef745b93e3afcfd5a5f8':
Enhance pin/puk support
2013-10-25 09:43:00 -07:00
Adam Koch
625eb8bf9e
am 7c900126: Doc fix: update Displaying Bitmaps training class code snippet Bug: 11372790
...
* commit '7c900126c4591b6ba8e1017f858bf326a4c1b867':
Doc fix: update Displaying Bitmaps training class code snippet Bug: 11372790
2013-10-25 09:42:56 -07:00
Wink Saville
604cfc2de9
Merge "Enhance pin/puk support" into klp-dev
2013-10-25 16:40:55 +00:00
Adam Koch
7c900126c4
Doc fix: update Displaying Bitmaps training class code snippet
...
Bug: 11372790
Change-Id: Ifb484b03ac4085eeccadb1602dace37690dc2d6b
2013-10-25 10:14:55 -04:00
Jean-Michel Trivi
0b60534917
Limit RemoteControlClient generation ID changes
...
At the beginning of each song, the Music app re-registers its
media button event and requests audio focus, which causes
the reevaluation of each corresponding stack of clients. Each
reevaluation is accompanied by the incrementation of the
RemoteControlClient generation ID, which causes RemoteController
to issue a notification that the client has changed. The lockscreen
correctly interprets this as a reason to dump the current
RemoteControlClient data (including the artwork) because it will
receive the new data if new one is available. This is what causes
the "flashing" of the wallpaper on the lockscreen: for an instant,
no client data is available.
The fix consists in not causing the client generation ID to be
incremented when registrations don't cause any change in the
RemoteControlClient stack. Even though Music re-registers everything,
nothing has changed: it still is the current media button receiver,
and it still has the same RemoteControlClient.
Bug 11307382
Change-Id: I4d2404b571e88aeedb0eca6bd19d39f7ec4fc8b1
2013-10-24 19:10:24 -07:00
Adam Powell
1e9f3d868b
Hide TransitionManager default transition methods
...
Pending future API consideration.
Change-Id: Ia4b162392e1c96b485bc28781a199bc2979ec53f
2013-10-24 18:54:33 -07:00
Roozbeh Pournader
6a0ef07e1f
Change yMax of Roboto fonts from 2146 to 2163
...
This is needed so that other UI fonts don't clip, since
they have been designed assuming that a yMax of at least
2163 is available to them.
The change is achieved by modifying an invisible tiny
square that already existed at the extrema of the the glyph
for U+FFFD REPLACEMENT CHARACTER that was already the
tallest glyph in the fonts.
Bug: 10699356
Change-Id: Ib03ea071b7a82066cacf2b3ae9769db0c449a479
2013-10-24 18:50:25 -07:00
Jean-Michel Trivi
6a3bfe0796
am 9c267f8d: am 5504537e: Merge "Missing LoudnessEnhancer constructor and UUID in public API" into klp-dev
...
* commit '9c267f8d70892dc43f24a57ea406b89a36a4d124':
Missing LoudnessEnhancer constructor and UUID in public API
2013-10-24 16:46:47 -07:00
Jean-Michel Trivi
9c267f8d70
am 5504537e: Merge "Missing LoudnessEnhancer constructor and UUID in public API" into klp-dev
...
* commit '5504537e74571fc23a1ff029cf8645f07805a1f2':
Missing LoudnessEnhancer constructor and UUID in public API
2013-10-24 16:44:24 -07:00
Jean-Michel Trivi
5504537e74
Merge "Missing LoudnessEnhancer constructor and UUID in public API" into klp-dev
2013-10-24 23:42:13 +00:00
Adam Powell
c3661b1698
am 1fcdee0d: am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev
...
* commit '1fcdee0d4e907a2391362089cb10fb7053230a88':
Fix bug in Scene's use of setTag
2013-10-24 16:26:06 -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
Adam Powell
1fcdee0d4e
am 92da1779: Merge "Fix bug in Scene\'s use of setTag" into klp-dev
...
* commit '92da1779a932aed9c6ce32c117d0334f8d6a7273':
Fix bug in Scene's use of setTag
2013-10-24 16:23:38 -07:00
Erin Dahlgren
204b1e2817
am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
...
* commit 'fe470c37deda6b1d51b0a208ae31e101e90c7e1b':
Have the package manager write mimetype of preferred activities to xml.
2013-10-24 16:23:34 -07:00
Adam Powell
92da1779a9
Merge "Fix bug in Scene's use of setTag" into klp-dev
2013-10-24 23:21:57 +00: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
Adam Powell
f3c1577212
Fix bug in Scene's use of setTag
...
setTagInternal must be used for framework resource IDs.
Bug 11374402
Change-Id: If4d256dbf05055dac70796edd8d7b94bf65d947d
2013-10-24 16:01:34 -07:00
Jeff Sharkey
a5d24638f6
am 180e484e: am be416248: Merge "Remove persisted stacks when app removed/cleared." into klp-dev
...
* commit '180e484ef0370ab7f796c8fa51baf6b4c1c2cbdc':
Remove persisted stacks when app removed/cleared.
2013-10-24 15:40:15 -07:00
Jeff Sharkey
180e484ef0
am be416248: Merge "Remove persisted stacks when app removed/cleared." into klp-dev
...
* commit 'be416248631c001b846297597b25be9bccc960eb':
Remove persisted stacks when app removed/cleared.
2013-10-24 15:37:45 -07:00
Jeff Sharkey
be41624863
Merge "Remove persisted stacks when app removed/cleared." into klp-dev
2013-10-24 22:32:58 +00: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
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
052f7f0d4e
am 7c2a2ef2: Merge "Track window position with task position." into klp-dev
...
* commit '7c2a2ef2ee71d65ac43acf3dad95df1629dfc674':
Track window position with task position.
2013-10-24 14:28:41 -07:00
Craig Mautner
7c2a2ef2ee
Merge "Track window position with task position." into klp-dev
2013-10-24 21:26:11 +00:00
Christopher Tate
a8eb5071d2
am 525322ec: am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev
...
* commit '525322ecbab1502586d378e7065edc402abc63bf':
Support different watchdog timeouts for different entities
2013-10-24 13:58:07 -07:00
Christopher Tate
525322ecba
am f9f740da: Merge "Support different watchdog timeouts for different entities" into klp-dev
...
* commit 'f9f740dae19a63deb92c6bbe5ebeab8c852910a7':
Support different watchdog timeouts for different entities
2013-10-24 13:55:09 -07:00
Christopher Tate
f9f740dae1
Merge "Support different watchdog timeouts for different entities" into klp-dev
2013-10-24 20:52:23 +00:00
Craig Mautner
77df2ee9de
Track window position with task position.
...
Windows were previously ordered by TaskStack/ActivityStack order. This
change provides a data structure in DisplayContent that tracks task
movement. Previously Recents and Home activity windows were always
adjacent because they were on the same stack. With this change windows
from other activities can be placed between the two.
Fixes bug 11338594.
Change-Id: Ie34443ff22f330d015141d97db79370c54920d28
2013-10-24 12:47:07 -07:00
Aravind Akella
11e0c0e63c
am 1ba90786: am 28e26eb3: Merge "Fix for ClassCastException in SystemSensorManager." into klp-dev
...
* commit '1ba907867d299cb76317c510a2802189f51ce5f6':
Fix for ClassCastException in SystemSensorManager.
2013-10-24 12:43:12 -07:00