55425 Commits

Author SHA1 Message Date
Robert Ly
6e7c7a2a68 cherrypick from hc-mr2 Change-Id: I06f5abf8bb956e96963d47f3fa41bfe1ea8d1c7b
Change-Id: I37fb07126676737d16294e64ac974c0da39a3b05
2011-07-26 14:10:04 -07:00
Jason Sams
83f463f6f8 Merge "Cleanup sample code." 2011-07-26 14:09:22 -07:00
Robert Ly
85eedb7b14 cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4
Change-Id: I19ed647790ed4781762f09897ec76a4348059fb2
2011-07-26 14:09:08 -07:00
Robert Ly
c80b7ad6e0 cherrypick from hc-mr2 Change-Id: Iea8df8fda144d4c66d407927d260263c9982df51
Change-Id: I1b027de2c5e5cf370f19d7b64807135b1d0413da
2011-07-26 14:08:05 -07:00
Jason Sams
684b23513c Unhide new RS apis.
Change-Id: I83505156bd8a0ffabf0da3aef937693eaee9d9cd
2011-07-26 14:07:19 -07:00
Mike Lockwood
9837734b64 GlobalScreenshot: Set image file size in media database when taking screenshots
Otherwise the value would be left at zero since we are inserting
the database record before writing the file

Bug: 5064246

Change-Id: I54be6ff14a7f170994aaf586aaddb06c5b746e89
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-26 16:58:14 -04:00
Flavio Lerda
dce4a78e2b Merge "Add IS_READ field to CallLog and VoicemailContract." 2011-07-26 13:31:49 -07:00
Robert Greenwalt
41394a3610 Merge "Use dns proxy a bit." into honeycomb-LTE 2011-07-26 13:21:09 -07:00
Eric Fischer
821e7a65fa Merge "Import revised translations." 2011-07-26 13:12:58 -07:00
Amith Yamasani
f28d187574 Make sure that suggestions are queried on focus or tapping.
Bug: 3110831
Change-Id: Ic74a7eac1c5aa7d07c8a2e3f1ad19e026c990153
2011-07-26 12:21:03 -07:00
Flavio Lerda
31b594e129 Add IS_READ field to CallLog and VoicemailContract.
We had initially decided to merge the NEW field (from the call log) and
IS_READ field (from the voicemail contract) into the single NEW field
already present in the call log.

However, it turned out that the meaning of the two fields is slightly
different: NEW means the items has just been inserted (and the user is
not aware of it) while IS_READ represents whether the user has read this
specific message (or heard, in case of voicemails).

This change makes the IS_READ field public, as well as deletes the NEW
field from the voicemail contract, since it is no longer needed there.
The NEW field in the voicemail contract (in fact the entire voicemail
contract) has never been released (this feature is new in ICS).

Bug: 5036195
Change-Id: I740c51c1a8e6d2460050eaab9943fb38b1565058
2011-07-26 20:19:48 +01:00
Mathias Agopian
686200cb5f Merge "remove dead code and member variables." 2011-07-26 12:08:07 -07:00
Daniel Sandler
070ce94b9f Merge "New phone statusbar handle." 2011-07-26 10:34:28 -07:00
Daniel Sandler
53ef499353 Merge "New stacked RSSI icons." 2011-07-26 10:34:21 -07:00
Daniel Sandler
4e69214f4d Merge "Play the low-battery sound only at certain discharge events." 2011-07-26 10:21:24 -07:00
Daniel Sandler
e2234add84 Merge "Update large icon in changed status bar notifications." 2011-07-26 10:13:04 -07:00
Mike Lockwood
833bfd2ba5 Merge "MediaScanner: Fix problem with duplicate directory entries in the database" 2011-07-26 10:10:28 -07:00
Daniel Sandler
7198662bb3 Play the low-battery sound only at certain discharge events.
That is, only play it when the device is running on battery
and the remaining charge level descends into a new
low-battery regime:

* when the device hits the first threshold, for example 15%
  (the dialog is first shown at this time)
* when the device hits the second threshold, e.g. 4% (the
  dialog will be redisplayed if necessary)
* when the device has been charging but AC power is removed,
  returning the device to a low-battery regime (the dialog
  will be redisplayed if necessary)

The sound will no longer be replayed as the battery level
descends within these regimes (say, 4% --> 3%).

Bug: 4981280
Change-Id: I049d60f39ae556241a23f8664e61be3d70d937e5
2011-07-26 13:06:49 -04:00
Jean-Michel Trivi
af20eacc21 Merge "Fix bug 4319552 Java to native channel mask translation" 2011-07-26 09:27:53 -07:00
Makoto Onuki
1bfe9a9b02 Merge "Add new contacts intent action for the "invite" feature" 2011-07-26 09:24:06 -07:00
Mike Lockwood
c6eaa713a3 MediaScanner: Fix problem with duplicate directory entries in the database
Bug: 5078643

Change-Id: I8804ff5bbd729f57be7ff0b17a4b134cafe78c18
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-26 10:57:42 -04:00
Daniel Sandler
2b69735e01 New stacked RSSI icons.
The signal strength, network type & flow indicator, and
battery have all been moved out of the policy and into the
status bar implementation itself, mirroring the change on
tablets. This means that they no longer use status bar icon
slots but instead are bespoke layouts and views.

GPS has also been removed and will return as a notification
(again, as was done in the Honeycomb tablet UI).

Bug: 4691638
Change-Id: I60df4871209b64209bfc5b3bf398651cc2e77b24
2011-07-26 08:17:28 -04:00
John Michelau
fada80df08 am ac74551b: Disable name lookups for dumpstate calls to "iptables -L"
* commit 'ac74551bb42eb2d6775d994357481113375574e7':
  Disable name lookups for dumpstate calls to "iptables -L"
2011-07-25 22:26:38 -07:00
John Michelau
ac74551bb4 Disable name lookups for dumpstate calls to "iptables -L"
The name lookups are not helpful enough to warrant the large delays
they can cause.

Change-Id: I8710e76b15b7cf060b7f4f89128ea3249fcdbd0d
2011-07-25 21:53:15 -07:00
Mathias Agopian
f3503c2c30 remove dead code and member variables.
also fix some comments and improve debugging logs.

Change-Id: I83e55309f306332b59e1ec46104c4a7fffbf3c97
2011-07-25 20:03:43 -07:00
Mathias Agopian
ae65c17959 Merge "fix a typo that prevented preserveRects() to work properly" 2011-07-25 19:51:31 -07:00
Gilles Debunne
2888524e03 Bug 4987014: a tap outside dismisses the text suggestion popup
Change-Id: I61f5a3c981770393aa861c88d989c653ea00a067
2011-07-25 18:59:06 -07:00
Eric Laurent
6dbdc40e9a Fix issue 4604090: notification sound interrupted.
The problem is that the audio HAL fails to acquire the wake lock when playing the notification.
This is because of a change that removed the mediaserver process form the system group for honeycomb.

The fix consists in requesting the wake lock from PowerManagerService when AudioFlinger mixer
wakes up.

A consequence of this change is that audio HALs or pcm drivers do not have to hold wake locks
anymore as in the past.

Change-Id: I4fb3cc84816c9c408ab7fec75886baf801e1ecb5
2011-07-25 18:41:12 -07:00
Chih-Chung Chang
b33d46cc77 Merge "Add filename and line number in the debug messages." 2011-07-25 18:36:57 -07:00
Daniel Sandler
975e689c34 New phone statusbar handle.
Bug: 4691638
Change-Id: I317d76bc093b56b639bf1d937fe6fb8dcbff109e
2011-07-25 21:31:41 -04:00
Kenny Root
01c4dccece Merge "Throw NullPointerException on args to Time#compare" 2011-07-25 18:26:59 -07:00
satok
6c454c3225 Merge "[step9] Add logging code for text services" 2011-07-25 18:02:46 -07:00
satok
da317ef686 [step9] Add logging code for text services
Change-Id: I4dae847951848cca85bcb73f47c509ce23327334
2011-07-26 09:42:12 +09:00
Pannag Sanketi
cac873bd4a Fixing up Mediarecorder for MFF
For using the MediaRecorder in MFF (Mobile Filter Framework),
getMediaRecorder method in mediarecorder jni was earlier changed to
a non static method. Changed it back to a static method.

Also, added a new source type to MediaRecorder.VideoSource for recording
GRalloc buffers.

Change-Id: I031fad45c12b0ac9602d9e451d4767e95a86234d
2011-07-25 17:38:15 -07:00
Eric Fischer
3a6c36fdd7 Import revised translations.
Change-Id: Ia9c97db0cd31b9d3163318b4193a328a614a7098
2011-07-25 17:36:41 -07:00
Dianne Hackborn
47a7c68ac8 Merge "Fix issue #5063010: Loaders don't seem to be properly..." 2011-07-25 17:28:51 -07:00
Daniel Sandler
d5b858639c Update large icon in changed status bar notifications.
Reapply fix from change I6bb72c0b to phones.

Bug: 5071157
Change-Id: I9da5ee6cf72b148e5fef4de6e1c9328ccb4b28b8
2011-07-25 20:28:41 -04:00
Robert Greenwalt
a056c6a436 am 8ba16551: Merge "Fix build." into honeycomb-plus-aosp
* commit '8ba16551bc11379e7c1b1815612909e2515d0cb2':
  Fix build.
2011-07-25 17:25:30 -07:00
Dianne Hackborn
68454aa049 am 1b20abd3: am 20bf46af: am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post."
* commit '1b20abd30c2757132b7a2d319ae73f420b864ed4':
  frameworks/base: Cap the number of toasts that a package can post.
2011-07-25 17:25:09 -07:00
Dianne Hackborn
b4913b8754 am 6d21aee8: am 9ce1ecdf: am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests"
* commit '6d21aee882215e8a17408f6ae1fbfba5cf8e440f':
  frameworks/base: unlink death notifications of Vibrate requests
2011-07-25 17:25:00 -07:00
Xavier Ducrohet
4f727fbdc3 am ed07215e: am 55775e5f: am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public."
* commit 'ed07215e482cae1ffedbba707284821b3afc310f':
  Layoutlib_create flag -p: don't change all accesses to public.
2011-07-25 17:24:56 -07:00
Kenny Root
fa93052d91 am 64ed1059: am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails."
* commit '64ed105957098a900d58e7c2598e060cb37755ce':
  Continue idmap generation even if name lookup fails.
2011-07-25 17:24:52 -07:00
Winson Chung
eedc6f0d7d Merge "Using the filename as the media title for screenshots and changing filename format." 2011-07-25 17:20:19 -07:00
Winson Chung
753e40b147 Using the filename as the media title for screenshots and changing filename format.
- Fixes bugs 5075366 and 5076125

Change-Id: I985be1efa8ffad7203b1bbc8d97da2d4a7156adb
2011-07-25 17:13:31 -07:00
Robert Greenwalt
82a94afa96 Merge "resolved conflicts for merge of a7f68230 to master" 2011-07-25 17:12:22 -07:00
Jean-Michel Trivi
d9ae1c573e Fix bug 4319552 Java to native channel mask translation
When creating a new AudioTrack instance, translate from a Java
  channel mask as defined in android.media.AudioFormat to one
  as defined in audio.h which matches industry-standard
  channel mask definitions.

Change-Id: I7eeece8ec2a437977c31f6e82590f9591158144b
2011-07-25 17:06:22 -07:00
Kenny Root
467cabe879 Throw NullPointerException on args to Time#compare
Check for null on arguments to Time#compare(Time, Time) before passing
it down to JNI code.

Bug: 5073949
Change-Id: I077e9d5194a89206d1e51fc89a72c8a72e29f8f1
2011-07-25 17:00:50 -07:00
Robert Greenwalt
572b7048a6 Use dns proxy a bit.
Sets the current default interface and sets the dns per interface.
port of changes 23041 and 22098 from opensource.
bug:5060618

Change-Id: I80e7ef88727eeb8ff2b48059f69b270e5a6b5c16
2011-07-25 17:00:13 -07:00
Romain Guy
176f3e1b77 Merge "Improve rendering performance on some GPUs" 2011-07-25 16:38:13 -07:00
Gloria Wang
1ff496a75a Merge "Fix for bug 4371230. - Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client" 2011-07-25 16:36:20 -07:00