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

77172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
4da9ff8555 Merge "Import translations. DO NOT MERGE" 2012-05-09 16:30:37 -07:00
Eric Fischer
aaee2e7725 Merge "Import translations. DO NOT MERGE" 2012-05-09 16:24:33 -07:00
Irfan Sheriff
0280e9cf8f am 1a11e33b: am 9669a0ce: Merge "API review fixes" into jb-dev 
* commit '1a11e33b91daeed22eef42936233e0751e56f4b8':
  API review fixes
 2012-05-09 14:09:20 -07:00
Irfan Sheriff
1a11e33b91 am 9669a0ce: Merge "API review fixes" into jb-dev 
* commit '9669a0ce574745ba0b0ebd32e8337811973fb7dc':
  API review fixes
 2012-05-09 14:06:12 -07:00
Irfan Sheriff
9669a0ce57 Merge "API review fixes" into jb-dev 2012-05-09 14:04:04 -07:00
Craig Mautner
3770003e84 am bdf3dc1c: am 08c04000: Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev 
* commit 'bdf3dc1c95c203224a9a464fad6612e413a3597c':
  Remove incorrect CLEAR_WHEN_TASK_RESET behavior.
 2012-05-09 14:02:27 -07:00
Craig Mautner
bdf3dc1c95 am 08c04000: Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev 
* commit '08c04000c6355a735dab237e1994dc17c7e5d44f':
  Remove incorrect CLEAR_WHEN_TASK_RESET behavior.
 2012-05-09 13:58:14 -07:00
Jim Miller
e310ca7a3a am 319a945d: am c1fc0f01: Merge "Fix 6398209: Improve responsiveness of swipe up to search" into jb-dev 
* commit '319a945d589284251c457f49220dcf4957e71d5a':
  Fix 6398209: Improve responsiveness of swipe up to search
 2012-05-09 13:57:17 -07:00
Craig Mautner
08c04000c6 Merge "Remove incorrect CLEAR_WHEN_TASK_RESET behavior." into jb-dev 2012-05-09 13:55:52 -07:00
Jim Miller
319a945d58 am c1fc0f01: Merge "Fix 6398209: Improve responsiveness of swipe up to search" into jb-dev 
* commit 'c1fc0f01d2b0af2216870a40ae4cb6572588d194':
  Fix 6398209: Improve responsiveness of swipe up to search
 2012-05-09 13:54:27 -07:00
Svetoslav Ganov
48168e7b23 am cd26d63f: am f103758b: Merge "Delegate list item focus and click actions to the parent list." into jb-dev 
* commit 'cd26d63ffa455856157d375d1f2564151365b19e':
  Delegate list item focus and click actions to the parent list.
 2012-05-09 13:52:18 -07:00
Jim Miller
c1fc0f01d2 Merge "Fix 6398209: Improve responsiveness of swipe up to search" into jb-dev 2012-05-09 13:51:46 -07:00
Svetoslav Ganov
cd26d63ffa am f103758b: Merge "Delegate list item focus and click actions to the parent list." into jb-dev 
* commit 'f103758b7c78f4dc1c5bd57383d245ec138576a1':
  Delegate list item focus and click actions to the parent list.
 2012-05-09 13:49:33 -07:00
Svetoslav Ganov
f103758b7c Merge "Delegate list item focus and click actions to the parent list." into jb-dev 2012-05-09 13:46:57 -07:00
Kenny Root
941d2edd83 am 7a7d8f18: am bad417df: Merge "Throw RemoteException when MountService is not yet up" into jb-dev 
* commit '7a7d8f182a2f18f1d548e76d629b8ed191caade5':
  Throw RemoteException when MountService is not yet up
 2012-05-09 13:32:03 -07:00
Kenny Root
7a7d8f182a am bad417df: Merge "Throw RemoteException when MountService is not yet up" into jb-dev 
* commit 'bad417df657128a988b23a6b70b4d08633e4ac5a':
  Throw RemoteException when MountService is not yet up
 2012-05-09 13:28:54 -07:00
Kenny Root
bad417df65 Merge "Throw RemoteException when MountService is not yet up" into jb-dev 2012-05-09 13:27:08 -07:00
Andreas Huber
610ac933fc am 039495d3: am ea86b36f: Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev 
* commit '039495d3dc19b96e3953fde81b74c44d0ac5c2f0':
  Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
 2012-05-09 13:27:03 -07:00
Andreas Huber
039495d3dc am ea86b36f: Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev 
* commit 'ea86b36f8087241dd898821fe29020e74b2c93d4':
  Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
 2012-05-09 13:23:04 -07:00
Andreas Huber
ea86b36f80 Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev 2012-05-09 13:20:32 -07:00
Eric Fischer
589275afea Import translations. DO NOT MERGE 
Change-Id: I6fca46faf28fa4470792a0baf986808f533e7fae
 2012-05-09 12:38:10 -07:00
Eric Fischer
45f110fb0d Import translations. DO NOT MERGE 
Change-Id: Ifbfd8ca86839071e50cc841907a8945847ea82f0
 2012-05-09 12:24:52 -07:00
Daisuke Miyakawa
a61efe07ca am bf08b404: am 01028b6f: Merge "Remove STOPSHIP part of the logging in telephony" into jb-dev 
* commit 'bf08b404a0bc70b8ffe7762a1a829a92a09d0c18':
  Remove STOPSHIP part of the logging in telephony
 2012-05-09 12:11:47 -07:00
Daisuke Miyakawa
bf08b404a0 am 01028b6f: Merge "Remove STOPSHIP part of the logging in telephony" into jb-dev 
* commit '01028b6fa4d56808f3cced408d9d55ae1a710fa8':
  Remove STOPSHIP part of the logging in telephony
 2012-05-09 12:07:35 -07:00
Daisuke Miyakawa
01028b6fa4 Merge "Remove STOPSHIP part of the logging in telephony" into jb-dev 2012-05-09 12:04:49 -07:00
Gilles Debunne
9740181e5f am 4f9e7490: am 12ff1492: Merge "Spell checker underlines words even when there are no suggestions" into jb-dev 
* commit '4f9e7490e720025f9b14c45342eac8b671544fe4':
  Spell checker underlines words even when there are no suggestions
 2012-05-09 11:54:41 -07:00
Gilles Debunne
4f9e7490e7 am 12ff1492: Merge "Spell checker underlines words even when there are no suggestions" into jb-dev 
* commit '12ff149265ba599627896f6c1a0e3ea9721b54c1':
  Spell checker underlines words even when there are no suggestions
 2012-05-09 11:52:13 -07:00
Raph Levien
f0d4cd3f5f am 3fe37eb3: am ca81b7dd: Merge "Add Roboto Light and Light italic fonts, as sans-serif-light family" into jb-dev 
* commit '3fe37eb3e91ff338ff7a7b99e64835f3a9c5db0e':
  Add Roboto Light and Light italic fonts, as sans-serif-light family
 2012-05-09 11:49:47 -07:00
Gilles Debunne
12ff149265 Merge "Spell checker underlines words even when there are no suggestions" into jb-dev 2012-05-09 11:49:08 -07:00
Irfan Sheriff
22af38c526 API review fixes 
- Remove the notion of channel from an application perspective
- Remove the use of DnsSd as part of API and add a protocol type to allow
future extensions
- Use the listener object as a handler for stop and unregister operations. Also,
we now allow multiple active discovery operations.
- Remove init/deinit operations in favour of setting up construction

Bug:6434844
Change-Id: Id15521d571aac9c4053d81184ad66dfc54f636de
 2012-05-09 11:48:42 -07:00
Raph Levien
3fe37eb3e9 am ca81b7dd: Merge "Add Roboto Light and Light italic fonts, as sans-serif-light family" into jb-dev 
* commit 'ca81b7ddebe7654c0f4666e1ba5440c0ec81b3d6':
  Add Roboto Light and Light italic fonts, as sans-serif-light family
 2012-05-09 11:47:08 -07:00
Daisuke Miyakawa
e69ec2253c Remove STOPSHIP part of the logging in telephony 
We still need the log itself to trap the exceptional case.

Bug: 6201805
Change-Id: I62d12f6a1ed41817ee12c0f5c7fc4aa0a967a60f
 2012-05-09 11:44:58 -07:00
Raph Levien
ca81b7ddeb Merge "Add Roboto Light and Light italic fonts, as sans-serif-light family" into jb-dev 2012-05-09 11:44:38 -07:00
Craig Mautner
9158cbcbc9 Remove incorrect CLEAR_WHEN_TASK_RESET behavior. 
Fixes bug 6447950.

Change-Id: I6b512d5dd44c54e7b51f85c51783e8c942238c1d
 2012-05-09 11:37:48 -07:00
Andreas Huber
f86374adec Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no 
sense for the java API.

Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774
related-to-bug: 6276111
 2012-05-09 11:32:51 -07:00
Adam Cohen
3e8582d71f am 88f295d7: am 6a080bff: Merge "Accounting for widget padding in dips instead of pixels" into jb-dev 
* commit '88f295d72b6228738a9ea7eaa0a3b8796a1ff918':
  Accounting for widget padding in dips instead of pixels
 2012-05-09 11:28:04 -07:00
Adam Cohen
88f295d72b am 6a080bff: Merge "Accounting for widget padding in dips instead of pixels" into jb-dev 
* commit '6a080bff83b59c44b4eee493b8bf684f25871e2b':
  Accounting for widget padding in dips instead of pixels
 2012-05-09 11:24:58 -07:00
Craig Mautner
f60ae4e361 am fb52eccb: am 393295fa: Merge "Keep layout from overwriting translate dimensions" into jb-dev 
* commit 'fb52eccb6506374b46089cff9a40c043d6dfa1e5':
  Keep layout from overwriting translate dimensions
 2012-05-09 11:23:20 -07:00
Adam Cohen
6a080bff83 Merge "Accounting for widget padding in dips instead of pixels" into jb-dev 2012-05-09 11:23:12 -07:00
Craig Mautner
fb52eccb65 am 393295fa: Merge "Keep layout from overwriting translate dimensions" into jb-dev 
* commit '393295fabff828d3bc974a617d152ff0895a4071':
  Keep layout from overwriting translate dimensions
 2012-05-09 11:19:07 -07:00
Craig Mautner
393295fabf Merge "Keep layout from overwriting translate dimensions" into jb-dev 2012-05-09 11:17:19 -07:00
Adam Cohen
f065c96631 Accounting for widget padding in dips instead of pixels 
Change-Id: I29c4290274f8b9fa6d9b49072d3cf37cf6f1acb8
 2012-05-09 11:13:54 -07:00
satok
2d0861fd3c am 2e5c0d47: am 14124c69: Merge "Fix the issue that the insets linger after closing the voice input" into jb-dev 
* commit '2e5c0d47cff96cfd0406180856c4dcd908689f58':
  Fix the issue that the insets linger after closing the voice input
 2012-05-09 11:10:08 -07:00
satok
2e5c0d47cf am 14124c69: Merge "Fix the issue that the insets linger after closing the voice input" into jb-dev 
* commit '14124c696d82e68f93baed905ca01fc498ae1fc6':
  Fix the issue that the insets linger after closing the voice input
 2012-05-09 11:07:06 -07:00
satok
14124c696d Merge "Fix the issue that the insets linger after closing the voice input" into jb-dev 2012-05-09 11:04:51 -07:00
satok
e0a99414bd Fix the issue that the insets linger after closing the voice input 
Bug: 6456954
Change-Id: Idf7700271cf882dfbf35c9d16f0f173a791221bc
 2012-05-10 02:57:11 +09:00
JP Abgrall
2e59f1e892 am 90e6771b: am 956f9bd0: Merge "services: input events: enable debugging in EventHub (touch screen issues)" into jb-dev 
* commit '90e6771b9bf045a31cb7e85ae2a4c0e953413218':
  services: input events: enable debugging in EventHub (touch screen issues)
 2012-05-09 10:49:50 -07:00
Stephen Hines
3db194e9e0 am 218c0899: am 794db6cb: Merge "GFX api cleanup 1.5 of 2" into jb-dev 
* commit '218c0899bdea2395f1fe56e1eecc108b633e0da6':
  GFX api cleanup 1.5 of 2
 2012-05-09 10:49:44 -07:00
JP Abgrall
90e6771b9b am 956f9bd0: Merge "services: input events: enable debugging in EventHub (touch screen issues)" into jb-dev 
* commit '956f9bd0049b86b45868dfbd9b539d3ac35cdec2':
  services: input events: enable debugging in EventHub (touch screen issues)
 2012-05-09 10:43:33 -07:00
JP Abgrall
956f9bd004 Merge "services: input events: enable debugging in EventHub (touch screen issues)" into jb-dev 2012-05-09 10:41:28 -07:00