61600 Commits

Author SHA1 Message Date
Adam Powell
b92a77b562 am b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
* commit 'b1dbf8e605c29ac00dde187579bd8ff8f18d7ba3':
  Change the "start deferred" fragment API to "user visible hint"
2011-11-07 23:01:48 +00:00
Adam Powell
b1dbf8e605 Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1 2011-11-07 14:56:36 -08:00
tk.mun
148c7d0de7 Wimax : wimax framework related open source.
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx

Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5237167
2011-11-07 14:47:40 -08:00
Dianne Hackborn
6b57b7e4d5 Update perf tests to always run each test in a fresh process.
Also some new classes to preload.

Change-Id: Ia2b5f856eaee533b9603b533ebaf8cb55e2ac193
2011-11-07 14:45:49 -08:00
Robert Greenwalt
b445362bd6 Make upstream tether list threadsafe
Outsiders asking for this list may cause the list to change on another thread.
Fixing general synchronization issues.

bug:5531630
Change-Id: I7a3ee0bba3db40f45bcb0159491942fa4cf38c37
2011-11-07 14:44:48 -08:00
Peter Ng
a20972ae45 am e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1
* commit 'e1aacdfe26eabf1ff31a6ddd8590fdea360614db':
  Added focused state to quickcontacts shortcut
2011-11-07 22:41:13 +00:00
Peter Ng
e1aacdfe26 Merge "Added focused state to quickcontacts shortcut" into ics-mr1 2011-11-07 14:37:31 -08:00
Justin Ho
3fab14c29e Merge "Merge: Correctly updating Roboto HHEA table to master Bug: 5516773" 2011-11-07 14:33:35 -08:00
Jim Miller
aa87fd03ff am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1
* commit '4d8ecc65c5a747f350492b21397d7466ff628900':
  Fix 5231823: PIN/Password polish on lock screen
2011-11-07 22:29:08 +00:00
Jim Miller
4d8ecc65c5 Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1 2011-11-07 14:24:43 -08:00
Tom Taylor
03da2f00aa Add new secure setting for controlling Messaging notifications
Bug 5552615
We're adding a new intent to allow 3rd party apps to disable
the Messaging app's notification. We want any app to be able to query
the setting of whether sms notifications are on or off, but only allow
system apps, particularly the Messaging app, to change that setting.
Other apps can change the setting by firing off an intent which brings
up a dialog activity in the Messaging app that'll let them turn off
Messaging notifications.

Change-Id: I4d2721191b86010efb383a24c28d911496440657
2011-11-07 14:16:44 -08:00
Daniel Sandler
989b9f2100 Fix scaling on notification panel wifi/battery icons.
Still needs a redesign.

Bug: 5544770
Change-Id: I27f6ea9f788110d7027b3ea788ca98216fa4fe28
2011-11-07 17:09:57 -05:00
Jeff Brown
8eaefb3673 am 5c7d5a4a: Merge "Fix possible leak in Parcel::writeDupFileDescriptor."
* commit '5c7d5a4a35766206b25d9a3152a39e05d2548c63':
  Fix possible leak in Parcel::writeDupFileDescriptor.
2011-11-07 22:07:40 +00:00
Jeff Brown
5c7d5a4a35 Merge "Fix possible leak in Parcel::writeDupFileDescriptor." 2011-11-07 14:05:22 -08:00
John Reck
99f7b7b7b2 Remove nativeRecordButtons
Bug: 5572238
 Bug: 5558699

Change-Id: I8e275849f4f04c094a93528dd1fb59683d30e9cc
2011-11-07 14:00:05 -08:00
Peter Ng
d52ec9f3c2 Added focused state to quickcontacts shortcut
Bug: 5566627
Change-Id: I559660d71fa571d9201f99dbf76befa8b3276d9e
2011-11-07 13:55:29 -08:00
Peter Ng
6cc18bbde2 am 6918bca7: am a50c859d: Merge "Color balancing framework assets" into ics-mr1
* commit '6918bca7f8db32435bb8a14ba6eaa198c8a4190b':
  Color balancing framework assets
2011-11-07 21:47:19 +00:00
Adam Powell
78fed9b78f Change the "start deferred" fragment API to "user visible hint"
Allow a fragment to set a hint of whether or not it is currently user
visible. This will be used implicitly to defer the start of fragments
that are not user visible until the loaders for visible fragments have
run. This hint defaults to true.

Change-Id: Id1349d319886a277ef07301f64f7b9e12c8729bf
2011-11-07 13:47:13 -08:00
Peter Ng
6918bca7f8 am a50c859d: Merge "Color balancing framework assets" into ics-mr1
* commit 'a50c859d3f071b9d405bf461e34f11d40f20561e':
  Color balancing framework assets
2011-11-07 21:44:33 +00:00
Peter Ng
a50c859d3f Merge "Color balancing framework assets" into ics-mr1 2011-11-07 13:40:45 -08:00
Peter Ng
4f4882ad12 Color balancing framework assets
-btns are more opaque
-toggle buttons are now blue
-spinners have better antialiasing
-quick contacts have a thicker divider
-switches are flipped

Bug:5560030
Change-Id: I28f64aa2be6c7f0d8c82e9b7c318aaf2bfd98ea7
2011-11-07 13:16:36 -08:00
Justin Ho
1cd8ca39d9 Merge: Correctly updating Roboto HHEA table to master
Bug: 5516773

The last change regressed a few glyphs since the wrong file was checked in

Change-Id: Id1cceef5ddf6aa7215a86159b66006dca675ce44
2011-11-07 13:13:46 -08:00
Eric Fischer
6e88b446b7 am d3ba4ce1: am 08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'd3ba4ce1c95cfb49497794935b0942ac673e5bbe':
  Import revised translations.  DO NOT MERGE
2011-11-07 20:43:09 +00:00
Danielle Millett
044a0a7644 Showing a congratulations screen after choosing face unlock backup lock
Once a backup lock has been chosen, it sends an intent to show a
congratulations screen.  The moveTempGallery function has been moved
inside this new activity so it is no longer needed in LockPatternUtils.

Change-Id: I66868e6e3391b8b740f618fe633047ce388f55ca
2011-11-07 15:42:12 -05:00
Eric Fischer
d3ba4ce1c9 am 08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
  Import revised translations.  DO NOT MERGE
2011-11-07 20:41:00 +00:00
Eric Fischer
08be43a6d9 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:36:02 -08:00
Eric Fischer
2f6172e35a Import revised translations. DO NOT MERGE
Change-Id: Ib095d85d01ffce5201d1e91d7c90c516f8c4c89c
2011-11-07 12:34:57 -08:00
Jeff Brown
df4ee721cb Fix possible leak in Parcel::writeDupFileDescriptor.
Also, check the result of dup() just in case we got EMFILE
or something.

Change-Id: I18e627bd84f4c7941813fe1c2bad2cdd9e5afa83
2011-11-07 12:22:39 -08:00
Andreas Huber
43b28298a6 Use binary search to discover closest sync sample index, replace
assertions with runtime errors in case the file's table of sync sample
indices is not sorted properly.

Change-Id: Ie4446a44e613a8d329ac680c37361d4407d22520
related-to-bug: 5549855
2011-11-07 11:38:14 -08:00
Amith Yamasani
a49950d552 am ff92dd69: am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
* commit 'ff92dd69af5d95c00ef6ce9285c97d3e937cd704':
  Don't show the submit button when it isn't enabled.
2011-11-07 19:04:52 +00:00
Amith Yamasani
ff92dd69af am 7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
* commit '7919bfb12365b3f84e232235c35df957039995b7':
  Don't show the submit button when it isn't enabled.
2011-11-07 19:01:22 +00:00
Amith Yamasani
7919bfb123 Merge "Don't show the submit button when it isn't enabled." into ics-mr1 2011-11-07 10:57:17 -08:00
Winson Chung
b418038bef am 48dd3880: am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
* commit '48dd3880453d266405b8f0127551fc229726f7e6':
  Fixing screenshot border asset.
2011-11-07 18:26:55 +00:00
Winson Chung
48dd388045 am 19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
* commit '19c86cacb2f0ba04cc93084ba474662afb17d88f':
  Fixing screenshot border asset.
2011-11-07 18:24:01 +00:00
Winson Chung
19c86cacb2 Merge "Fixing screenshot border asset." into ics-mr1 2011-11-07 10:20:37 -08:00
Daniel Sandler
8073bb7803 am 4f631bbf: am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
* commit '4f631bbf97fd02c9b33e5678149627ba2c9f1912':
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 18:17:27 +00:00
Daniel Sandler
4f631bbf97 am 010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
* commit '010bb273a58444f907bb82f62f8d7274f9637b49':
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 18:15:30 +00:00
Daniel Sandler
010bb273a5 Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 10:11:52 -08:00
Alex Sakhartchouk
a489e630ed am 9829ccec: Merge "Properly passing an unused variable through."
* commit '9829cceca11a0fc92ab1318ce32b4d4dae8d347d':
  Properly passing an unused variable through.
2011-11-07 17:55:47 +00:00
Alex Sakhartchouk
9829cceca1 Merge "Properly passing an unused variable through." 2011-11-07 09:53:28 -08:00
The Android Open Source Project
7ee889560b am 01b35d7b: Reconcile with ics-mr1-release
* commit '01b35d7b1c70e23b89fe642577ef2e2446bde12a': (61 commits)
  Update fix to restore view and text wrap scales.
  Bug 5535639 - Monkeys mad at FragmentManager
  Fix recents button on large devices (5490265)
  am f2894659: Fix bug 5449931 - Wrong theme for icon menus
  Force a WebView pictureset reset on screen rotation.
  Fix lockscreen Bug: 5391404
  Re-adding missing lockscreen drawable
  Revert "Transfer large bitmaps using ashmem. Bug: 5224703"
  Maybe fix issue #5340190: java.lang.RuntimeException: Unable to start...
  Revert "Fix bug #5332081 TextLayoutCache needs to be able to have more cache hits"
  Fix issue #5328235: Wrong values for smallestScreenWidthDp
  Fix NPE.
  Fix disappearing BACK button.
  b/5316640 fix bundle add
  Make sure the finalizer destroy runs on the UI thread
  Revert "Make the SyncManager timeout syncs if it takes too long to bind to them."
  Show roaming icon in status bar.
  Make the SyncManager have wakelocks per account, not per account type, otherwise the parallel sync behavior of gmail can cause the first account to finish to release the wakelock that is used for the other account, which will result in the device going to sleep before the sync is complete.
  Fix notification disappearance animations.
  Bug 5270905 fix MediaPlayer with IStreamSource
  ...
2011-11-07 16:34:40 +00:00
The Android Open Source Project
01b35d7b1c Reconcile with ics-mr1-release
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
2011-11-07 08:30:54 -08:00
The Android Open Source Project
74262659de am 8258c52b: am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '8258c52b828062e3385338dcd74f5b2620660dab':
  Fix a leak in Parcel::writeBlob.
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-07 16:30:24 +00:00
The Android Open Source Project
8258c52b82 am 064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '064975c27cbca412e682fa152ce00af14027ab4f':
  Fix a leak in Parcel::writeBlob.
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
2011-11-07 16:28:26 +00:00
The Android Open Source Project
064975c27c Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
2011-11-07 08:22:56 -08:00
Narayan Kamath
6c07a20285 Fix a bug in the network TTS api.
bug:5284966
Change-Id: I460bd12c27671ed42681fd4ccad567c08cb8f70f
2011-11-07 16:19:02 +00:00
Dianne Hackborn
bac809f4cd am 973f8f20: am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '973f8f20c480453d0fbad1795225d1e34aafd739':
  Print out memory info when we get into a low memory situation.
2011-11-07 15:54:02 +00:00
Mathias Agopian
9a35dd658a am 9e079d8f: am 3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
* commit '9e079d8fa0b3d82ed28bfc875fd9b70b590ea86f':
  workaround to set the WM refresh rate to 48 Hz for tuna devices only
2011-11-07 15:54:00 +00:00
Jeff Brown
6aa805ab1b am bd79a9c9: am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.
* commit 'bd79a9c9f39482b3a9560d03cb045ec4e3b87486':
  Fix a leak in Parcel::writeBlob.
2011-11-07 15:53:58 +00:00
Dianne Hackborn
973f8f20c4 am 6581043a: am 7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
  Print out memory info when we get into a low memory situation.
2011-11-07 15:51:38 +00:00