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
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 ae5839dcad76625313e6736d69eeaf37af435a3f.
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 Powell
be94c65545
am 13194b16: Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1
...
* commit '13194b16d071ce70453a49e9462cfbeb7460d633':
Fix bug 5534414 - Unselected tab states for Holo
2011-11-08 01:56:42 +00:00
Adam Powell
13194b16d0
Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1
2011-11-07 17:55:17 -08:00
Adam Powell
d1a956b5f9
Fix bug 5534414 - Unselected tab states for Holo
...
Sync unselected action bar tab states with UX. Unselected states no
longer have an underline.
Leave TabWidget tabs alone; they still keep the underline for
unselected tabs.
Change-Id: I379b94aeabb9472f3b6c859507faea57f2f9b0b6
2011-11-07 17:44:22 -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
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
Peter Ng
7de32faea7
am e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1
...
* commit 'e1aacdfe26eabf1ff31a6ddd8590fdea360614db':
Added focused state to quickcontacts shortcut
2011-11-07 22:39:47 +00:00
Peter Ng
e1aacdfe26
Merge "Added focused state to quickcontacts shortcut" into ics-mr1
2011-11-07 14:37:31 -08:00
Jim Miller
fdfc404875
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:26:56 +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
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
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
b5d1d7f3da
am a50c859d: Merge "Color balancing framework assets" into ics-mr1
...
* commit 'a50c859d3f071b9d405bf461e34f11d40f20561e':
Color balancing framework assets
2011-11-07 21:42:31 +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
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
cb99ac697b
am 08be43a6: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '08be43a6d912fe1f34596d5e90df6b497424af02':
Import revised translations. DO NOT MERGE
2011-11-07 20:38:50 +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
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
Jim Miller
d9d09451cc
Fix 5231823: PIN/Password polish on lock screen
...
Fixes these issues:
- add IME button to switch IMEs on password screen on tablet
- centers '0' on PIN screen for phones and tablets
- tablets now use the same ICS background key asset as phones
- make PIN layout consistent between phones and tablet
- center the I-beam when any button is showing in the password entry field
Change-Id: I4da0173f9b2efeab46617c5a41a8132895b63a97
2011-11-04 17:26:26 -07:00