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

49584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
2cf1f52374 Merge "Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156." 2011-04-29 15:26:18 -07:00
Scott Main
bd3ddbb809 am 75c78dc3: am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '75c78dc364efb74c2d7c0187b3b26d0ab70e3c3e':
  docs: more documentation for ProgressBar
 2011-04-29 15:11:50 -07:00
Conley Owens
19b7cd95ff am c703b49e: am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit 'c703b49eb13993c45a1cab7ea1130601fba1df3e':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 15:11:48 -07:00
Conley Owens
17f83df960 am 7dcdfd79: am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." 
* commit '7dcdfd7988d1e57c7a705a2d7294e8bfa2b8afc9':
  Eliminating dead logic - bitmap state simply cannot be null here.
 2011-04-29 15:11:45 -07:00
Conley Owens
280a0c17d7 am 889bb20f: am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." 
* commit '889bb20f1bb47437331d404a59b86e6dfa4e2e93':
  Removing unnecessary computation.
 2011-04-29 15:11:41 -07:00
Conley Owens
fe96a021cf am bb74af7b: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit 'bb74af7b13bdc72eaed19abc8c3300a6af0f1d9b':
 2011-04-29 15:11:38 -07:00
Conley Owens
a02a9e602b am 27e8f1a3: am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '27e8f1a3a6b43592e3d419d7a3cfc6192a86bf5c':
  Using robust equality check.
 2011-04-29 15:11:34 -07:00
Conley Owens
1b38cc3057 am 014757ee: am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit '014757eea22fc9cceede1548c579c33c79464001':
  We don't need these local references.
 2011-04-29 15:11:30 -07:00
Conley Owens
95b533911c am 49df110a: am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit '49df110aeb94ada810a8eec0540e30a25c267a56':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 15:11:26 -07:00
Conley Owens
3513e1ca6f am ded7c652: am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" 
* commit 'ded7c652d754751e6fbde729d66825c69394d1cb':
  Remove duplicate '=' in exception message
 2011-04-29 15:11:22 -07:00
Nick Kralevich
144a2883cb Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-04-29 15:11:19 -07:00
Svetoslav Ganov
f0f955e2c3 Merge "Touch exploration - nits" 2011-04-29 15:10:14 -07:00
Svetoslav Ganov
887e1a17eb Touch exploration - nits 
Change-Id: Ie49558e0a81218dbad70c02f81dd7a59b3213d5c
 2011-04-29 15:09:28 -07:00
Scott Main
d2e3607f49 am 27ad0df0: am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit '27ad0df013e7eac9b7b9b6b207832f5ca3bf77e3':
  docs: tweak table headers for config qualifiers
 2011-04-29 15:09:23 -07:00
James Dong
32a4f90171 am a1f6a09a: (-s ours) am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. 
* commit 'a1f6a09a86f4acd2147d4f1110eedc6643bbf80b':
  Add avg bandwidth estimate every 2 seconds - do not merge.
 2011-04-29 15:09:14 -07:00
Scott Main
75c78dc364 am 511ec082: am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '511ec082bb198cfd04aebdccf56db6f4c8df9523':
  docs: more documentation for ProgressBar
 2011-04-29 15:05:10 -07:00
Scott Main
511ec082bb am de506220: am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit 'de506220d8a3d453463e1abe1b2eb54afd48ec93':
  docs: more documentation for ProgressBar
 2011-04-29 14:59:08 -07:00
Conley Owens
c703b49eb1 am 54668b8a: am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit '54668b8a3599559fc007af1d75c039400a05e898':
  Added null check on return value for getKeyDispatcherState()
 2011-04-29 14:57:53 -07:00
Conley Owens
7dcdfd7988 am f26ec38c: am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." 
* commit 'f26ec38c344af8cf91575b461028a3033b940d49':
  Eliminating dead logic - bitmap state simply cannot be null here.
 2011-04-29 14:57:18 -07:00
Conley Owens
889bb20f1b am eef8f148: am 11d7ec24: Merge "Removing unnecessary computation." 
* commit 'eef8f148881f39feb0b1aded121bbfc63e8d30c2':
  Removing unnecessary computation.
 2011-04-29 14:57:10 -07:00
Conley Owens
bb74af7b13 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-04-29 14:56:59 -07:00
Conley Owens
27e8f1a3a6 am 8b22ef66: am e41d2aed: Merge "Using robust equality check." 
* commit '8b22ef66ef1a67333e2f1d4250d2c134b50ef91a':
  Using robust equality check.
 2011-04-29 14:56:15 -07:00
Scott Main
27ad0df013 am 205d6fb3: am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit '205d6fb38d3c39a39ee9721b0d8e3649afacad18':
  docs: tweak table headers for config qualifiers
 2011-04-29 14:56:06 -07:00
Conley Owens
014757eea2 am a9517012: am 1e29552b: Merge "We don\'t need these local references." 
* commit 'a95170122619f5442d5efbdf2e37f91dbf455ab9':
  We don't need these local references.
 2011-04-29 14:56:05 -07:00
Conley Owens
49df110aeb am d66a92e6: am da882181: Merge "Eliminating dead code with no other effect than consuming battery life." 
* commit 'd66a92e6875bfc835adf0b100607afbf4bfc2761':
  Eliminating dead code with no other effect than consuming battery life.
 2011-04-29 14:55:55 -07:00
Scott Main
de506220d8 am 1462813a: Merge "docs: more documentation for ProgressBar" into honeycomb 
* commit '1462813a28270d4255f9542b666960182e274a6e':
  docs: more documentation for ProgressBar
 2011-04-29 14:55:43 -07:00
Conley Owens
ded7c652d7 am 893812b2: am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message" 
* commit '893812b2ee4a640ad398f7f79f90b92d52a5f3b1':
  Remove duplicate '=' in exception message
 2011-04-29 14:55:35 -07:00
James Dong
a1f6a09a86 am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. 
* commit 'f181e416ee3f104e79be2c2a76e9c1c25a214e17':
  Add avg bandwidth estimate every 2 seconds - do not merge.
 2011-04-29 14:53:30 -07:00
Scott Main
1462813a28 Merge "docs: more documentation for ProgressBar" into honeycomb 2011-04-29 14:52:20 -07:00
Jason Sams
3ea208a843 Merge "Pipe rsa function though the RS api table." 2011-04-29 14:51:37 -07:00
Scott Main
42f139c069 docs: more documentation for ProgressBar 
Change-Id: Ief415c0b22da3e7d4ea318e321edc7d215603f0f
 2011-04-29 14:51:05 -07:00
Jason Sams
7da9ff5b97 Merge "Fix fifo size check code." 2011-04-29 14:50:09 -07:00
Jason Sams
c1f52d3f75 Fix fifo size check code. 
Change-Id: If4a1874e34409e99c3fe63ff06e2b97e3369049d
 2011-04-29 14:46:57 -07:00
Scott Main
205d6fb38d am be2da3c9: am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit 'be2da3c9b64c7ced6acc9933e0b941a8ee4239fb':
  docs: tweak table headers for config qualifiers
 2011-04-29 14:46:28 -07:00
James Dong
f181e416ee am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge. 
* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
  Add avg bandwidth estimate every 2 seconds - do not merge.
 2011-04-29 14:42:58 -07:00
Scott Main
be2da3c9b6 am c7eb47fa: docs: tweak table headers for config qualifiers 
* commit 'c7eb47fad4fe39bd85c6205e38426c1867b9ed92':
  docs: tweak table headers for config qualifiers
 2011-04-29 14:42:55 -07:00
Scott Main
c7eb47fad4 docs: tweak table headers for config qualifiers 
Change-Id: Idc8d48f1db9b6b87372a49095b034edff9baecfa
 2011-04-29 14:12:24 -07:00
Gilles Debunne
939ccad344 Merge "SuggestionSpans are removed around edited text." 2011-04-29 13:30:03 -07:00
Gilles Debunne
75beb336f4 SuggestionSpans are removed around edited text. 
SuggestionSpans do not make sense anymore when the text they
refer to is modified. Removed these at the lowest possible common
level: In the SpannableStringBuilder that is used to back the Editable.

This way, IME do not have to care about removing these when they change
text. And they cannot forget to so either.

Also fixed a bug in TextView's paste with multi-item paste text (never
exercised, since we have no source for such a thing).

Change-Id: I08ed921f8c04ffb1a00936a3e554a85ee82f103c
 2011-04-29 13:27:37 -07:00
Gloria Wang
f16e1ab0a9 Add DRM errors in the DRM frameworks to MediaErrors also. 
For bug 4350156.

Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
 2011-04-29 11:01:36 -07:00
Robert Greenwalt
7277744e8d am 67c92fbd: am 5f2ff42b: Add data to bugreports. 
* commit '67c92fbdfe52a94804f021c2255132c0f3550875':
  Add data to bugreports.
 2011-04-29 10:26:26 -07:00
Robert Greenwalt
67c92fbdfe am 5f2ff42b: Add data to bugreports. 
* commit '5f2ff42b282e093b61b9e7b07c79a74ea8ce3272':
  Add data to bugreports.
 2011-04-29 10:14:26 -07:00
Gilles Debunne
8e3b17ad13 Merge "TextView uses WordIterator to select words." 2011-04-29 09:51:46 -07:00
Robert Greenwalt
5f2ff42b28 Add data to bugreports. 
Include IPv6 routes and iptables data.

Change-Id: Ie9bca8a935f93933082eef0c45f83a17be76b7ed
 2011-04-29 09:43:49 -07:00
Hung-ying Tyan
71a0dab1ca Merge "Turn on SIP phone support by default." 2011-04-29 00:34:36 -07:00
Conley Owens
54668b8a35 am e1787009: Merge "Added null check on return value for getKeyDispatcherState()" 
* commit 'e17870092941cecf64956819d395ec34111cbe71':
  Added null check on return value for getKeyDispatcherState()
 2011-04-28 23:52:45 -07:00
Conley Owens
f26ec38c34 am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here." 
* commit '501f7bca83ecc2200a590966e461590d9716df7d':
  Eliminating dead logic - bitmap state simply cannot be null here.
 2011-04-28 23:52:41 -07:00
Conley Owens
eef8f14888 am 11d7ec24: Merge "Removing unnecessary computation." 
* commit '11d7ec24a55319b68bcc96443372c263a41b7dc5':
  Removing unnecessary computation.
 2011-04-28 23:52:37 -07:00
Conley Owens
8b22ef66ef am e41d2aed: Merge "Using robust equality check." 
* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
  Using robust equality check.
 2011-04-28 23:52:32 -07:00
Conley Owens
a951701226 am 1e29552b: Merge "We don\'t need these local references." 
* commit '1e29552bd5feeb24952a0486e3263396978212df':
  We don't need these local references.
 2011-04-28 23:52:26 -07:00