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

60290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claudia de Veaux
b837c7a948 String edits to bring to standards. 
Bugs: 5165745, 5163232, 5162668, 5162667, 5162328

Change-Id: I6dbe1ea100397e4cfa98997928ff1662728b6e9c
 2011-10-17 13:36:00 -07:00
Robert Ly
56b5dc6ad7 docs: nfc updates 
Change-Id: Iaa782911f14b11bc896ac9ef06db2c43104d1dac
 2011-10-17 13:35:11 -07:00
Wink Saville
e025391bf4 Add DataConnection#isEmergency and use in trySetupData. 
If an emergency is occurring we may not want to allow data calls.

An emergency is defined as in an Emergency call or in the
emergency call back mode. I've added isInEcm and isEmergencyCall
to PhoneBase and CDMAPhone. And in DataConnectionTracker added
isEmergency which is the or of isInEcm, isEmergencyCall.

Also, removed some optimization code in DataConnectionTracker
onSetInternalDataEnabled because mInternalDataEnabled defaults to true
when a DCT is constructed and without this change trySetupData will
not be called leaving ECM if the DCT was just created. Which is what
is currently happening on the ICS lead device.

Also see b/5471660 as there is similar optimizations in
onSetUserDataEnabled and onSetPolicyDataEnabled.


Bug: 5437885
Change-Id: Iba81366300fe46eaa9aa6e457d6659b42d6fe927
 2011-10-17 12:50:32 -07:00
Jamie Gennis
29fe8cb941 am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0 
* commit 'c4de6f81d4533acbfc162d051de480d474b72e76':
  MediaPlayer: properly handle released surfaces
 2011-10-17 12:40:49 -07:00
Jamie Gennis
c4de6f81d4 Merge "MediaPlayer: properly handle released surfaces" into ics-mr0 2011-10-17 12:38:36 -07:00
The Android Open Source Project
9757440700 Reconcile with ics-mr0-release 
Change-Id: Id91d1990671b3bb8778b0bac178a36e63f7c7b8a
 2011-10-17 12:20:06 -07:00
Peter Ng
acbfe5e3ed am 63fae9d5: Merge "Layout changes to recents" into ics-mr0 
* commit '63fae9d56286e7c51261a5a00755466b350efa33':
  Layout changes to recents
 2011-10-17 11:58:54 -07:00
Peter Ng
63fae9d562 Merge "Layout changes to recents" into ics-mr0 2011-10-17 11:57:38 -07:00
Jim Miller
305c78cce6 Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar 
This fixes a bug where the clock wasn't being shown in the statusbar while
the music widget is showing.

Change-Id: Ic1c52c4ab7fa1490fe14ddafaf2c494bcf51866d
 2011-10-17 11:41:44 -07:00
Scott Main
36757f49db am ca3c8a97: Merge "docs: revisions to api overview" into ics-mr0 
* commit 'ca3c8a9703ccde66570f0130bb3a8863dd53e4b6':
  docs: revisions to api overview
 2011-10-17 11:35:54 -07:00
Jamie Gennis
eb587070b9 am 3a735078: Merge "SurfaceTexture: report binder transaction failures" into ics-mr0 
* commit '3a73507801b56da83140fad14a1a3d4eced213d9':
  SurfaceTexture: report binder transaction failures
 2011-10-17 11:35:53 -07:00
Dianne Hackborn
88217fea8a am c047f60d: Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0 
* commit 'c047f60db277252f8921b88c82df1a8812afb169':
  Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes
 2011-10-17 11:32:51 -07:00
Daniel Sandler
6083aea070 am 61e980d6: Merge "Turn off chatty logging." into ics-mr0 
* commit '61e980d6187aa052e92387d7b12b3179a9427db4':
  Turn off chatty logging.
 2011-10-17 11:32:47 -07:00
Chet Haase
5b2dfbde53 am 1aad3b5e: Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0 
* commit '1aad3b5e336a04ed612c091d8002569f959e1722':
  Issue 5432115: Speed up notification scrolling
 2011-10-17 11:32:45 -07:00
Winson Chung
e0773c92e8 am 49a98c8f: Merge "Showing notifications after taking a screenshot (Bug: 5333706)" into ics-mr0 
* commit '49a98c8f64d16eab3f2de48a04ac2a9e986abb76':
  Showing notifications after taking a screenshot (Bug: 5333706)
 2011-10-17 11:32:38 -07:00
Amith Yamasani
06a77ad5ba am 541f6cfb: Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0 
* commit '541f6cfba8d1beb240e841530a761a084e354f64':
  Add alarm volume to the list of volumes in the volume overlay.
 2011-10-17 11:32:33 -07:00
Narayan Kamath
4235d34d49 am 39268ffc: Format default locale the same way as those stored in prefs. 
* commit '39268ffcb74f4c177e5e7427b66480c77743f928':
  Format default locale the same way as those stored in prefs.
 2011-10-17 11:32:25 -07:00
Mathias Agopian
a3dca6fdaa am 840b8a67: Revert "Add a LayerScreenshot" 
* commit '840b8a678537519c27ddf2f818494eaa20a135d4':
  Revert "Add a LayerScreenshot"
 2011-10-17 11:32:19 -07:00
Mathias Agopian
f7ae86f61b am 4fb6416e: Merge "we need to guarantee that h/w comp set() is called when a buffer has been retired" into ics-mr0 
* commit '4fb6416e3a21031a88921a784ae62b13d8a1a39f':
  we need to guarantee that h/w comp set() is called when a buffer has been retired
 2011-10-17 11:32:16 -07:00
Mathias Agopian
1c8a6bf3b2 am fefffc68: Merge "add logging and defensive code when initializing sensors" into ics-mr0 
* commit 'fefffc685ab703b44f6e32b5ec45292b22d370a3':
  add logging and defensive code when initializing sensors
 2011-10-17 11:32:15 -07:00
Dianne Hackborn
4bb7572e76 am bd9d2bcd: Whoops, remove left-over debug output. 
* commit 'bd9d2bcdebfa66a0f71fa67aa256dcae4ccd93da':
  Whoops, remove left-over debug output.
 2011-10-17 11:32:12 -07:00
Dianne Hackborn
36dea89057 am cd8640fc: Merge "Fix issue #5398675: It\'s (too) easy to keep the navigation bar..." into ics-mr0 
* commit 'cd8640fc1a801349e863a7b6270a0702a63c014b':
  Fix issue #5398675: It's (too) easy to keep the navigation bar...
 2011-10-17 11:32:10 -07:00
Jim Miller
eb4173ae29 am 7b5dd873: Fix 5466793: Fix memory leak in system process when face lock is enabled. 
* commit '7b5dd87351ac476dd872c51f9b819d2a3e572382':
  Fix 5466793: Fix memory leak in system process when face lock is enabled.
 2011-10-17 11:32:08 -07:00
Elliott Hughes
f21dd1eabe Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-10-17 11:32:08 -07:00
Jamie Gennis
7f7362c02b Merge changes I4e5ff00c,Id5e3ca1d,I97cbba61 
* changes:
  SurfaceFlinger: Remove display freezing code
  SurfaceFlinger: add some layer update tests
  SurfaceFlinger: make sync transactions explicit
 2011-10-17 11:31:39 -07:00
Dianne Hackborn
c831f6c979 am e6b68036: New aapt feature to do smarter filtering of configurations. 
* commit 'e6b680364dd992907a8d2037685a2e500d188dfb':
  New aapt feature to do smarter filtering of configurations.
 2011-10-17 11:31:35 -07:00
Uriel Rodriguez
af0aec584a am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0 
* commit 'd814d4fa0c76a0384f7e32816e1ca36f237911c6':
  going directly to backup after face unlock fails 15 times
 2011-10-17 11:31:19 -07:00
Scott Main
82ced8250f am f755a2e8: Merge "docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)" into ics-mr0 
* commit 'f755a2e8aabfd6b26df4f3f56f0e9cdfb06cc173':
  docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)
 2011-10-17 11:30:58 -07:00
Bart Sears
b29553e5b0 am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0 
* commit 'b227cce31641c39a1a586739561b4776019945a4':
  Check MediaPlayer state, do not teardown() from UI thread.
 2011-10-17 11:30:52 -07:00
Mathias Agopian
4b1415ebd9 am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0 
* commit '57337eb78e65c160fb9c46a01e04c476d1bfdca1':
  Add a LayerScreenshot
 2011-10-17 11:30:33 -07:00
Scott Main
ca3c8a9703 Merge "docs: revisions to api overview" into ics-mr0 2011-10-17 11:26:59 -07:00
Jamie Gennis
3a73507801 Merge "SurfaceTexture: report binder transaction failures" into ics-mr0 2011-10-17 11:25:46 -07:00
Scott Main
b57769a738 docs: revisions to api overview 
Change-Id: If23f1119290d93494a6bec7021ecdc7e354b0504
 2011-10-17 11:24:40 -07:00
Dianne Hackborn
c047f60db2 Merge "Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes" into ics-mr0 2011-10-17 11:16:57 -07:00
Daniel Sandler
61e980d618 Merge "Turn off chatty logging." into ics-mr0 2011-10-17 10:50:18 -07:00
Chet Haase
1aad3b5e33 Merge "Issue 5432115: Speed up notification scrolling" into ics-mr0 2011-10-17 10:50:16 -07:00
Justin Ho
7f64527d8d Removing Testudo and adding Themos ringtone 
Bug: 5416299

Change-Id: Ic3ab5d6fbfddf82f7a19f1579d96bd59ebf4d8d9
 2011-10-17 10:36:33 -07:00
Dianne Hackborn
71e14da93c Fix issue #5445666: bunch of com.android.server.TextServicesManagerService crashes 
Only unbind once.

Also protection from removing a SpellCheckerBindGroup from mSpellCheckerBindGroups
if it is no longer the current entry there.

Change-Id: Ic585295dfae77eae101a611afbf116bc681290ad
 2011-10-17 10:21:25 -07:00
Winson Chung
49a98c8f64 Merge "Showing notifications after taking a screenshot (Bug: 5333706)" into ics-mr0 2011-10-17 10:20:46 -07:00
Amith Yamasani
541f6cfba8 Merge "Add alarm volume to the list of volumes in the volume overlay." into ics-mr0 2011-10-17 09:42:52 -07:00
Daniel Sandler
7c35174a6f Turn off chatty logging. 
Bug: 5120636 // connection state
Bug: 5125930 // status bar
Change-Id: I5713a4d63df7c51f9e2f53ea21aa66973f74d4c6
 2011-10-17 11:59:04 -04:00
Steve Block
bddddf4729 Merge "Fix use of WebView.loadData() to avoid passing invalid encoding" 2011-10-17 08:58:58 -07:00
Chet Haase
ba1fe8e3cf Issue 5432115: Speed up notification scrolling 
The NotificationPanel was using views that had non-1 alpha
values set on them (permanently). This is costly in the GL
implementation and caused more rendering overhead, and worse
performance, than simple opaque views would.

The fix is to set the text color and ImageView drawable alpha
directly, without setting the View alpha property.

Change-Id: I381e0bd45bf45784b8e364a27a339e6583189a43
 2011-10-17 08:54:53 -07:00
Steve Block
136b1637f8 Fix use of WebView.loadData() to avoid passing invalid encoding 
No change in behavior, as invalid encodings have always been ignored.

Bug: 5125738
Change-Id: I23f21ca65a6b14501c74dc2189a55643f1e33c33
 2011-10-17 15:11:33 +01:00
Justin Ho
37b3239343 am eaf49524: Merge "Moving text cursor to nodpi" into ics-mr0 
* commit 'eaf4952410eb86d6ac8b343af3024250b9550dfd':
  Moving text cursor to nodpi
 2011-10-17 07:07:29 -07:00
Peter Ng
9be02f66a5 am a3ffec23: Update stat_ icons 
* commit 'a3ffec23178922a48aee2ad10239ae79640b5bcd':
  Update stat_ icons
 2011-10-17 07:07:27 -07:00
Jim Miller
817a55b20f am ff74b9c8: Merge "Fix 5458658: Fix memory leak in lock screen" into ics-mr0 
* commit 'ff74b9c88400a14b1faa43c514aac348674ca685':
  Fix 5458658: Fix memory leak in lock screen
 2011-10-17 07:07:18 -07:00
Justin Ho
6aa942a2b3 am ccf29b4c: Merge "Updating numberpicker assets" into ics-mr0 
* commit 'ccf29b4c03422a858a2fcc644e3d2ecbcc555208':
  Updating numberpicker assets
 2011-10-17 07:07:16 -07:00
Justin Ho
494c5e3e51 am a6389a9c: Merge "Updated codelock assets" into ics-mr0 
* commit 'a6389a9c1e1a50fe040961dfead76102b530b149':
  Updated codelock assets
 2011-10-17 07:07:14 -07:00
Justin Ho
3f6a7c275c am af951c17: Merge "Update presence away asset" into ics-mr0 
* commit 'af951c17e75b378a382dc4e7fefa7464f7bdfddb':
  Update presence away asset
 2011-10-17 07:07:11 -07:00