1259 Commits

Author SHA1 Message Date
Amith Yamasani
52cb1da2c6 am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit 'f336408000c4be36045401fb4df89528249e7383':
  New and improved silent mode on lockscreen.
2011-12-07 11:02:51 -08:00
Amith Yamasani
6243edd818 New and improved silent mode on lockscreen.
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
2011-12-06 14:48:38 -08:00
Mike Lockwood
3309386a1b AudioService: Send broadcasts when master volume and mute state change
Change-Id: I7eb5041f0c14f419317e29ea6fa7faa9159cf165
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-05 18:47:38 -08:00
Mike Lockwood
15cf022c70 am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
2011-12-02 13:22:28 -08:00
Mike Lockwood
7944c1b19f MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Bug: 5527220

Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
2011-12-02 15:12:47 -05:00
Amith Yamasani
54a7962590 am afd01086: Merge "Further volume improvements." into ics-mr1
* commit 'afd01086795c7c1f6950a709180b2361625b8b6a':
  Further volume improvements.
2011-12-02 11:23:50 -08:00
Amith Yamasani
afd0108679 Merge "Further volume improvements." into ics-mr1 2011-12-02 11:22:32 -08:00
Hong Teng
1109fe9d81 am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the applicati
* commit '613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0':
  Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
2011-12-02 09:33:47 -08:00
Hong Teng
613ed4c69a Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1 2011-12-02 09:32:02 -08:00
Eric Laurent
c1f069bb40 am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1
* commit '0d3a2e93394efa4729e5c29ff4515f9f2644b8c3':
  AudioService: strengthen A2DP device detection
2011-12-01 20:35:32 -08:00
Amith Yamasani
2ef6f1bb56 Further volume improvements.
- Remove silent mode from Power menu
- Show volume dialog on lockscreen
- Allow beeps when adjusting volume in lockscreen

Bug: 5586083
Change-Id: I93052a8ec5004c784f20e04488af9382d495e711
2011-12-01 15:05:54 -08:00
Hong Teng
63149c81ad Fixd for 5490443 Native crash while exporting a video
- Add new onError callback to PreviewProgressListener, which is
used to indicate video editor application for the error that has occurred during
priviewing.
With this modification, the application must implement the onError method,
and then VideoEditorPreviewTest.java is changed accordingly.

Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
2011-12-01 09:43:42 -08:00
Eric Laurent
6bc7f2cd30 AudioService: strengthen A2DP device detection
If the intent BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED is broadcast
before AudioService is started, The A2DP device connection is never detected
by the audio framework resulting in audio not being routed to A2DP unless the device
is rebooted or the A2DP headset reconnected.

Make sure that A2DP device connection state is sampled when
boot completed event is received.

Issue 5665159

Change-Id: I04d82020afc00af28c5ea0bb9879ed55bcc9b6f3
2011-11-30 17:08:44 -08:00
dujin.cha
b31783b142 am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue
* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue
2011-11-22 13:20:21 -08:00
dujin.cha
eabde3d4a9 am fe464a76: [Prime K] Fix gabage character issue
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue
2011-11-22 13:18:27 -08:00
dujin.cha
fe464a76d8 [Prime K] Fix gabage character issue
Korean characters show up as gabage characters in Music player.
Reason : MTP service does not set the locale for the MediaScanner
Solution : Set locale when MtpDatabase creates MediaScanner.

Bug ID : 5567433
Signed-off-by: dujin.cha <dujin.cha@samsung.com>

Change-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b
2011-11-22 10:28:21 -08:00
Mike Lockwood
b0e6d4f87f Merge "AudioManager: Add wrapper methods for master volume support" into ics-aah 2011-11-16 11:35:23 -08:00
Mike Lockwood
c614df9650 AudioManager: Add wrapper methods for master volume support
Change-Id: Ibfc24f052d05824175f71c2138ba041c94c3def7
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-16 11:30:47 -08:00
Mike Lockwood
47a0a8832f Merge "AudioManager: Add support for master mute" into ics-aah 2011-11-16 07:41:21 -08:00
James Dong
541e2e6695 am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
2011-11-15 20:16:45 -08:00
James Dong
4fdc36e6d6 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Jean-Michel Trivi
08b2d32628 am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1
* commit '0ddb0143895b816d4ff5c174b346390e07f26556':
  Fix 5623252 unlink to death of audio focus client early
2011-11-15 18:21:43 -08:00
James Dong
89ca6983eb Document that release() should be called with onPause() and onStop() for media objects
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
2011-11-15 18:08:06 -08:00
Jean-Michel Trivi
e7edc86853 Fix 5623252 unlink to death of audio focus client early
When removing an entry in the audio focus stack, don't wait for
 this object's finalizer to unlink to the death of the associated
 client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
 by catching the exception it can throw inside its body.

Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
2011-11-15 17:41:05 -08:00
Mike Lockwood
cfbcd3bf21 AudioManager: Add support for master mute
Change-Id: I98e87d1e266e0523c4aacb23cc5c4b3fdc7a1eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-15 09:57:33 -08:00
Jean-Michel Trivi
0dba46f9b2 am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1
* commit '538dc6acfd14ea59f0b294531f9417ca04ca621f':
  Fix 5615747 Don't leak remote control client death handlers
2011-11-15 09:26:02 -08:00
Jean-Michel Trivi
a9509736c8 Fix 5615747 Don't leak remote control client death handlers
Whenever a remote control stack entry is GC'd or removed from
 the stack, unlink its death handler.

Change-Id: Ia4ed6667351849fd388272591e24ffc16959beaf
2011-11-14 17:30:23 -08:00
Jean-Michel Trivi
09d936feb8 am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1
* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
2011-11-14 14:36:11 -08:00
Jean-Michel Trivi
de1f065be1 Fix 5607938 AudioFocusDeathHandler leaks GREF
The AudioFocus death handler was correctly updating the audio
 focus stack when an audio focus client dies, but the death handler
 was leaking GREF if unlinkToDeath() is not called.
The fix consists in making sure unlinkToDeath() is always called
 by calling it in its finalizer.

Change-Id: I0c5343b4986ab582cadbf171fc53816952dc16f5
2011-11-11 16:13:48 -08:00
James Dong
0997fcb6db am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
  Unhide the key to retriever location information in 3gp/mp4 files
2011-11-11 11:50:41 -08:00
James Dong
d9245e17dc am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
* commit '08e42967b9e459b7beb22e859f1f1eba0546741b':
  Add support for retrieving location information in mp4/3gpp files
2011-11-11 11:50:14 -08:00
James Dong
00aa51b355 Unhide the key to retriever location information in 3gp/mp4 files
Change-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130
related-to-bug: 5560253
2011-11-11 01:49:01 -08:00
James Dong
77c500c9a1 Add support for retrieving location information in mp4/3gpp files
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
2011-11-10 11:40:11 -08:00
Eric Laurent
43f7bbdfbb am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1
* commit '7c61fa70a50e15466f807dd194e530bc4fd3a96a':
  Fix problems in tablet silent mode.
2011-11-10 16:30:51 +00:00
Eric Laurent
96a33d1caa Fix problems in tablet silent mode.
Do not enter silent mode when ALARM stream volume is changed
to 0 by volume down key: Only RING, NOTIFICATION and MUSIC
streams control silent mode.

Report correct volume (0) for NOTIFICATION stream when silent mode
is entered by changing NOTIFICATION stream volume to 0 with
volume down key.

Change-Id: I3e0816dfae40bc127cc30cca02cdca6ec19e30a4
2011-11-09 18:06: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
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
b1224ff1c4 Fix 5509346: Resize the thumbnails if it's too large.
Change-Id: I805f37f22cc745cfbc788f594da704e7e634f122
2011-11-07 20:34:37 +08:00
Eric Laurent
4528548a06 am cd84197a: am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit 'cd84197ac1226432de2e13c8fd678a4c88511e0f':
  Fix volume indication in vibrate mode.
2011-10-31 23:26:07 +00:00
Eric Laurent
cd84197ac1 am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670':
  Fix volume indication in vibrate mode.
2011-10-31 23:23:15 +00:00
Eric Laurent
8ca9a1cf35 Fix volume indication in vibrate mode.
The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
2011-10-31 12:12:37 -07:00
Ed Heyl
92537e6ff2 merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
2011-10-31 06:06:27 -07:00
Amith Yamasani
18936d7d1d am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
  Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
2011-10-30 21:37:09 +00:00
Joe Fernandez
74b2b95473 am 09848bc8: Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
* commit '09848bc89de999416e2de82a7693b2deec6bf802':
  docs: add developer guide cross references, Project ACRE, round 3
2011-10-29 02:16:10 +00:00
Amith Yamasani
69e640ee84 Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0 2011-10-28 18:59:11 -07:00
Amith Yamasani
c696a53d1f Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
In order to completely mute the ringer (no vibrate), introduce an extra
state beyond mute, which mutes the vibrator as well, if it was enabled.

Bug: 5530217

Change-Id: Ib1f299ee6bbca56c1aa7e1100662591362d08307
2011-10-28 18:40:43 -07:00
Joe Fernandez
61fd1e8d8c docs: add developer guide cross references, Project ACRE, round 3
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
2011-10-28 14:23:23 -07:00
Mike Lockwood
5020e7e2d3 VolumePanel: Add support for master volume
Change-Id: I3119eb2b7d3b5e7ce87f1660b50c10ab79c7bbdf
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 11:44:23 -04:00
Mike Lockwood
619f06444b Save and restore master volume in the settings provider
Change-Id: I135c48155c41735c870e3934469c47f05bd74973
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:53 -04:00
Mike Lockwood
dff25597a9 Simple master volume support
Still needs integration with Settings (for persistence) and VolumePanel UI.

Change-Id: I9eca92c4b1ef2df2564411006a35753ab9618dce
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-28 10:14:53 -04:00