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

46384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
918cc2c8a2 am 47ffa461: (-s ours) am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1 
* commit '47ffa461676cae538fbe10da52f309f6cd24fed9':
  DO NOT MERGE: Almost all warnings are now errors in RS build.
 2011-03-04 01:01:10 -08:00
Wink Saville
29ba5c73ca am 5cf1dbec: (-s ours) am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1 
* commit '5cf1dbec1b1d534863f03fc166c7289c4a9d399c':
  DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
 2011-03-04 01:01:04 -08:00
Stephen Hines
07617fea01 am e5841d75: (-s ours) am 3080b85c: Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1 
* commit 'e5841d7538583420d3bad1c77ad428243f7b7054':
  DO NOT MERGE: Fix typos in RenderScript docs.
 2011-03-04 01:00:59 -08:00
Eric Fischer
5ef7449d28 am f4c0a050: am 6c935e63: Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1 
* commit 'f4c0a050c7f474529269f94418a4c4d2960c6752':
  Remove unneeded large-screen-specific translations.
 2011-03-04 01:00:52 -08:00
Shimeng (Simon) Wang
d60cb66551 am cb7f5187: am 6cc2bbe5: Merge "Shorten the animation length to make it snappier." into honeycomb-mr1 
* commit 'cb7f5187d37d70786c03d5531b36f7fc3bf7c129':
  Shorten the animation length to make it snappier.
 2011-03-04 01:00:46 -08:00
Adam Powell
548b890a33 am 89b1c371: am 580cde18: Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1 
* commit '89b1c37127f1c60f80e52887cccd0bf72edf5e0c':
  Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes
 2011-03-04 01:00:39 -08:00
Adam Powell
f22f924eb7 am 1a510ea1: am 789ff0a1: Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1 
* commit '1a510ea1fdbf23931ea6fa7d97c5b435454c574d':
  Fix bug 3505901 - SeekBar should account for thumb width in layout
 2011-03-04 01:00:32 -08:00
Irfan Sheriff
adea5d8c7a am f5949e0e: (-s ours) am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1 
* commit 'f5949e0ed1cd15c9535a07181fe58dc3f240767e':
  DO NOT MERGE update current config with dhcp settings
 2011-03-04 01:00:21 -08:00
Stephen Hines
47ffa46167 am 6e71c954: Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1 
* commit '6e71c954faff34b78a2952436b4f48d84a8c20cd':
  DO NOT MERGE: Almost all warnings are now errors in RS build.
 2011-03-04 00:16:11 -08:00
Wink Saville
5cf1dbec1b am 389bf4f7: Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1 
* commit '389bf4f734f1820e31f8807d117b6b15ded9ff8b':
  DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
 2011-03-04 00:16:05 -08:00
Stephen Hines
e5841d7538 am 3080b85c: Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1 
* commit '3080b85c2ef8846099ae86cd8fea65592a6a591d':
  DO NOT MERGE: Fix typos in RenderScript docs.
 2011-03-04 00:15:59 -08:00
Eric Fischer
f4c0a050c7 am 6c935e63: Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1 
* commit '6c935e634844055b3e6a4deed64d6e3dc816d1c5':
  Remove unneeded large-screen-specific translations.
 2011-03-04 00:15:54 -08:00
Shimeng (Simon) Wang
cb7f5187d3 am 6cc2bbe5: Merge "Shorten the animation length to make it snappier." into honeycomb-mr1 
* commit '6cc2bbe5cf8c959239d35972c0acac494e5c1559':
  Shorten the animation length to make it snappier.
 2011-03-04 00:15:48 -08:00
Adam Powell
89b1c37127 am 580cde18: Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1 
* commit '580cde18619be70d3fe296c83360bf52772af636':
  Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes
 2011-03-04 00:15:41 -08:00
Adam Powell
1a510ea1fd am 789ff0a1: Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1 
* commit '789ff0a13b9bbb69ead32d0084ec9e058061f419':
  Fix bug 3505901 - SeekBar should account for thumb width in layout
 2011-03-04 00:15:35 -08:00
Irfan Sheriff
f5949e0ed1 am 9c8de733: Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1 
* commit '9c8de7331475ef6f55449d95d0dfc6dcb425d116':
  DO NOT MERGE update current config with dhcp settings
 2011-03-04 00:15:28 -08:00
Ed Heyl
a854544e8d Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-03-03 22:26:06 -08:00
Ed Heyl
40c337f1ea Merge branch 'master' into honeycomb-plus-aosp 2011-03-03 21:49:11 -08:00
Jeff Brown
3724a24502 am 503c4600: am 9503e8bc: (-s ours) am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 
* commit '503c4600568dba7d120e8890a78a492211c2ad12':
  Only set KeyEvent long press flag when repeat count equals 1.
 2011-03-03 18:49:24 -08:00
Jeff Brown
503c460056 am 9503e8bc: (-s ours) am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 
* commit '9503e8bc17d72d16631e8d79e8d1c29702fc1e42':
  Only set KeyEvent long press flag when repeat count equals 1.
 2011-03-03 18:45:18 -08:00
Svetoslav Ganov
e5f823ccf1 am 5a2c6fbf: am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 
* commit '5a2c6fbf847af971457f014ce7073812c9dd31e7':
  NPE in in AppGlobals#getIntCoreSetting
 2011-03-03 18:22:29 -08:00
Svetoslav Ganov
5a2c6fbf84 am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 
* commit 'e70c6607e0316fe390d52a544f6832c60223881f':
  NPE in in AppGlobals#getIntCoreSetting
 2011-03-03 17:37:20 -08:00
Eric Fischer
07ca17040a am 5ea551e6: (-s ours) am 8264781e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '5ea551e637835fd607a4953d7db140ddaa793227':
  Import revised translations.  DO NOT MERGE
 2011-03-03 17:25:18 -08:00
satok
65ecb44363 am d145249b: (-s ours) am c91437d3: do not merge: Cherry pick change I878192090 from master. 
* commit 'd145249b4f7b32cd7f78899fd64ebb91e42389ef':
  do not merge: Cherry pick change I878192090 from master.
 2011-03-03 17:25:12 -08:00
Carl Shapiro
332abc3055 Merge "Fix a compare of JNI references to use IsSameObject." 2011-03-03 17:17:43 -08:00
Lorenzo Colitti
5c1c298054 Merge "Fix IPv6->IPv4 fallback for HTTPS." 2011-03-03 17:04:21 -08:00
Carl Shapiro
375aa0b09b Fix a compare of JNI references to use IsSameObject. 
Change-Id: I9932761271034ff5031730874daf7c147b6b008a
 2011-03-03 17:00:38 -08:00
Stephen Hines
6e71c954fa Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1 2011-03-03 16:14:00 -08:00
Wink Saville
389bf4f734 Merge "DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-mr1 2011-03-03 16:13:07 -08:00
Stephen Hines
1bf1f8df17 DO NOT MERGE: Almost all warnings are now errors in RS build. 
Change-Id: Ie4952cdf5c75bf1b7a7899a32b3b1f8747686356
 2011-03-03 16:12:43 -08:00
Stephen Hines
3080b85c2e Merge "DO NOT MERGE: Fix typos in RenderScript docs." into honeycomb-mr1 2011-03-03 16:12:08 -08:00
Stephen Hines
8cecbb5293 DO NOT MERGE: Fix typos in RenderScript docs. 
Change-Id: Ie5f326c5c682ca7b604328ab25d7402cf01f7890
 2011-03-03 16:10:52 -08:00
Eric Fischer
6c935e6348 Merge "Remove unneeded large-screen-specific translations." into honeycomb-mr1 2011-03-03 16:03:20 -08:00
Wink Saville
761c3e67da Merge "ApnSettings: Removal of Enabled, Class and Inactivity Timer." 2011-03-03 16:02:10 -08:00
Eric Fischer
5ea551e637 am 8264781e: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '8264781eb070b980664aa3994b162886b4a74678':
  Import revised translations.  DO NOT MERGE
 2011-03-03 15:48:55 -08:00
Eric Fischer
24be6f9b06 Remove unneeded large-screen-specific translations. 
Change-Id: Ifb55c466fbd6450504c2111193ce3049ccd99425
 2011-03-03 15:47:55 -08:00
satok
d145249b4f am c91437d3: do not merge: Cherry pick change I878192090 from master. 
* commit 'c91437d38ae14a20046de47831eb0f9bfd329af7':
  do not merge: Cherry pick change I878192090 from master.
 2011-03-03 15:47:43 -08:00
Shimeng (Simon) Wang
6cc2bbe5cf Merge "Shorten the animation length to make it snappier." into honeycomb-mr1 2011-03-03 15:39:18 -08:00
Shimeng (Simon) Wang
47e57fd18f Shorten the animation length to make it snappier. 
This is double tap zoom animation.

issue: 3509451
Change-Id: Ibc09eb95f3e1aa6874e8182f811829ce3da7179d
 2011-03-03 15:29:27 -08:00
Adam Powell
580cde1861 Merge "Fix bug 3506261 - Theme attributes and placeholder assets to support selection action modes" into honeycomb-mr1 2011-03-03 15:13:04 -08:00
Adam Powell
789ff0a13b Merge "Fix bug 3505901 - SeekBar should account for thumb width in layout" into honeycomb-mr1 2011-03-03 15:12:02 -08:00
Adam Powell
0e37f21ca3 Fix bug 3505901 - SeekBar should account for thumb width in layout 
Change-Id: Id69ba32c9d79adbb54c85192926659bc5142fdbd
 2011-03-03 15:08:45 -08:00
Jeff Brown
9503e8bc17 am e23c235c: Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 
* commit 'e23c235c662c3028cfb080c6ed60d7defcdd0b69':
  Only set KeyEvent long press flag when repeat count equals 1.
 2011-03-03 15:03:26 -08:00
Irfan Sheriff
9c8de73314 Merge "DO NOT MERGE update current config with dhcp settings" into honeycomb-mr1 2011-03-03 15:01:53 -08:00
Irfan Sheriff
84cffa4526 DO NOT MERGE update current config with dhcp settings 
After DHCP completes, update the current configured
networks list with the IP setting details

Change-Id: I1ece1eda20224c69a4635bd38fdc5bef15818bb2
 2011-03-03 15:00:51 -08:00
Carl Shapiro
d54952b451 Merge "Establish a global reference before saving a class into a global." 2011-03-03 14:44:50 -08:00
Jeff Brown
e23c235c66 Merge "Only set KeyEvent long press flag when repeat count equals 1." into gingerbread 2011-03-03 14:42:14 -08:00
Irfan Sheriff
c0bf067f1c Merge "update current config with dhcp settings" 2011-03-03 14:39:59 -08:00
Andreas Huber
f109c6b5b8 Merge "Reject streaming .mp4 files over http that are not muxed reasonably." 2011-03-03 14:33:25 -08:00
Ramesh Sudini
8c6dc01701 ApnSettings: Removal of Enabled, Class and Inactivity Timer. 
Bug: 3479209
Change-Id: I30e9d2683f3484d70bd3be21f8369788f34ec106
 2011-03-03 14:32:58 -08:00