Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,707 Commits 3 Branches 0 Tags
13aeb48dcf050876ede913b3c2f73fc80d48893d
Commit Graph

21181 Commits

Author SHA1 Message Date
Dave Santoro
b7a262cdc1 am b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1 
* commit 'b78ae7524eecbca01a53994d6872202633c8341b':
  Unhide social stream APIs for Contacts.
 2011-11-09 14:37:19 +00:00
Matthew Xie
afb3fa6c96 am 48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
  Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-09 14:37:11 +00:00
Adam Cohen
87ce25a772 am 75b20380: Merge "Making default widget padding public API" into ics-mr1 
* commit '75b2038004f3338c68c9a0e89b29a31e10b237da':
  Making default widget padding public API
 2011-11-09 14:36:57 +00:00
Dave Santoro
b78ae7524e Merge "Unhide social stream APIs for Contacts." into ics-mr1 2011-11-08 14:48:21 -08:00
Mike Lockwood
5e99dbc85c Merge "Add support for disabling wallpaper service" into ics-aah 2011-11-08 14:13:27 -08:00
Matthew Xie
48542eb39e Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-08 12:19:37 -08:00
Matthew Xie
ad2321027e Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp 
Give APP a way to find out if a service is supported by a remote device
bug 5487202

Change-Id: I5a2d050cf24d945e1c9875963c34177ed1ce773a
 2011-11-08 11:58:12 -08:00
Mike Lockwood
6026b825de Merge "AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set." into ics-aah 2011-11-08 11:09:54 -08:00
Adam Cohen
75b2038004 Merge "Making default widget padding public API" into ics-mr1 2011-11-08 10:53:39 -08:00
Robert Greenwalt
a74ebb6d08 am 604019c8: Merge "Fix build." into ics-mr1 
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.
 2011-11-08 18:33:20 +00:00
Robert Greenwalt
604019c8d4 Merge "Fix build." into ics-mr1 2011-11-08 10:31:37 -08:00
Mike Lockwood
a2aa08e20c AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set. 
This allows Music2 and other media apps to control master volume without changing their code

Bug: 5567694

Change-Id: I48b6260b193b22c395be5a31cd1d270b2929a91e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-08 10:31:21 -08:00
Adam Powell
a7d41ece61 am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1 
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
  Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
 2011-11-08 18:28:23 +00:00
Danielle Millett
ad28cd9c93 am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
  Showing a congratulations screen after choosing face unlock backup lock
 2011-11-08 18:28:21 +00:00
Robert Greenwalt
b45a317b56 am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1 
* commit 'ea54b7608584bc0535c9e89417778c3e95b50975':
  Wimax : wimax framework related open source.
 2011-11-08 18:28:16 +00:00
Robert Greenwalt
8588e47358 Fix build. 
Missed a commit that fixed some issues.
bug:5237167

Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
 2011-11-08 10:12:25 -08:00
Adam Powell
8689afbd63 Merge "Fix bug 5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1 2011-11-08 10:06:00 -08:00
Jason Simmons
bfc3e70662 resolved conflicts for merge of 1366c756 to ics-aah 
Change-Id: I9faea6d9604f44b389acb4268941a7e5917ef1a8
 2011-11-08 10:05:56 -08:00
Danielle Millett
b9b0825737 Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 2011-11-08 10:03:24 -08:00
Robert Greenwalt
ea54b76085 Merge "Wimax : wimax framework related open source." into ics-mr1 2011-11-08 10:01:07 -08:00
John Reck
d57859c13e am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1 
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
  Remove unnecessary memory allocations
 2011-11-08 17:58:43 +00:00
Adam Powell
42b7e99b11 Fix bug 5544103 - Spinner text doesn't look dimmed when disabled 
Pre-Holo spinners had a far more "buttony" look that expressed the
disabled state clearly, but Holo spinners are more subtle. As a result
we want to mark the contained view representing the current item as
disabled when the spinner itself is disabled.

Express this as a private framework style attribute that cannot be
changed at runtime.

Change-Id: Icff2ef2b8a3b1a96cbf00e4c75eda41a4dada7b3
 2011-11-08 09:49:21 -08:00
Tom Taylor
1366c756d2 Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 2011-11-08 09:00:22 -08:00
John Reck
99015a2464 Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Ed Heyl
0711e78483 am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
* commit '9d6a51623fdabbe993d7b8848794607394ef7cc2':
  Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
 2011-11-08 14:02:58 +00:00
Ed Heyl
9d6a51623f Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
This reverts commit ae5839dcad.
 2011-11-08 05:58:37 -08:00
Narayan Kamath
30f0c71ebd am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1 
* commit '98f5500c71754dad428e00d569007e0b98dc8aee':
  Fix a bug in the network TTS api.
 2011-11-08 10:11:27 +00:00
Narayan Kamath
98f5500c71 Merge "Fix a bug in the network TTS api." into ics-mr1 2011-11-08 02:09:18 -08:00
Gilles Debunne
58421a5e35 am 39896f52: Merge "No more context menu in TextView" into ics-mr1 
* commit '39896f52a84947ffc2062a2584033ff749d90534':
  No more context menu in TextView
 2011-11-08 08:49:38 +00:00
Gilles Debunne
39896f52a8 Merge "No more context menu in TextView" into ics-mr1 2011-11-08 00:48:27 -08:00
Matthew Xie
1d02f34650 am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 
* commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
  Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
 2011-11-08 06:43:48 +00:00
Matthew Xie
67f1ceb616 Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-07 22:42:00 -08:00
Adam Cohen
4c96a59b43 Making default widget padding public API 
Change-Id: Ibf4f5dc1a36d84be1acc3ccdc4330276f82aa303
 2011-11-07 17:59:23 -08:00
John Reck
aefc28a1b6 Remove unnecessary memory allocations 
Bug: 5581637
 Also delete some dead, unused code

Change-Id: If6efd11f5032141dadbfcd0b3215e89b464e5f35
 2011-11-07 17:42:06 -08:00
Dave Santoro
003924c37a Unhide social stream APIs for Contacts. 
Bug 5569021

Change-Id: Iba6ad0fb8d1bd4eafd9fbb42c28a332679ade11c
 2011-11-07 17:06:54 -08:00
John Reck
d471e09774 am 669e1f80: Merge "Remove nativeRecordButtons" into ics-mr1 
* commit '669e1f80a718dc2a4d259970b4e85b3c66e8ebc1':
  Remove nativeRecordButtons
 2011-11-07 23:21:56 +00:00
John Reck
669e1f80a7 Merge "Remove nativeRecordButtons" into ics-mr1 2011-11-07 15:20:38 -08:00
Adam Powell
3bda1dc4f2 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 22:58:51 +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
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
John Reck
99f7b7b7b2 Remove nativeRecordButtons 
Bug: 5572238
 Bug: 5558699

Change-Id: I8e275849f4f04c094a93528dd1fb59683d30e9cc
 2011-11-07 14:00:05 -08: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
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
Amith Yamasani
93004b10b7 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 18:59:04 +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
Narayan Kamath
6c07a20285 Fix a bug in the network TTS api. 
bug:5284966
Change-Id: I460bd12c27671ed42681fd4ccad567c08cb8f70f
 2011-11-07 16:19:02 +00:00
Robert Greenwalt
796ef0d0e1 am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 
* commit 'fd900f05fb67046b97701f20626f7fd408fd8990':
  Start using IP tool for advanced routing.
 2011-11-04 22:57:48 +00:00
Robert Greenwalt
fd900f05fb am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
  Start using IP tool for advanced routing.
 2011-11-04 22:55:30 +00:00
Robert Greenwalt
348297abc0 Merge "Start using IP tool for advanced routing." into ics-mr0 2011-11-04 15:53:37 -07:00