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

93419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Elliott Hughes
878da65328 am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error." 
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
  Fix AndroidHttpClient documentation error.
 2012-11-29 10:21:23 -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
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
Adam Powell
57c23a464a am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '10479a29cbdc55cfd25b30cd792a151234b55fa6':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-28 19:50:43 -08:00
Adam Powell
76ee9a9c17 am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '738b19033850df899c20865ba4152a6028b3bb23':
  Import assets from UX
 2012-11-28 19:50:35 -08:00
Dianne Hackborn
b443ddbbc7 am 2c41c4a2: Fix build. 
* commit '2c41c4a2766dcce506fc0e9e361fc8198553293c':
  Fix build.
 2012-11-28 19:48:57 -08:00
Adam Powell
10479a29cb Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 2012-11-28 19:03:01 -08:00
Adam Powell
738b190338 Merge "Import assets from UX" into jb-mr1.1-dev 2012-11-28 18:49:26 -08:00
Dianne Hackborn
2c41c4a276 Fix build. 
Change-Id: Icc1f2913b4e889609066b0ff1dddcd9be0230897
 2012-11-28 18:46:45 -08:00
Adam Powell
20b9cd2064 Import assets from UX 
Fixes issues with scaling/dithering artifacts in dialog/menu panel
assets.

Bug 7589786

Change-Id: I1285f9de5f8bcd0decfa7765c1463e444a56b335
 2012-11-28 18:41:10 -08:00
Dianne Hackborn
bac91ebdd0 am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit '860d0cd452529e7a01152582e6535c2129a46af7':
  Cleaner initial boot.
 2012-11-28 18:21:47 -08:00
Dianne Hackborn
860d0cd452 Merge "Cleaner initial boot." into jb-mr1.1-dev 2012-11-28 18:19:25 -08:00
Chris Craik
a9473881eb am 2435f98d: Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev 
* commit '2435f98d91c2760ba94bb7806d24e4c03e8d8fd9':
  Use the same interrupt/resume logic for all functor calls
 2012-11-28 18:18:36 -08:00
Adam Cohen
224daede9e am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '035352b4d62e259c86576dd3d1495b21bed172ff':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-28 18:18:32 -08:00
Chris Craik
2435f98d91 Merge "Use the same interrupt/resume logic for all functor calls" into jb-mr1.1-dev 2012-11-28 18:11:23 -08:00
Dianne Hackborn
13579ed330 Cleaner initial boot. 
This does some cleanup of the initial boot, especially when
booting in "no core apps" mode for encryption/decryption.

Change-Id: Ifb3949f580e52f54559e603c4b0b104f6bac2f6c
 2012-11-28 18:09:01 -08:00
Adam Cohen
035352b4d6 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:22 -08:00
Robert Greenwalt
10659cb1be am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '5a36e06ab2289073980b6147e13c8c03b94e5a80':
  Secure a handful of framework broadcasts
 2012-11-28 17:42:50 -08:00
Robert Greenwalt
5a36e06ab2 Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 2012-11-28 17:40:02 -08:00
Robert Greenwalt
47918ae3b4 Secure a handful of framework broadcasts 
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.

bug:7622253
Change-Id: Id8ec2778b15fe001e6fd0d5a010181bb21c52ad8
 2012-11-28 16:42:32 -08:00
Adam Cohen
d9e5af3851 Making sure keyguard and homescreen only display eligible widgets (issue 7550090) 
Change-Id: I25acb7bde2e8e5ac3185a009f5c7151b81f0ae19
 2012-11-28 16:36:56 -08:00
Irfan Sheriff
0cec3de337 am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 
* commit 'b4d5a9e73b51671e25b176310bd69f2d43a1167f':
  WFD: Fallback to PIN mode if PBC is not supported
 2012-11-28 16:30:53 -08:00
Irfan Sheriff
b4d5a9e73b Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 2012-11-28 16:28:41 -08:00
Irfan Sheriff
6681be2787 WFD: Fallback to PIN mode if PBC is not supported 
Bug: 7627641
Change-Id: Ibba6114f907c67f1cb60c460d5b65479f2d1b148
 2012-11-28 15:54:06 -08:00
Fabrice Di Meglio
075817450c am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '71175f727bc1e094e72a410aca62392badffbf11':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-28 15:08:12 -08:00
Dianne Hackborn
afdd978ccd am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '68e0da7e397f6808a90509615c08c62bb00af6ba':
  Quiet down a lot of logging.
 2012-11-28 15:06:36 -08:00
Fabrice Di Meglio
71175f727b Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 2012-11-28 15:05:55 -08:00
Dianne Hackborn
68e0da7e39 Merge "Quiet down a lot of logging." into jb-mr1.1-dev 2012-11-28 15:03:39 -08:00
Chet Haase
5181275499 am 25082e33: Merge "Another optimization of glyph cache uploads" 
* commit '25082e3326a3133607129b3e4cea983b113e9764':
  Another optimization of glyph cache uploads
 2012-11-28 15:02:09 -08:00
Chet Haase
25082e3326 Merge "Another optimization of glyph cache uploads" 2012-11-28 14:46:14 -08:00
Chris Craik
d15321bbf5 Use the same interrupt/resume logic for all functor calls 
bug:7093396

The functor was able to change the renderer's blend mode without it
being restored in process mode. This single path of updating gl caches
reduces likelihood of this occurring in the future.

Change-Id: Ie367532f9c683299f02bc4f635d7cb31f96db39f
 2012-11-28 14:45:04 -08:00
Scott Main
d294d429f9 am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit 'ceafd15df99ed77c9e9ed5e93d2c1f062a095169':
  docs: revisions to gps landing pages
 2012-11-28 13:19:36 -08:00
Dirk Dougherty
a539807a7c 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 '37f00afa4fe49730a9f7d3220c509247fd12828c':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-28 13:19:30 -08:00
Scott Main
ceafd15df9 am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit '23cc5d99fcb97c5a369b3ddf7f90505f6bb29363':
  docs: revisions to gps landing pages
 2012-11-28 13:17:36 -08:00