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

66392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alon Albert
39d4fb6c37 am 815af1ff: Merge "Throw NPE if s is null" 
* commit '815af1ff595a6c028f28c16139a9e64ad98507a3':
  Throw NPE if s is null
 2012-01-26 17:07:46 -08:00
Alon Albert
815af1ff59 Merge "Throw NPE if s is null" 2012-01-26 17:05:58 -08:00
Glenn Kasten
0f0fbd9441 Use audio_source_t consistently 
Was a mix of audio_source_t, uint8_t, and int.

Related fixes:
 - fix comments in MediaRecorder.java
 - AudioPolicyService server side was not checking source parameter at
   all, so if the client wrapper was bypassed, invalid values could be
   passed into audio HAL
 - JNI android_media_AudioRecord_setup was checking source for positive
   values, but not negative values. This test is redundant, since already
   checked at Java and now checked by AudioPolicyService also, but might
   as well make it correct.

Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
 2012-01-26 16:50:19 -08:00
Roman Nurik
5525a43a9c am 639b25ea: Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 
* commit '639b25ea289481da6cfd4229649b51ffc6ce3406':
  docs: add NOTICE to action bar icon pack and sprinkle download links
 2012-01-26 16:35:06 -08:00
Roman Nurik
639b25ea28 Merge "docs: add NOTICE to action bar icon pack and sprinkle download links" into ics-mr1 2012-01-26 16:32:56 -08:00
Alex Sakhartchouk
6c963379cd Merge "Material name cleanup. Minor refactoring." into graphics-dev 2012-01-26 16:31:11 -08:00
Alex Sakhartchouk
a18d676ede Material name cleanup. Minor refactoring. 
Change-Id: I2e0cba9267c61729eefe8bf0d3c29bf0892ba940
 2012-01-26 16:29:52 -08:00
Andreas Huber
e56f265190 am 4bc8bfaf: Merge "The software AAC encoder is now an OMX component." 
* commit '4bc8bfaf11839b12d88fcb40e57a1eea456aef7c':
  The software AAC encoder is now an OMX component.
 2012-01-26 16:02:40 -08:00
Andreas Huber
4bc8bfaf11 Merge "The software AAC encoder is now an OMX component." 2012-01-26 16:00:38 -08:00
Glenn Kasten
5b0135e41b AudioStreamIn and AudioStreamOut 
These are immutable, so make the fields const.
getOutput() and getInput() methods are now const.

Change-Id: I128246ebd56ea50b3e542be43f2aa1bcb55f1373
 2012-01-26 15:58:07 -08:00
Roman Nurik
bb9bffb6b9 docs: add NOTICE to action bar icon pack and sprinkle download links 
Change-Id: I1437ce64908c28621e86fff54767ddbd2b1fcb3a
 2012-01-26 15:57:34 -08:00
Chet Haase
94369f4107 am 23fb7dc7: Merge "Fix old issue with compatibility-scaled apps and Animations" 
* commit '23fb7dc7c74ac16273cb22313080eaa9de915225':
  Fix old issue with compatibility-scaled apps and Animations
 2012-01-26 15:55:11 -08:00
Alex Sakhartchouk
5a69cdc4bf Merge "Separating scenegraph from the app that uses it." into graphics-dev 2012-01-26 15:54:52 -08:00
Chet Haase
23fb7dc7c7 Merge "Fix old issue with compatibility-scaled apps and Animations" 2012-01-26 15:53:03 -08:00
Alex Sakhartchouk
d4cb9c587c Separating scenegraph from the app that uses it. 
Change-Id: I326d3e9804ae2433e8963105442c4a0b8f8f9a6f
 2012-01-26 15:51:19 -08:00
Daniel Sandler
2b138fac53 am bbbf6b9c: am 70828a1d: am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 
* commit 'bbbf6b9c49301460a34e749d476c10834a609cf5':
  Suppress mobile-out-of-service label if wifi connected.
 2012-01-26 15:49:40 -08:00
Daniel Sandler
bbbf6b9c49 am 70828a1d: am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 
* commit '70828a1d40c9bf0e5066166216013093298de034':
  Suppress mobile-out-of-service label if wifi connected.
 2012-01-26 15:47:06 -08:00
Andreas Huber
afe02df45e The software AAC encoder is now an OMX component. 
Yay.

Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
 2012-01-26 15:45:38 -08:00
Roman Nurik
9d9c718925 am 00b3ceb4: Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 
* commit '00b3ceb48b5e23daa8101db6080bee46d6518f43':
  docs: Update designing-navigation training class to link to Android Design
 2012-01-26 15:35:46 -08:00
Roman Nurik
00b3ceb48b Merge "docs: Update designing-navigation training class to link to Android Design" into ics-mr1 2012-01-26 15:33:57 -08:00
Geremy Condra
547eb97ea3 am 838a0e0e: Merge "Removed intent logging from SearchDialog.java" 
* commit '838a0e0ed8aadfea635954e365ec9232abfacd71':
  Removed intent logging from SearchDialog.java
 2012-01-26 15:08:34 -08:00
Geremy Condra
838a0e0ed8 Merge "Removed intent logging from SearchDialog.java" 2012-01-26 15:06:18 -08:00
Glenn Kasten
0ae4d97689 Declare methods in binder opcode order 
This makes it easier to compare interface and implementation.

Change-Id: Ie060e43dec348902abcf40f5a610cec639d6d0d3
 2012-01-26 14:34:30 -08:00
Jim Miller
a7da296654 am fb9e3643: Merge "Fix 5620754: don\'t show pattern unlock after SIM unlock if not enabled." 
* commit 'fb9e364380f91295490d1acbfc9a571cb6a4384b':
  Fix 5620754: don't show pattern unlock after SIM unlock if not enabled.
 2012-01-26 14:34:08 -08:00
Jim Miller
fb9e364380 Merge "Fix 5620754: don't show pattern unlock after SIM unlock if not enabled." 2012-01-26 14:30:49 -08:00
Eric Fischer
2e3127f624 am b14ecd26: Merge "Import translations. DO NOT MERGE" 
* commit 'b14ecd2684d5b2c1f284b669d2ffa9c19bfee7b4':
  Import translations. DO NOT MERGE
 2012-01-26 14:28:25 -08:00
Eric Fischer
b14ecd2684 Merge "Import translations. DO NOT MERGE" 2012-01-26 14:26:10 -08:00
Alon Albert
11afa8a466 Throw NPE if s is null 
Bug: 5926510
Change-Id: I3d0a38d31695a8b103b3d153d90d83474f56990e
 2012-01-26 14:25:19 -08:00
Glenn Kasten
789fef1f83 Use enum mixer_state consistently 
Change-Id: I5b71ed20f939dfc4b98143334b7aa064d282f584
 2012-01-26 14:23:47 -08:00
Eric Fischer
3b5e2c3bde Import translations. DO NOT MERGE 
Change-Id: I9ecc6b7fd129f9b430d96e4d65c656a2b71bd0af
 2012-01-26 14:21:26 -08:00
Nick Pelly
1f5badc1cb Add NdefMessage.getByteLength(), and more minor fixes: 
Remove NdefMessage from dispatch(). It's already in the Tag.
/*package*/ cleanup
Fix sitemap after removal of NFCDemo

Change-Id: Ie1f6d9ea98144aa97f56bb709a33f5d0ef916e8b
 2012-01-26 14:21:19 -08:00
Glenn Kasten
452d6d6efe Use enum effect_state consistently 
Also fix indentation

Change-Id: I393ef9e37ffceed5ad4a78df439726ae1fe139df
 2012-01-26 14:20:34 -08:00
Glenn Kasten
563562032d Use enum track_state consistently 
Change-Id: Ie5ebb7befa092e1de1e4df9c6e2d51e6bcfd176a
 2012-01-26 14:13:43 -08:00
Gilles Debunne
9dab1221e6 am e93c5171: Merge "Modified algorithm to remove duplicated suggestions" 
* commit 'e93c51713c440d572913292926c6e606edd6c64d':
  Modified algorithm to remove duplicated suggestions
 2012-01-26 14:11:15 -08:00
Gilles Debunne
b325ef82eb am 89429a42: Merge "Remove @deprecate in View\'s fadingEdge" 
* commit '89429a42116ad26df6add801aba66e6e454a10dd':
  Remove @deprecate in View's fadingEdge
 2012-01-26 14:11:12 -08:00
Gilles Debunne
e93c51713c Merge "Modified algorithm to remove duplicated suggestions" 2012-01-26 14:09:20 -08:00
Gilles Debunne
89429a4211 Merge "Remove @deprecate in View's fadingEdge" 2012-01-26 14:09:00 -08:00
Stephen Hines
6bd4c7ad4f am caaac348: Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 
* commit 'caaac348ed163f59cf1b8185bb14137050c18e7e':
  Fix bugs with unsigned rsAtomicCas/Max/Min.
 2012-01-26 13:58:14 -08:00
Stephen Hines
caaac348ed Merge "Fix bugs with unsigned rsAtomicCas/Max/Min." 2012-01-26 13:55:57 -08:00
Gilles Debunne
259c109046 Remove @deprecate in View's fadingEdge 
The comment of this field is also aggregated in the android.R.styleable#View
description. As a result, the @deprecated in the comment of this field also
applies to android.R.styleable#View which incorrectly appears deprecated.

This fixes the problem, although fadingEdge will no longer be marked as
deprecated in IDEs. I believe it is less important that to make View
deprecated.

Change-Id: I96d8e868001c4c853eb1536f8401275b9b1e689b
 2012-01-26 13:46:25 -08:00
Roman Nurik
3ba792c7f4 docs: Update designing-navigation training class to link to Android Design 
Change-Id: I1cdda032f31798f9a32b7bec583dcfaa6eafb8c2
 2012-01-26 13:12:22 -08:00
Daniel Sandler
70828a1d40 am 5b08738a: Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 
* commit '5b08738a62ece5bf0ca5d22a6f062e2fb67af272':
  Suppress mobile-out-of-service label if wifi connected.
 2012-01-26 13:04:17 -08:00
Daniel Sandler
5b08738a62 Merge "Suppress mobile-out-of-service label if wifi connected." into ics-mr1 2012-01-26 13:02:32 -08:00
Chet Haase
53f2d55740 Fix old issue with compatibility-scaled apps and Animations 
Previously, we'd pass in a scale factor (based on whether the app was
being scaled by the compatibility mode) to Animation.getTransformation().
This scales the pivot point of the animation based on thes cale factor.
However, the pivot points were already using information that took the
compatibility mode scale into account. For example, using ABSOLUTE and basing
pixel values on the width/height of the view would give you values relative to the
width/height of the view (pre-scaled). Using RELATIVE_TO_* would use percentages
for the pivot point, again taking the scaling of the view into account. So scaling
the pivot point added in another scale on top of that already being applied.

The net effect was to scale the pivot point in cases where it should not be scale.
For example, setting a pivot point to half-way (.5 and RELATVE_TO_SELF) would
end up with an animation that would pivot around the bottom/right of the view.

The fix is to simply remove the scale factor being passed in; we've already accounted
for it in the pivot point, so we shouldn't concatenate it into the transform
calculated by the animation.

Change-Id: I9daa7581b1b9d0dfb10515e96947160c28c5130e
 2012-01-26 12:44:46 -08:00
Daniel Sandler
62a1eb8972 Suppress mobile-out-of-service label if wifi connected. 
Carrier name is shown if
 - in service and connected to mobile data
 - in service and connected to wifi

Carrier name is blanked if out of service and connected to
wifi.

"No internet connection" is shown if out of service without
any other route.

Bug: 5903914
Change-Id: I59d4d0c90e4153d73c38f7f0e150becf7e021a5b
 2012-01-26 15:35:03 -05:00
Scott Main
26257b11da am 7e4ef617: am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP 
* commit '7e4ef61732d7de33e34f5935cfad51049f65116a':
  docs: add action bar icons ZIP
 2012-01-26 11:50:13 -08:00
Scott Main
7e4ef61732 am 2de74f5f: am 6c055bbd: docs: add action bar icons ZIP 
* commit '2de74f5fa9acc5fae5fc09aad861c13f7162d5cb':
  docs: add action bar icons ZIP
 2012-01-26 11:47:35 -08:00
Scott Main
2de74f5fa9 am 6c055bbd: docs: add action bar icons ZIP 
* commit '6c055bbdf475e6cd324912326c802244b9a76c3b':
  docs: add action bar icons ZIP
 2012-01-26 11:44:58 -08:00
Scott Main
6c055bbdf4 docs: add action bar icons ZIP 
Change-Id: Id38d82655d6bcc468890a4db93a19ac4e385db13
 2012-01-26 11:35:20 -08:00
Ben Cheng
190ca4954e am f429ff70: Merge "Preserve NEON callee-save registers d8-d15." 
* commit 'f429ff70776c7cf68a6f726afdf984dbbf9e6901':
  Preserve NEON callee-save registers d8-d15.
 2012-01-26 11:19:16 -08:00