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

63665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andreas Huber
d6739fccfc am 26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1 
* commit '26f70db99f483be36caa7a4c84fec5de50bec034':
  Remove surface legacy APIs and code.
 2011-11-08 17:58:45 +00: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
Eric Laurent
281fd7a1c5 resolved conflicts for merge of f3a892ab to ics-aah 
Change-Id: Id9c0ef089d4ed71dbf69c5969b36f9ac44a25ad3
 2011-11-08 09:52:15 -08: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
Andreas Huber
26f70db99f Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
John Reck
99015a2464 Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Eric Laurent
f3a892ab93 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 2011-11-08 08:32:57 -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
Chih-Chung Chang
e271031f5b am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." into ics-mr1 
* commit '713c9a331e226c970af57c59ff17be29b73025c1':
  Fix 5509346: Resize the thumbnails if it's too large.
 2011-11-08 07:02:13 +00:00
Chih-Chung Chang
713c9a331e Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1 2011-11-07 22:59:55 -08:00
James Dong
44e4983db4 am ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 
* commit 'ee7ebb3257d9337627b175835dc3d08f9b8ab339':
  Fix a hang issue where the first frame can be dropped for timelapse video recording.
 2011-11-08 06:58:11 +00:00
James Dong
ee7ebb3257 Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 2011-11-07 22:57:02 -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
Mathias Agopian
160b07cf0a am 7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 
* commit '7f1c94e198e051bf481fd2d286c7b33d00664f9d':
  Fix rotation displays frame N-1 briefly while rotating
 2011-11-08 05:35:37 +00:00
Mathias Agopian
7f1c94e198 Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 2011-11-07 21:33:53 -08:00
Daniel Sandler
af8a750f82 am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 
* commit 'c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
  Fix scaling on notification panel wifi/battery icons.
 2011-11-08 03:48:55 +00:00
Daniel Sandler
c06669a303 Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 2011-11-07 19:47:51 -08:00
Dianne Hackborn
1fcccbabed am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 
* commit '84b02130a9b3327343425cd4edfc1b85f1e9b23d':
  Update perf tests to always run each test in a fresh process.
 2011-11-08 02:49:25 +00:00
Dianne Hackborn
84b02130a9 Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 2011-11-07 18:46:54 -08:00
Joe Onorato
8a9e425c32 Merge "Support putting Flattenables in Lists." into ics-aah 2011-11-07 18:13:30 -08:00
Joe Onorato
44c620da02 Support putting Flattenables in Lists. 
Change-Id: I683ec1823286d7f2ac03683a1cdad6413d2445b1
 2011-11-07 18:12:22 -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 Wang
a814a4c971 am 2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1 
* commit '2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09':
  Remain in call audio mode while phone is offhook.
 2011-11-08 00:47:49 +00:00
John Wang
2f99bb5e4f Merge "Remain in call audio mode while phone is offhook." into ics-mr1 2011-11-07 16:46:11 -08:00
John Wang
f885e87884 Remain in call audio mode while phone is offhook. 
While offhook, even the call is on hold, setAudioMode() remains in
MODE_IN_CALL (or MODE_IN_COMMUNICATION for SIP) rather than
switching back to NORMAL.

bug:5546901
Change-Id: I0189dc010d1109895cc38e17b1b80418445d514a
 2011-11-07 15:45:18 -08:00
Robert Greenwalt
e8df648807 am 2d9ccdb4: am b445362b: Make upstream tether list threadsafe 
* commit '2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
  Make upstream tether list threadsafe
 2011-11-07 23:38:39 +00:00
Robert Greenwalt
2d9ccdb4ab am b445362b: Make upstream tether list threadsafe 
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
  Make upstream tether list threadsafe
 2011-11-07 23:36:28 +00: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