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

96852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chet Haase
288f20c603 am 51812754: am 25082e33: Merge "Another optimization of glyph cache uploads" 
* commit '518127549997fbf01fd3af59c4312e43f137e194':
  Another optimization of glyph cache uploads
 2012-11-28 15:05:03 -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
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
Wink Saville
43cdf6d679 Merge "Use Rlog instead of Log" 2012-11-28 12:31:04 -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
507a2d9852 am c87b053b: am b29dc7e3: am f3a39f2d: Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev 
* commit 'c87b053bf92bf39644b554673bc4480606df57e3':
  Remove overzealous mutate() sanity check in LayerDrawable
 2012-11-28 11:33:49 -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
Zhihai Xu
3e1c6f8a10 am ccacaf94: am a6433475: am 5c0f3e50: Merge "Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially" into jb-mr1.1-dev 
* commit 'ccacaf9434bdd0d89aede6dfa1409a4ab6241063':
  Cannot enable Bluetooth after using airplane and Bluetooth tethering sequentially
 2012-11-28 11:30:06 -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
Adam Powell
1cf2ca8358 Clean up behavior of type arguments for MediaRouter#getSelectedRoute 
MediaRouter's policy so far has been around a single selected route,
but when route types are entirely orthogonal this should not be the
case. However we still don't want to get into a situation where we
have multiple, very different routes selected for different types at
the same time, we still want to have more of an element of
predictability.

Behavior of getSelectedRoute is now:

* If the selected route matches at least one type with the requested
  type flags, it is still considered selected for that request.

* If the caller specifically requested the selected user route and the
  currently selected route is not a user route, return null.

* If the requested type flags do not match any types with the selected
  route, return the default system route.

Note that this is "any" behavior instead of "all" - this matches
existing usage of the method. We may consider adding an "all" variant
later on.

Bug 7588042

Change-Id: I3a79d8153ca6b882fd3ef6b9b1de8f538873dec2
 2012-11-28 11:22:01 -08:00
Scott Main
ce4a9a34b6 am 33a8b28f: am 1cc041f7: am 7538ff09: am 35473e6e: Merge "docs: update dreamservice description" into jb-mr1-dev 
* commit '33a8b28f04ae689f3d5e24ef46df1dea76be602b':
  docs: update dreamservice description
 2012-11-28 11:04:18 -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
Robert Ly
076a6021d3 docs: fix bug 7628699 
Change-Id: I7e8ca29910345559993cf415c2a89a21f50e4e17
 2012-11-28 10:11:22 -08:00
Scott Main
35473e6e6d Merge "docs: update dreamservice description" into jb-mr1-dev 2012-11-28 10:05:54 -08:00
Andreas Huber
c653df4643 am 8fac23f2: am 8be8ee4c: am f0afad00: Merge "Stop caching stream duration, it might change (increase) dynamically." into jb-mr1.1-dev 
* commit '8fac23f23df08b192a542be57b09badfbb0a1bf4':
  Stop caching stream duration, it might change (increase) dynamically.
 2012-11-28 09:47:50 -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
Svetoslav Ganov
ec45cc096d Merge "Switching the accessibility poolable classes to the new pool management APIs." 2012-11-28 09:16:45 -08:00
Svetoslav Ganov
f4782ec9c5 Switching the accessibility poolable classes to the new pool management APIs. 
The pool management APIs were simplified and using them requires much less
code than implementing your own pooling. Using common pooling logic is
also less error prone. This change swithces AccessibilityEvent and
AccessibilityNodeInfo to the new APIs.

Change-Id: I2dcfe2e1b0b0be5f89bd92359766ae3d6f8a143b
 2012-11-28 09:11:51 -08:00
Daniel Sandler
cfb95d0549 am e9316c06: am 78d2febf: am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit 'e9316c06756f4553c812b34cf023f54a514e86aa':
  New timings for default & fallback notification vibration.
 2012-11-28 06:31:53 -08:00
Ken Sumrall
fa5a2593c9 am be473c8f: Merge branch \'jb-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr1-dev-plus-aosp 
* commit 'be473c8fd12955dcb861f330f5f7a4a2a453c8df':
 2012-11-28 06:31:49 -08:00
Daniel Sandler
57f39c23b6 am 690d2052: am 6684a2ce: am bf0e106a: Merge "Cleanups in Notification.java." into jb-mr1.1-dev 
* commit '690d2052b2d5eb7c471c93aacec4f5e28b42107f':
  Cleanups in Notification.java.
 2012-11-28 06:31:45 -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
Alex Ray
8a6787b1c7 core: Update Java wrappers for atrace. 
Atrace functionality moved to cutils.  Add ATRACE_TAG_HAL.

Change-Id: I80e1c9438bfd2436559b64e94e4009cb9c5dbc09
 2012-11-27 23:11:16 -08:00
Svetoslav Ganov
4cdb0adcb3 Merge "Simplification of the poolable management utils." 2012-11-27 19:13:12 -08:00