Jim Miller
7f988c2bbb
Merge "Don't move clock when warping in PagedView" into klp-dev
2013-10-15 01:57:25 +00:00
Victoria Lease
26cb103ecb
am fb19db60: Merge "remove U+261d from MTLmr3m.ttf" into klp-dev
...
* commit 'fb19db60960e5c33b19caf8a58b0c75a187ff754':
remove U+261d from MTLmr3m.ttf
2013-10-14 18:54:47 -07:00
Victoria Lease
fb19db6096
Merge "remove U+261d from MTLmr3m.ttf" into klp-dev
2013-10-15 01:52:15 +00:00
Carlos Valdivia
5505706cfa
am cdb9ea79: Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev
...
* commit 'cdb9ea79a57c847c3ce589cefe3dcdf1ab046db0':
Package checks for resloving recovery tokens should be user sensitive.
2013-10-14 18:48:12 -07:00
Carlos Valdivia
cdb9ea79a5
Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev
2013-10-15 01:45:45 +00:00
Dirk Dougherty
593d970615
Doc change: add i/o 2013 design video embeds to videos page.
...
Change-Id: I9dc0655671f0365905b01615a64905c12c0a2375
Bug-Id: 11191366
2013-10-14 18:40:38 -07:00
Craig Mautner
910deb7155
am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev
...
* commit 'cf8a6ca9aa31b4e8930b0f6e6cbc3108fda4a9bf':
Clear displayStartTime whenever starting activity.
2013-10-14 18:30:16 -07:00
John Spurlock
30408434d3
am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev
...
* commit 'f803336028e1a183facec1a526268f2bcf54e16b':
Give IMEs the entire screen to use for measuring purposes.
2013-10-14 18:30:13 -07:00
Craig Mautner
cf8a6ca9aa
Merge "Clear displayStartTime whenever starting activity." into klp-dev
2013-10-15 01:28:48 +00:00
John Spurlock
f803336028
Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev
2013-10-15 01:27:42 +00:00
Craig Mautner
1e8b872edc
Clear displayStartTime whenever starting activity.
...
setLaunchTime() was only being called from resumeTopActivityLaunched()
but also needed to be called from minimalResumeActivityLocked().
Fixes bug 11104901.
Change-Id: I35c994562dffaf75de014021c775e398224eb3a3
2013-10-14 18:24:52 -07:00
Eino-Ville Talvala
615b75f335
Camera2: Fix face rectangle coordinate mapping, and use Key.equals
...
- Faces are reported differently from other rectangles, so the mapping
has to be specialized for them
- Use Key.equals for key comparison.
Bug: 11206459
Change-Id: I9a2a408dad981c2911048191ec30977020953146
2013-10-14 18:20:43 -07:00
John Spurlock
f8508272ad
Give IMEs the entire screen to use for measuring purposes.
...
IMEs recently gained the ability to layout out under the nav bar,
but our core measuring logic does not give height=WRAP_CONTENT windows
the entire screen height when computing desired window height.
Since IMEs can be identified by type, let them use the entire screen
height for measuring purposes, to properly handle the cases where
space is constrained, making that unaccounted-for nav bar height
important.
Bug:11215678
Change-Id: I1d0b73454c0c629e7d669b9de70641c7e8c4d333
2013-10-14 21:06:52 -04:00
Svetoslav
2c163ee4eb
am 1e639d2d: Merge "Update the message for unavailable printers." into klp-dev
...
* commit '1e639d2d77dc225a6d5f191ce97561f1b987e402':
Update the message for unavailable printers.
2013-10-14 18:05:45 -07:00
Dianne Hackborn
827c5af02d
am e49a107a: Merge "Fix issue #11223335 : APR: Lots of failures in procstats due to..." into klp-dev
...
* commit 'e49a107a241b77c2361d67796dcb433441d91e37':
Fix issue #11223335 : APR: Lots of failures in procstats due to...
2013-10-14 18:02:15 -07:00
Carlos Valdivia
416747aea1
Package checks for resloving recovery tokens should be user sensitive.
...
Bug: 11219355
Change-Id: Iec031739dc0d751ee9841ca2c495a346d689ad2a
2013-10-14 18:01:58 -07:00
Svetoslav
1e639d2d77
Merge "Update the message for unavailable printers." into klp-dev
2013-10-15 01:01:43 +00:00
Dianne Hackborn
e49a107a24
Merge "Fix issue #11223335 : APR: Lots of failures in procstats due to..." into klp-dev
2013-10-15 01:00:07 +00:00
David Christie
6ac67f4714
am a6ffa4ef: Merge "Refresh quicksettings location tile text when language changes -b/11157526" into klp-dev
...
* commit 'a6ffa4ef021ee35a533bc05205d6add6971cc44a':
Refresh quicksettings location tile text when language changes -b/11157526
2013-10-14 17:51:37 -07:00
David Christie
a6ffa4ef02
Merge "Refresh quicksettings location tile text when language changes -b/11157526" into klp-dev
2013-10-15 00:49:14 +00:00
Michael Jurka
588bfeeaad
am f6f545f6: Merge "Fix the build" into klp-dev
...
* commit 'f6f545f6a7601c9c0b7f6132488cced1d3a0d78b':
Fix the build
2013-10-14 17:48:00 -07:00
Michael Jurka
f6f545f6a7
Merge "Fix the build" into klp-dev
2013-10-15 00:42:52 +00:00
Michael Jurka
5d1893bafb
Fix the build
2013-10-14 17:40:27 -07:00
Svetoslav
2fa010cf5b
Update the message for unavailable printers.
...
If a printer disappears or we do not get its capabilities, we
show the user a message that the printer is unavailable. This
message was appended after the printer name but they tend to
be very long and the user does not see that the printer is not
available due to ellipsis. Now we append the message after the
subtitle which tends to be much shorter.
bug:10983508
Change-Id: Ib3f7ad3bd82ff6decd49dc45461fb5131338e8c2
2013-10-14 17:36:19 -07:00
Amith Yamasani
d0383e37bd
am 4d0f0692: Merge "Switch settings provider to use the new Settings icon" into klp-dev
...
* commit '4d0f0692380b42683010e00ea10d4d2901ca36ed':
Switch settings provider to use the new Settings icon
2013-10-14 17:33:21 -07:00
Michael Jurka
a8b20cf801
am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev
...
* commit 'bcfc634db985935fa0a870d63b1bbd904e5bc676':
Ensure URIs have content:// scheme in WPM
2013-10-14 17:33:18 -07:00
David Christie
b8bf7017b1
Refresh quicksettings location tile text when language changes
...
-b/11157526
Change-Id: I2174a04edad15feffb9cf3b124b4e3f997d9070e
2013-10-14 17:31:37 -07:00
Amith Yamasani
4d0f069238
Merge "Switch settings provider to use the new Settings icon" into klp-dev
2013-10-15 00:31:08 +00:00
Jeff Sharkey
16c4b8c599
am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev
...
* commit 'ddf5a170d592614cbc2b7c1d88d906b7683e51d1':
Relax user constraint on storage state.
2013-10-14 17:29:34 -07:00
Michael Jurka
bcfc634db9
Merge "Ensure URIs have content:// scheme in WPM" into klp-dev
2013-10-15 00:27:50 +00:00
Jeff Sharkey
ddf5a170d5
Merge "Relax user constraint on storage state." into klp-dev
2013-10-15 00:25:23 +00:00
Jeff Sharkey
ac0cb3591a
am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev
...
* commit '8e656df0929b352660fd6d6209eabc4267c1941f':
Add extras to AFD, send orientation metadata.
2013-10-14 17:20:09 -07:00
Craig Mautner
bd0a414330
am b3a08be2: Merge "Use dialog animations for dialog style." into klp-dev
...
* commit 'b3a08be2a1a39ff2b1e59975e55b7c9f0171b177':
Use dialog animations for dialog style.
2013-10-14 17:19:56 -07:00
Martijn Coenen
47936bb8f5
am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev
...
* commit '7d91cc97d788aae9f3a6ac5540580cc95591e356':
NFC card emulation API docs.
2013-10-14 17:19:49 -07:00
Svetoslav Ganov
f62e262932
am fe3b58fb: Merge "Update the print spooler action bar icon." into klp-dev
...
* commit 'fe3b58fbed7a02d3e9f559ed2f814b42934dc784':
Update the print spooler action bar icon.
2013-10-14 17:19:36 -07:00
Svetoslav
796629422f
am c89e5a6a: Merge "Layout may be called with invalid print attributes." into klp-dev
...
* commit 'c89e5a6af1514320f90329dadebdfa26a3ae93d2':
Layout may be called with invalid print attributes.
2013-10-14 17:19:34 -07:00
Craig Mautner
2c34543545
am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev
...
* commit '79a0ed5848379b1f587bcc55a8a8b9417df6303b':
Move the wallpaper beneath the keyguard.
2013-10-14 17:19:27 -07:00
Robert Greenwalt
87408ffda1
am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev
...
* commit 'f64247e417ffcffb76bd47af417f4f3623073f88':
Fix change to re-add carrier roaming details.
2013-10-14 17:19:20 -07:00
Adam Lesinski
461f06f403
am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev
...
* commit '53a5e3175acb6e2bd23c25c1e4cba0789e47488f':
Wrap measurement optimization in targetSdk check
2013-10-14 17:19:16 -07:00
Michael Jurka
0396d55b05
am b4c3b096: Merge "Add EXIF rotation support to system wallpaper cropper" into klp-dev
...
* commit 'b4c3b09683de31e016ec5a358eed014b0e4111a3':
Add EXIF rotation support to system wallpaper cropper
2013-10-14 17:19:11 -07:00
Wink Saville
d1fcafa996
am 3fd9cb15: Merge "Telephony: Read signal strength values as expected" into klp-dev
...
* commit '3fd9cb155c2b4c28eed9cd886a3dfb01854f477b':
Telephony: Read signal strength values as expected
2013-10-14 17:19:08 -07:00
Jim Miller
6915644d5b
am f7b75eeb: Merge "Add additional MNC overlays" into klp-dev
...
* commit 'f7b75eeb7efb84a2da5e28b4dcd979009f443e43':
Add additional MNC overlays
2013-10-14 17:19:02 -07:00
Vineeta Srivastava
4967abcf2c
am 1680cfd8: Merge "Modify config.xml for tethering APN information." into klp-dev
...
* commit '1680cfd803d6a435ce4c809075d052da2723ac07':
Modify config.xml for tethering APN information.
2013-10-14 17:18:21 -07:00
Daniel Sandler
596b1f86ff
am dd73ee4d: Add a config resource to enable translucent bars globally.
...
* commit 'dd73ee4d0a33aa9a423b80471aec6d1ec81a6c82':
Add a config resource to enable translucent bars globally.
2013-10-14 17:18:15 -07:00
Scott Main
12191d2ad5
am 306ed4fd: am 3a920545: am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE
...
* commit '306ed4fd4f7e05d0e87b06816fd8bc6bc7d91846':
more documentation for SEND_RESPOND_VIA_MESSAGE
2013-10-14 17:18:06 -07:00
Christopher Tate
5c74233315
am b83bba7c: Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev
...
* commit 'b83bba7c353de6ac1af7c5770c48d1f323acb97e':
Log noisily on uid vs user-handle confusion in the settings provider
2013-10-14 17:18:03 -07:00
Dianne Hackborn
878deb3c7b
Fix issue #11223335 : APR: Lots of failures in procstats due to...
...
...bad cleanup of crashing processes
We now have a special path for crashing processes, to silently
clean up their state.
Also some tweaks to Log/Slog.wtf to get better stack crawl
summaries in APR.
Change-Id: Ieced26989907a6e7615b6fa033813fced78d7474
2013-10-14 17:15:40 -07:00
Jeff Sharkey
8e656df092
Merge "Add extras to AFD, send orientation metadata." into klp-dev
2013-10-15 00:00:20 +00:00
Adam Lesinski
bba72d13af
Ensure URIs have content:// scheme in WPM
...
getCropAndSetWallpaperIntent should only accept URIs with
the content:// scheme, so that the receiving application
doesn't crash opening a file it can't access.
bug:11173560
Change-Id: I855496633b646373db757e9d8e6e425568103b8b
2013-10-14 16:51:56 -07:00
Craig Mautner
b3a08be2a1
Merge "Use dialog animations for dialog style." into klp-dev
2013-10-14 23:45:30 +00:00