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

93459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
a3aef5ff62 am 43658bae: am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev 
* commit '43658bae9cdb5307d54fa36f3e57def9d0991150':
  Fix multiuser bug in StatusBarManagerService.
 2012-11-29 14:28:18 -08:00
John Spurlock
721aaead07 am 1428384c: am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev 
* commit '1428384c6217c843169e233dc934d5fcbf18a792':
  Fix for navbar back/home appearing in keyguard (multiuser).
 2012-11-29 14:28:15 -08:00
Scott Main
35837ebb0c am 3aabc564: am bf0e87a4: am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev 
* commit '3aabc564253b9dd53f18c7111767190b22109cb4':
  docs: update landing page for Google Services
 2012-11-29 14:28:11 -08:00
Daniel Sandler
e196eb7642 am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 
* commit 'a8a63dd7d9d49930b70371319b5712aed17a9c4c':
  Flush the clock format when the locale changes.
 2012-11-29 14:28:07 -08:00
Victoria Lease
a5fa049562 am 4b77660b: am 7023b3b0: Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev 
* commit '4b77660b38cfff2ffb67c15db4c9e20adaac41d7':
  clarify Geofence.createCircle() param ranges
 2012-11-29 14:28:04 -08:00
Christopher Tate
45972e7cf0 am fac7b0a6: am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt 
* commit 'fac7b0a60306d851d903730ccc408a0272e866db':
  Cache resource ID lookups in aapt
 2012-11-29 14:27:56 -08:00
Craig Mautner
d08fc86964 am 4317b341: am 24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev 
* commit '4317b3418b144c162634ec647df76a484ac35612':
  Fix math errors causing black screen. DO NOT MERGE
 2012-11-29 14:27:43 -08:00
zzy
de95a276e7 am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size 
* commit '3fe63ce4a97a448e6f91754b6b9fa80eecead40b':
  timeout support for accept() and added check for signal size
 2012-11-29 14:27:33 -08:00
Fabrice Di Meglio
cd91470aad am 146b1290: am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev 
* commit '146b129075bfe879aa09888744d1ba8de06f331a':
  Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
 2012-11-29 14:27:05 -08:00
Adam Powell
8912a72cb2 am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 
* commit '462633695774a3cfd84b5c729266d039ec686a64':
  Fix time-related ScaleGestureDetector methods
 2012-11-29 14:27:01 -08:00
Adam Powell
2a1f11e975 am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:26:57 -08:00
Adam Powell
1126c2a693 am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '76ee9a9c171d08802b44883be54b32dc31aa680b':
  Import assets from UX
 2012-11-29 14:26:49 -08:00
Dianne Hackborn
b2e18e91ec am b443ddbb: am 2c41c4a2: Fix build. 
* commit 'b443ddbbc7f1c7ed2d30310f80323cd4a5bf3e8d':
  Fix build.
 2012-11-29 14:26:45 -08:00
Dianne Hackborn
5007dea96e am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit 'bac91ebdd0ae310a6b92a8b4bb91613025238356':
  Cleaner initial boot.
 2012-11-29 14:26:37 -08:00
Chris Craik
c0da873ee2 am a9473881: am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev 
* commit 'a9473881eb066b41ea2fb3389b5c0031c2ab4f38':
  Use the same interrupt/resume logic for all functor calls
 2012-11-29 14:26:33 -08:00
Adam Cohen
20b9edd805 am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:26:29 -08:00
Robert Greenwalt
81cf3abdd5 am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '10659cb1be0059353f9e2ae64c7cfcc9ec312ba3':
  Secure a handful of framework broadcasts
 2012-11-29 14:26:20 -08:00
Irfan Sheriff
61b00239dd am 0cec3de3: am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 
* commit '0cec3de3374a861497ff7eeada94865e85896971':
  WFD: Fallback to PIN mode if PBC is not supported
 2012-11-29 14:26:04 -08:00
Fabrice Di Meglio
52c3833e20 am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '075817450c61902ecaaf4af2d96e8542123a86bd':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-29 14:25:43 -08:00
Dianne Hackborn
221d59f723 am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
  Quiet down a lot of logging.
 2012-11-29 14:25:40 -08:00
Scott Main
18eeb4574e am d294d429: am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit 'd294d429f90ea7d442fa9cd0f0c71e9292a36016':
  docs: revisions to gps landing pages
 2012-11-29 12:45:30 -08:00
Dirk Dougherty
bea4bb716e am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 
* commit 'a539807a7c50948eec99b27e2d4d05da208ae3f1':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-29 12:45:26 -08:00
Brian Colonna
eceef837e3 am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit 'ceb87a664fdcfa08f98238bfe41fc3a03603cbf8':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-29 12:45:18 -08:00
Zhihai Xu
aaa453dbbd am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit '2c7dac19dd2cab68587cd129b45ad593f7bfdc44':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-29 12:45:09 -08:00
John Spurlock
43658bae9c am 143d73da: Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev 
* commit '143d73dab5bf3fe6b8835660543d3d03e781618f':
  Fix multiuser bug in StatusBarManagerService.
 2012-11-29 11:48:48 -08:00
John Spurlock
143d73dab5 Merge "Fix multiuser bug in StatusBarManagerService." into jb-mr1.1-dev 2012-11-29 11:45:57 -08:00
John Spurlock
1428384c62 am 958343c1: Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev 
* commit '958343c19f8a87dfb8967431684da3239ac20272':
  Fix for navbar back/home appearing in keyguard (multiuser).
 2012-11-29 11:41:55 -08:00
John Spurlock
958343c19f Merge "Fix for navbar back/home appearing in keyguard (multiuser)." into jb-mr1.1-dev 2012-11-29 11:40:30 -08:00
Scott Main
3aabc56425 am bf0e87a4: am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev 
* commit 'bf0e87a41bff9905fd8d623bc5c2b106f372bdc0':
  docs: update landing page for Google Services
 2012-11-29 11:32:56 -08:00
Scott Main
bf0e87a41b am 77ea05d0: Merge "docs: update landing page for Google Services" into jb-mr1-dev 
* commit '77ea05d0063cd0b417c3681e6c58bbebdaeb2d88':
  docs: update landing page for Google Services
 2012-11-29 11:31:02 -08:00
Scott Main
77ea05d006 Merge "docs: update landing page for Google Services" into jb-mr1-dev 2012-11-29 11:28:06 -08:00
Daniel Sandler
a8a63dd7d9 am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 
* commit '154e2d7d2c6c5a316b5471d56c86174dd9ca5e86':
  Flush the clock format when the locale changes.
 2012-11-29 11:23:10 -08:00
Scott Main
61885a659a docs: update landing page for Google Services 
Change-Id: I7d7543282158474b8e722a9833ddf15a1e4e03f8
 2012-11-29 11:22:42 -08:00
Daniel Sandler
154e2d7d2c Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 2012-11-29 11:20:25 -08:00
John Spurlock
8f3e6d5c83 Fix multiuser bug in StatusBarManagerService. 
First, do no harm.

Bug:7638210
Change-Id: I113b574a021d601b0c79d65a3b4b72eeb4c667ad
 2012-11-29 14:18:35 -05:00
Victoria Lease
4b77660b38 am 7023b3b0: Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev 
* commit '7023b3b0608e20bb881db9184c10ccfea7941332':
  clarify Geofence.createCircle() param ranges
 2012-11-29 11:13:25 -08:00
Victoria Lease
7023b3b060 Merge "clarify Geofence.createCircle() param ranges" into jb-mr1.1-dev 2012-11-29 11:09:26 -08:00
Christopher Tate
fac7b0a603 am 5f958e9b: am 67b38c44: Cache resource ID lookups in aapt 
* commit '5f958e9bfc793b3b653dfc88418bbd7745e633e1':
  Cache resource ID lookups in aapt
 2012-11-29 10:58:26 -08:00
Christopher Tate
5f958e9bfc am 67b38c44: Cache resource ID lookups in aapt 
* commit '67b38c44e8b04b97e357664804d593823b2a34ed':
  Cache resource ID lookups in aapt
 2012-11-29 10:55:52 -08:00
Elliott Hughes
878da65328 am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error." 
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
  Fix AndroidHttpClient documentation error.
 2012-11-29 10:21:23 -08:00
Craig Mautner
4317b3418b am 24d966a3: Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev 
* commit '24d966a3b6a0407076b333ec2e074160b2311cb2':
  Fix math errors causing black screen. DO NOT MERGE
 2012-11-29 09:59:45 -08:00
Craig Mautner
24d966a3b6 Merge "Fix math errors causing black screen. DO NOT MERGE" into jb-mr1.1-dev 2012-11-29 09:57:15 -08:00
Elliott Hughes
9ed4abd875 Merge "Fix AndroidHttpClient documentation error." 2012-11-29 09:23:54 -08:00
Elliott Hughes
565de5f6cb am 820b3e29: Merge "Make transactGetSockaddr locale safe" 
* commit '820b3e29caab93de9535f18d98c6fd264c7fa983':
  Make transactGetSockaddr locale safe
 2012-11-29 09:14:35 -08:00
Elliott Hughes
820b3e29ca Merge "Make transactGetSockaddr locale safe" 2012-11-29 08:50:23 -08:00
Daniel Sandler
43b23c6c69 Flush the clock format when the locale changes. 
Bug: 7569120
Change-Id: If85ff36c7fac8b07f10b7077afd23255a145db1c
 2012-11-29 11:35:02 -05:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error. 
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
 2012-11-29 08:32:13 -08:00
John Spurlock
ce479d831a Fix for navbar back/home appearing in keyguard (multiuser). 
Clear remembered sysui visibility flags in PhoneWindowManager
when switching users. They might have been from another user.

Then reapply current window's flags to ensure contribution
makes it to the status bar.

Bug:7506446
Change-Id: I8249ba006934bdc22b952da7c16e9983d091c489
 2012-11-29 09:52:21 -05:00
zzy
3fe63ce4a9 am 652678af: timeout support for accept() and added check for signal size 
* commit '652678af4d18b9a6c18ce6a860de01d958bc82fe':
  timeout support for accept() and added check for signal size
 2012-11-29 00:30:28 -08:00
Craig Mautner
9dd9e0c99d Fix math errors causing black screen. DO NOT MERGE 
Turning off animations in the Developer options creates a ValueAnimator
duration scale of 0. This is used as the denominator in RampAnimator
which, if the numerator is also 0, sets mAnimatedValue to NaN. Rounding
NaN to the nearest int produces 0 which is then assigned to
mScreenBrightness in DisplayPowerState.

A copy mistake which assigned mTransitionAnimationScale as the default
value for mAnimatorDurationScale in WindowManagerService is also
fixed here.

Bug 7515609 fixed.

Change-Id: I39f8d0a7abdd5a1fe70d757fe95fbddaf7a0ed51
 2012-11-29 00:11:50 -08:00