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

63896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
141bdb17dd Fix the action bar menu layout to use the correct divider drawable. 
Change-Id: I9f9fe8318cbad3cfe4e34a37204a6c82a2e9a0c6
 2011-11-08 13:33:58 -08:00
Jake Hamby
fee5f29b22 Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0 2011-11-08 13:22:34 -08:00
Wei Huang
ea50748b54 Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1 2011-11-08 13:16:02 -08:00
Jeff Sharkey
38ddeaa67e Avoid inconsistent state when remove fails. 
Bug: 5433432
Change-Id: Ia388fda006cbda09b5947fc61cec6353f75a3805
 2011-11-08 13:04:22 -08:00
Brian Colonna
04217efb8e Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0 2011-11-08 12:51:36 -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
Dianne Hackborn
665e105f14 Merge "Cleanup remote execution of perf tests." into ics-mr1 2011-11-08 11:52:58 -08:00
Jean-Michel Trivi
4ba27fe702 Bug 5585323 New system permission for media decode 
Add a system permission to enable the use of any installed
media decoder when decoding for playback (as opposed to transcode).

Change-Id: Ifb10a5fa8d5663a78ccbb5fa8266ad6535c234f2
 2011-11-08 11:36:26 -08:00
Daniel Sandler
ce18b91c60 Add day of week. 
Bug: 5581707
Change-Id: Ifa881e6a4a7a54599eb4567c2458d1df27b68a3e
 2011-11-08 14:26:00 -05: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
The Android Open Source Project
6dee1a9d04 Reconcile with ics-mr0-release 
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
 2011-11-08 11:08:20 -08:00
Dianne Hackborn
dd13793a25 Cleanup remote execution of perf tests. 
Change-Id: I0d00537194f3a70969220db16f57bda6f25e454b
 2011-11-08 10:59:28 -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
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
The Android Automerger
b4f88de3c7 merge in ics-mr0-release history after reset to ics-mr0 2011-11-08 06:41:10 -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
Wu-cheng Li
b75783571b Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA. 
ACTION_CAMERA_BUTTON is for camera hardware button. Change the
intent to INTENT_ACTION_STILL_IMAGE_CAMERA.

bug:5572158

Change-Id: I49ffbf50ecd4458065ee1c2d1fdab8d9e696a1a8
 2011-11-08 21:19:34 +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
a06c06b9c0 Fix an issue where we could wait for a non-existing transaction 
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"

Note: the system would recover after a 5 second timeout.

Bug: 5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
 2011-11-07 21:58:03 -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