95204 Commits

Author SHA1 Message Date
Glenn Kasten
068225de01 Add all-channel setVolume() API
Add combined channel APIs setVolume to AudioTrack, MediaPlayer, and
SoundPool to make later migration easier, and encourage apps to use
that API.  The new APIs are @hide for now.

Change-Id: I0c87bfdbff4f4292259fa33e65f67badbafd270b
2012-11-08 17:50:43 -08:00
The Android Open Source Project
cf27115ae1 am f4488d03: (-s ours) am a4d8f804: am a8540f2a: Reconcile with jb-mr1-release - do not merge
* commit 'f4488d0312bd5a1af03b8c353bfe0c1f0e836f33':
2012-11-08 06:29:54 -08:00
Roman Nurik
4d691a37d3 am 4b214cdd: am 7a00ac7c: am a93f94d3: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '4b214cddb0be3d988b2334898279923ec29ec3f1':
  docs: Minor Nexus 10 fix in Device Art Generator
2012-11-08 06:29:50 -08:00
Baligh Uddin
cc7dde8c6f am c1bd157f: (-s ours) am d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'c1bd157f50472a96025721e26e697b33c6f44b5b':
  Import translations. DO NOT MERGE
2012-11-08 06:29:46 -08:00
Baligh Uddin
28f4c3d546 am b7232a2e: (-s ours) am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'b7232a2e45d5b113334915ff7d94636f6ddfb807':
  Import translations. DO NOT MERGE
2012-11-08 06:29:42 -08:00
The Android Open Source Project
f4488d0312 am a4d8f804: am a8540f2a: Reconcile with jb-mr1-release - do not merge
* commit 'a4d8f804688deb939a37e5aaf0bab40520548b33':
2012-11-08 06:27:02 -08:00
Roman Nurik
4b214cddb0 am 7a00ac7c: am a93f94d3: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev
* commit '7a00ac7cb74e957bed6580cc209f8035cd34f58d':
  docs: Minor Nexus 10 fix in Device Art Generator
2012-11-08 06:26:51 -08:00
Baligh Uddin
c1bd157f50 am d98e6dc6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit 'd98e6dc68021dad263783a0f21e3f861589eb694':
  Import translations. DO NOT MERGE
2012-11-08 06:26:45 -08:00
Baligh Uddin
b7232a2e45 am 20040daf: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '20040dafbc5f0a0b432d9c41c2da6d7ba7791327':
  Import translations. DO NOT MERGE
2012-11-08 06:26:41 -08:00
Svetoslav Ganov
a083599a75 am f3e03e23: am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit 'f3e03e234f47a85ba25d7a0038253951e94df3b8':
  Make partially visible widget pages not important for accessibility.
2012-11-08 06:18:51 -08:00
Irfan Sheriff
8449bb0378 am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
  Stop supplicant and dhcp before start
2012-11-08 06:18:47 -08:00
Sascha Prueter
06a5aaa8f8 am f107bda0: am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit 'f107bda0ad3c16dfc85cd2119445e63a937be6bd':
  Use a consistent policy for filtering wake keys.
2012-11-08 06:18:43 -08:00
Romain Guy
18d9a26941 am a965fc5e: am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit 'a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
  Dismiss error icon on setError(null) [regression] Bug #7442935
2012-11-08 06:18:40 -08:00
Eino-Ville Talvala
f0352e03fd am f4334f63: am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit 'f4334f63c5162035ead3b44131c48015dfc6be58':
  Camera: Document new video snapshot picture size behavior.
2012-11-08 06:18:36 -08:00
Victoria Lease
eeaf165a5f am 44d927ca: am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '44d927ca837f03e99a4dda52377275da2863ecbb':
  Fires geofence if the device is already in the geofence area.
2012-11-08 06:18:31 -08:00
Robert Greenwalt
1f030df226 am 744c5204: am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '744c520472d59c59f5320e1b0cf0801418eba773':
  Add Coin graphic to premium-sms dialog.
2012-11-08 06:18:25 -08:00
The Android Open Source Project
99e61610c4 am 71390072: (-s ours) am 927372ae: am f3456803: Reconcile with jb-mr1-release - do not merge
* commit '71390072023ec559b88f7a06111ffb458d8880f9':
2012-11-08 06:18:20 -08:00
Justin Koh
5d1a9a902e am 4608a0ae: am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
* commit '4608a0aec230a1a4857b54354afc3f233af7c1f2':
  Support new touchpad event protocol.
2012-11-08 06:18:15 -08:00
Justin Koh
b892e8c642 am a1459793: am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
* commit 'a1459793d4e2ea483deb8baa733abbac56c2c199':
  Trigger Google Now intent with swipe from bottom
2012-11-08 06:18:07 -08:00
Amith Yamasani
cb2f707f86 am cb5cb740: am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit 'cb5cb740b587744150df7414bdc2974144e9167a':
  Authenticate correct user's account when pattern fails multiple times.
2012-11-08 06:17:59 -08:00
Svetoslav Ganov
f3e03e234f am dc564945: am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev
* commit 'dc564945bb7382768e28e45c6fc2452e3f4d9da9':
  Make partially visible widget pages not important for accessibility.
2012-11-08 06:14:37 -08:00
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
2012-11-08 06:14:33 -08:00
Sascha Prueter
f107bda0ad am a517fc3a: am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev
* commit 'a517fc3a393b075a677ef3052e22749951ede8fa':
  Use a consistent policy for filtering wake keys.
2012-11-08 06:14:25 -08:00
Romain Guy
a965fc5e8f am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev
* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
  Dismiss error icon on setError(null) [regression] Bug #7442935
2012-11-08 06:14:11 -08:00
Eino-Ville Talvala
f4334f63c5 am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev
* commit '9671e6e116bbb8a82784457382cab3f90289e31b':
  Camera: Document new video snapshot picture size behavior.
2012-11-08 06:14:01 -08:00
Victoria Lease
44d927ca83 am 66f3d7f3: am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev
* commit '66f3d7f3c8247b59516cbc4ad13bea4e0b8c0ef9':
  Fires geofence if the device is already in the geofence area.
2012-11-08 06:13:21 -08:00
Robert Greenwalt
744c520472 am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
  Add Coin graphic to premium-sms dialog.
2012-11-08 06:13:17 -08:00
The Android Open Source Project
7139007202 am 927372ae: am f3456803: Reconcile with jb-mr1-release - do not merge
* commit '927372aec399b7c63d193c57c69b57065e7b66e5':
2012-11-08 06:12:45 -08:00
Justin Koh
4608a0aec2 am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
* commit '41048d670d42075732723e72d7f303498690ea99':
  Support new touchpad event protocol.
2012-11-08 06:12:30 -08:00
Justin Koh
a1459793d4 am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
  Trigger Google Now intent with swipe from bottom
2012-11-08 06:12:26 -08:00
Amith Yamasani
cb5cb740b5 am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev
* commit 'aecee8a98543118dacec14a94052243754560e9d':
  Authenticate correct user's account when pattern fails multiple times.
2012-11-08 06:12:21 -08:00
John Spurlock
426b050c43 am 805337ab: resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
* commit '805337ab5fb2adf108726b351319d77007577bb4':
  Remove add widget transition jank (insecure).
2012-11-08 05:58:09 -08:00
John Spurlock
805337ab5f resolved conflicts for merge of ef44a77f to jb-mr1-dev-plus-aosp
Change-Id: Iad4319796be4b9ad74580f8c20a4e8cb30569f87
2012-11-08 07:43:15 -05:00
John Spurlock
0b435ae59e am 9a962d7c: am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.
* commit '9a962d7c7df9ff762e3d9798cde868ad73b164db':
  Fix regression in camera transition.
2012-11-07 15:10:20 -08:00
Michael Jurka
eebf218ad4 am e4cc20d1: am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit 'e4cc20d1148addab9f6f27bad70b3f6d437ea06c':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-07 15:10:16 -08:00
Jim Miller
9210016ff9 am 449f48ff: am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
* commit '449f48ff3bc99544ecf1676ed15a4126beea1f1e':
  Workaround for layout bug in SIM PIN/PUK views
2012-11-07 15:10:12 -08:00
Jim Miller
91cc386e55 am d3bd6eb8: am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
* commit 'd3bd6eb8b2f348c19fbbe79a11c0dc9aa5f27637':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-07 15:10:08 -08:00
Svetoslav Ganov
d80d13b3c2 am 63121bd6: am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit '63121bd6c14a80fe839c617e8fb11cf07d490cc1':
2012-11-07 15:10:04 -08:00
Mike Cleron
b8a9ec3e1c am fe583a70: am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit 'fe583a70248709289e3865de62fdc34c92d393b3':
2012-11-07 15:10:00 -08:00
Romain Guy
c60d328b63 am 39fe96c7: am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
* commit '39fe96c7b8ec870e7fa30893f0b4f41fa796b55d':
2012-11-07 15:09:56 -08:00
John Spurlock
9a962d7c7d am 64091a1d: am 8aa62362: am ae73c690: Fix regression in camera transition.
* commit '64091a1da0e87937ad42c8ae0d5e3dd3913b297b':
  Fix regression in camera transition.
2012-11-07 15:06:45 -08:00
Michael Jurka
e4cc20d114 am 7dfbe2d6: am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev
* commit '7dfbe2d6a7a3d6f11d522f44b5339c7a6d3f2a1b':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
2012-11-07 15:06:41 -08:00
Jim Miller
449f48ff3b am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
  Workaround for layout bug in SIM PIN/PUK views
2012-11-07 15:06:37 -08:00
Jim Miller
d3bd6eb8b2 am 16ddf343: am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing
* commit '16ddf343a61dfc93ff9a6fc4721b8fb16010da48':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
2012-11-07 15:06:33 -08:00
Svetoslav Ganov
63121bd6c1 am ab77b5e6: am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
* commit 'ab77b5e6a251075fdfc7990f4d34a8d5896cfbce':
2012-11-07 15:06:29 -08:00
Mike Cleron
fe583a7024 am d97d16f0: am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
* commit 'd97d16f0d1693657938a9c08099ad352d0946b6f':
2012-11-07 15:06:26 -08:00
Romain Guy
39fe96c7b8 am c4101b2b: am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev
* commit 'c4101b2b96d7958e26da5a7b3d14cc2540f8002a':
2012-11-07 15:06:22 -08:00
Jean-Baptiste Queru
f5a79d313e am 476fceab: Merge 5418dd92
* commit '476fceaba3e8c8d5b775fc07ad098792fc757f76':
  Adding bouncer animation on PagedView. (Bug 7459660)
2012-11-07 14:54:34 -08:00
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
2012-11-07 14:41:18 -08:00
Mike Lockwood
13d9d4ffaf Merge "SerialManager: Only allow opening files that are whitelisted serial port devices" 2012-11-07 14:04:55 -08:00