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

93388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dirk Dougherty
37f00afa4f 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 'f4d44618aa43b85c8a2a5bdd95e7454e2736452a':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-28 13:17:28 -08:00
Scott Main
23cc5d99fc Merge "docs: revisions to gps landing pages" into jb-mr1-dev 2012-11-28 13:15:27 -08:00
Dirk Dougherty
f4d44618aa Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 2012-11-28 13:14:36 -08:00
Brian Colonna
ceb87a664f am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit '6f6facc17812fe529f3de0b75de5f9011d73eacc':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-28 12:48:32 -08:00
Brian Colonna
6f6facc178 Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 2012-11-28 12:46:24 -08:00
Zhihai Xu
2c7dac19dd am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit 'e3f7c45241a90d3e4b76d28911831f5dcbaaa038':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-28 12:21:11 -08:00
Zhihai Xu
e3f7c45241 Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 2012-11-28 12:19:42 -08:00
Fabrice Di Meglio
b878ddb56e Fix bug #7621927 Radio button/TextView drawable regression in 4.2 
- as we remove the 9 patch padding trick, we need also to do the correct
positioning of the radio / checkbox / star during draw

Change-Id: I02b67bef9c0f2dc1c0c65361de14ab20ce9b881d
 2012-11-28 11:59:27 -08:00
Adam Powell
c87b053bf9 am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 
* commit 'b29dc7e37bc110894cd6287f071f6ba0e4d800a7':
  Remove overzealous mutate() sanity check in LayerDrawable
 2012-11-28 11:31:40 -08:00
Adam Powell
b29dc7e37b am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 
* commit 'f3a39f2df40503e8e3a91937f9f5f33b43528274':
  Remove overzealous mutate() sanity check in LayerDrawable
 2012-11-28 11:29:51 -08:00
Zhihai Xu
ccacaf9434 am a6433475: am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit 'a64334756858b9fd3bad2c263feea00233699218':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:27:55 -08:00
Adam Powell
f3a39f2df4 Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 2012-11-28 11:27:21 -08:00
Zhihai Xu
a643347568 am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit '5c0f3e5075c8ac8b22bbaeb32bddfada9657577a':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:26:08 -08:00
Scott Main
b0d2673184 docs: revisions to gps landing pages 
Change-Id: Ie9f2cf526a3ea328ce22dfb208e7eb95add56d0b
 2012-11-28 11:23:35 -08:00
Zhihai Xu
5c0f3e5075 Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 2012-11-28 11:22:21 -08:00
Scott Main
33a8b28f04 am 1cc041f7: am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '1cc041f7d7e76b77375ec03a1c626cb3a7952fc7':
  docs: update dreamservice description
 2012-11-28 11:02:41 -08:00
Scott Main
1cc041f7d7 am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '7538ff0920a8cbdfe68885221d1275633eafc613':
  docs: update dreamservice description
 2012-11-28 10:43:22 -08:00
Scott Main
7538ff0920 am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '35473e6e6d2d17c859173ca0cf0dfdcfcb0b4663':
  docs: update dreamservice description
 2012-11-28 10:40:18 -08:00
Scott Main
35473e6e6d Merge "docs: update dreamservice description" into jb-mr1-dev 2012-11-28 10:05:54 -08:00
Andreas Huber
8fac23f23d am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit '8be8ee4c4a2f6386680bc8c6aeb88c597d5f4dcd':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:44:44 -08:00
Andreas Huber
8be8ee4c4a am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit 'f0afad008bf78576ff364bcd8bc93b7aa8090b34':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:43:29 -08:00
Andreas Huber
f0afad008b Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 2012-11-28 09:39:27 -08:00
Daniel Sandler
e9316c0675 am 78d2febf: am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit '78d2febf1f3730c8ad5a6747456529cd1f34b0c7':
  New timings for default & fallback notification vibration.
 2012-11-28 06:30:15 -08:00
Ken Sumrall
be473c8fd1 Merge branch 'jb-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp 2012-11-28 06:30:14 -08:00
Daniel Sandler
78d2febf1f am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit 'c7f55f5595fb6ffdec7796e801545156aefd3655':
  New timings for default & fallback notification vibration.
 2012-11-28 06:28:13 -08:00
Daniel Sandler
c7f55f5595 Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 2012-11-28 06:22:53 -08:00
Dianne Hackborn
40e9f2922c Quiet down a lot of logging. 
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).

Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
 2012-11-27 19:12:23 -08:00
Daniel Sandler
690d2052b2 am 6684a2ce: am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev 
* commit '6684a2ce1abd94972d5480c2214a9509781c755b':
  Cleanups in Notification.java.
 2012-11-27 18:43:46 -08:00
Christopher Tate
e659cea645 am d51ffbea: am faeabc7b: Merge "Cache resource ID lookups in aapt" 
* commit 'd51ffbea9435408cf0ceb7c2ffa679f7567ae6f2':
  Cache resource ID lookups in aapt
 2012-11-27 18:43:36 -08:00
Daniel Sandler
6684a2ce1a am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev 
* commit 'bf0e106a7d755355d7ff53a2b319e2e91c154641':
  Cleanups in Notification.java.
 2012-11-27 18:41:01 -08:00