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

115664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
a337895682 am 2c163ee4: am 1e639d2d: Merge "Update the message for unavailable printers." into klp-dev 
* commit '2c163ee4eb1e1ec835bba1c906e4ba1f86983c46':
  Update the message for unavailable printers.
 2013-10-14 19:02:00 -07:00
Dianne Hackborn
9aded5abd6 am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '827c5af02de29424ea80f1ccfe525e681d0b74f0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-14 19:01:55 -07:00
David Christie
10661302a5 am 6ac67f47: am a6ffa4ef: Merge "Refresh quicksettings location tile text when language changes -b/11157526" into klp-dev 
* commit '6ac67f4714de56c1d638e2bdb22990a6fec91e7f':
  Refresh quicksettings location tile text when language changes -b/11157526
 2013-10-14 19:01:51 -07:00
Michael Jurka
7ec3a98110 am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev 
* commit '588bfeeaad627985163c8bcd76d4815b1ebce13a':
  Fix the build
 2013-10-14 19:01:47 -07:00
Amith Yamasani
6236cfdf13 am d0383e37: am 4d0f0692: Merge "Switch settings provider to use the new Settings icon" into klp-dev 
* commit 'd0383e37bdd7fe909ee4dc0477c73a7342aa7e4e':
  Switch settings provider to use the new Settings icon
 2013-10-14 19:01:42 -07:00
Michael Jurka
21bd2e5b0a am a8b20cf8: am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 
* commit 'a8b20cf801f841511979f440ab05b4f93a9c8ecb':
  Ensure URIs have content:// scheme in WPM
 2013-10-14 19:01:38 -07:00
Jeff Sharkey
881cde3358 am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '16c4b8c5999b4365bde5ad7c2f00337cee988dab':
  Relax user constraint on storage state.
 2013-10-14 19:01:30 -07:00
Jeff Sharkey
25b99efb32 am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev 
* commit 'ac0cb3591a637533c1f0329fd00a621fbe1fd997':
  Add extras to AFD, send orientation metadata.
 2013-10-14 19:00:51 -07:00
Craig Mautner
73b25d6ac0 am bd0a4143: am b3a08be2: Merge "Use dialog animations for dialog style." into klp-dev 
* commit 'bd0a4143302834c3d1a1343e82f6d4da7888308e':
  Use dialog animations for dialog style.
 2013-10-14 19:00:47 -07:00
Martijn Coenen
e7a81e7a87 am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev 
* commit '47936bb8f5192496b8007009f8732a9d7194b2ac':
  NFC card emulation API docs.
 2013-10-14 19:00:44 -07:00
Svetoslav Ganov
2f8079753d am f62e2629: am fe3b58fb: Merge "Update the print spooler action bar icon." into klp-dev 
* commit 'f62e262932daaea8b5eda3893a56e2fdbb17ea0a':
  Update the print spooler action bar icon.
 2013-10-14 19:00:41 -07:00
Svetoslav
9773b379fe am 79662942: am c89e5a6a: Merge "Layout may be called with invalid print attributes." into klp-dev 
* commit '796629422f3023c1cc3c8d970f5b66c1b34599d2':
  Layout may be called with invalid print attributes.
 2013-10-14 19:00:38 -07:00
Craig Mautner
0e10dfebf1 am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev 
* commit '2c345435458b8b6ad105bf14d3655e0f6836278b':
  Move the wallpaper beneath the keyguard.
 2013-10-14 19:00:35 -07:00
Robert Greenwalt
6becff179d am 87408ffd: am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev 
* commit '87408ffda1d101efb2cc56b657468318374488d9':
  Fix change to re-add carrier roaming details.
 2013-10-14 19:00:32 -07:00
Adam Lesinski
04e2a47ab7 am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev 
* commit '461f06f4037849d5075d947852306bafdf0e949c':
  Wrap measurement optimization in targetSdk check
 2013-10-14 19:00:28 -07:00
Michael Jurka
10f6465080 am 0396d55b: am b4c3b096: Merge "Add EXIF rotation support to system wallpaper cropper" into klp-dev 
* commit '0396d55b056113cddb74f3fc9dde9e2299897516':
  Add EXIF rotation support to system wallpaper cropper
 2013-10-14 19:00:24 -07:00
Wink Saville
f349ec0e5d am d1fcafa9: am 3fd9cb15: Merge "Telephony: Read signal strength values as expected" into klp-dev 
* commit 'd1fcafa996a9334ad2f0a8d7e1276d3e446b6216':
  Telephony: Read signal strength values as expected
 2013-10-14 19:00:21 -07:00
Jim Miller
566c4a0bc5 am 6915644d: am f7b75eeb: Merge "Add additional MNC overlays" into klp-dev 
* commit '6915644d5b978706e147ae1fc4f91bb3d3641c11':
  Add additional MNC overlays
 2013-10-14 19:00:17 -07:00
Vineeta Srivastava
26e9f9254a am 4967abcf: am 1680cfd8: Merge "Modify config.xml for tethering APN information." into klp-dev 
* commit '4967abcf2cce60e5a33e0bb9f0464b0897e65240':
  Modify config.xml for tethering APN information.
 2013-10-14 19:00:13 -07:00
Daniel Sandler
c963dfb27a am 596b1f86: am dd73ee4d: Add a config resource to enable translucent bars globally. 
* commit '596b1f86ff1a3457a514e1d383d14ef0defc4d53':
  Add a config resource to enable translucent bars globally.
 2013-10-14 19:00:10 -07:00
Scott Main
c13dd15c55 am 12191d2a: am 306ed4fd: am 3a920545: am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE 
* commit '12191d2ad5fae77a0fcb98948da2813977430b54':
  more documentation for SEND_RESPOND_VIA_MESSAGE
 2013-10-14 19:00:06 -07:00
Christopher Tate
6b013b753c am 5c742333: am b83bba7c: Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev 
* commit '5c74233315fd3b4ff9710624996b2312bbbaca5e':
  Log noisily on uid vs user-handle confusion in the settings provider
 2013-10-14 19:00:03 -07:00
Jim Miller
2399d6a4f0 am 7f988c2b: Merge "Don\'t move clock when warping in PagedView" into klp-dev 
* commit '7f988c2bbb0dfe5063c5a6ef423f5843b2a1bbb5':
  Don't move clock when warping in PagedView
 2013-10-14 18:59:18 -07:00
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
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