Dianne Hackborn
34905a9808
Fix issue #5021385 : Title of any Settings subscreen changes...
...
...to "Settings" when orientation changes
Change-Id: Ib6387b9813329174013452bcdf323cedc4b29664
2011-07-21 17:30:57 -07:00
Dirk Dougherty
040c2f91ed
Cherrypick from hcmr2: doc change: more edits to Android 3.2 version notes.
...
Change-Id: I1fd616750b5693edf1f35a043ca4e11dfbe84327
2011-07-21 09:16:58 -07:00
The Android Open Source Project
edf0178265
Reconcile with gingerbread-mr4-release
...
Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a
2011-07-21 07:24:01 -07:00
Narayan Kamath
967eac2f8d
Merge "Fix some AudioTrack related issues."
2011-07-21 05:12:34 -07:00
Narayan Kamath
673f360b0e
Fix some AudioTrack related issues.
...
(a) Call stop() when we've written less than the
AudioTrack buffer. This forces pending buffers to
get mixed.
(b) Introduce a minimum sleep time to avoid spinlocks
if they system is busy
Change-Id: If70937e8b4e8c5d02d7dadc0d3086f97a10eb7ef
2011-07-21 13:06:28 +01:00
Martijn Coenen
7a1ac5c0fb
Hide new interface to fix build.
...
Change-Id: I9d408ad5ab64399af67b37a01be973634a194ae2
2011-07-21 12:30:24 +02:00
Martijn Coenen
6d74894079
Interfaces for enabling/disabling zero-click.
...
Change-Id: If7a90e67ca0f05cb18bea2861001e9cb6a14f4d6
2011-07-21 09:57:28 +02:00
Martijn Coenen
63fc01d044
Merge "Support for getTimeout() (API)."
2011-07-21 00:32:11 -07:00
Jeff Hamilton
33ef62e5c6
Merge "Remove the hidden My Tag APIs."
2011-07-20 21:54:15 -07:00
Jeff Hamilton
a77258b98e
Remove the hidden My Tag APIs.
...
Bug: 5048185
Change-Id: Iaf8a77e301fd378738db632e23674facd2c8fccc
2011-07-20 23:15:51 -05:00
Eric Laurent
0eecc27714
Merge "AudioRecord JAVA: expose audio session Id"
2011-07-20 19:25:34 -07:00
Matthew Xie
7699c18a07
Merge "when disconnectHeadsetInternal, allow it when the BT is not disabled"
2011-07-20 19:08:38 -07:00
Xavier Ducrohet
3a8801e059
am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit 'b3ab070edb17f00a4b2d0f511ca539c885b28b6f':
Fix to compile for windows
2011-07-20 18:56:52 -07:00
Xavier Ducrohet
b3ab070edb
am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
Fix to compile for windows
2011-07-20 18:55:21 -07:00
Xavier Ducrohet
3a2d1c2351
am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
Fix to compile for windows
2011-07-20 18:53:08 -07:00
Mathias Agopian
f5a4dd386f
Merge "clean-up. get rid ofunused code and members in Surface[Control].cpp"
2011-07-20 18:52:51 -07:00
Mathias Agopian
48724c0c61
Merge "silence sensorservice when it's dropping events"
2011-07-20 18:52:21 -07:00
Mathias Agopian
f9a4b1366e
silence sensorservice when it's dropping events
...
Change-Id: Ib05862e545aa780821aa605e45ab189f530494b7
2011-07-20 18:51:15 -07:00
Xavier Ducrohet
ddb8e3b24b
am 9bac0a9f: Merge "Fix to compile for windows"
...
* commit '9bac0a9f93976ff341fc9c46b3a85be767119a88':
Fix to compile for windows
2011-07-20 18:49:46 -07:00
Romain Guy
22a72964ed
Merge "Convert looper traces to traceview traces"
2011-07-20 18:47:49 -07:00
Romain Guy
648bee18a1
Convert looper traces to traceview traces
...
Change-Id: If9238e8b00744118c1c4d2182727569f94deb638
2011-07-20 18:47:17 -07:00
Xavier Ducrohet
9bac0a9f93
Merge "Fix to compile for windows"
2011-07-20 18:35:35 -07:00
Josiah Gaskin
9102165fd8
Fix to compile for windows
...
This change includes a workaround for dirent.h on windows not
including d_type.
Change-Id: Ieaa3f298d2e6b32f2d8367384a1d02a2f5d06cca
2011-07-20 18:22:26 -07:00
Dirk Dougherty
e13cee5388
Merge "Cherrypick from hcmr2: doc change: fix typo in reference to new uses-feature constant."
2011-07-20 18:05:56 -07:00
Dirk Dougherty
e01ed8d390
Cherrypick from hcmr2: doc change: fix typo in reference to new uses-feature constant.
2011-07-20 18:04:29 -07:00
Jeff Brown
5da67f4f69
Merge "Untangle MediaScanner error handling. Bug: 5056917"
2011-07-20 18:03:47 -07:00
Dirk Dougherty
5be70a8ec0
Cherrypick from hcmr2: doc change: fix typo in 3.2 version notes
2011-07-20 18:00:58 -07:00
Dirk Dougherty
d485a52e10
Cherrypick from hcmr2: Doc change: fix typo in 3.2 version notes
2011-07-20 17:58:23 -07:00
Dirk Dougherty
a43c477793
Cherrypick from honeycomb-mr2: Doc change: add HC MR2 version notes and update api level info.
2011-07-20 17:53:29 -07:00
Gilles Debunne
317ab3427a
Merge "Suggestions are dismissed by back key"
2011-07-20 17:51:36 -07:00
Xavier Ducrohet
ac1fe6f846
am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
...
* commit '84be06e4ce0778fbf0c1ac72f94795ef8433439b':
Added Caching for PreProcessed PNGs
2011-07-20 17:49:26 -07:00
Eric Laurent
ae7c092649
Merge "Audio framework: support for audio pre processing"
2011-07-20 17:45:37 -07:00
Xavier Ducrohet
84be06e4ce
resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp
...
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
2011-07-20 17:45:11 -07:00
Jeff Brown
95661d5ece
Merge "Remove unimplemented memory pool."
2011-07-20 17:42:36 -07:00
Dirk Dougherty
1bf7dea61d
Merge "Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13."
2011-07-20 17:35:28 -07:00
Jeff Brown
2c70d4a372
Untangle MediaScanner error handling.
...
Bug: 5056917
Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
2011-07-20 17:33:13 -07:00
Dirk Dougherty
75db8a1b1d
Cherrypick from honeycomb-mr2: Doc change: diff report for API level 13.
2011-07-20 17:29:48 -07:00
Xavier Ducrohet
e53365f6f1
am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
...
* commit 'a125c937de06b1cc43368743592f47513eb88b76':
Add generation of dependency file for .ap_ package
2011-07-20 17:18:04 -07:00
Matthew Xie
e3dc975acb
when disconnectHeadsetInternal, allow it when the BT is not disabled
...
The old code allowed the disconnection only when BT is enabled. This
caused a bug during BT turning off that Headset connection failed
to disconnect.
Change-Id: Iba15a1595b6987064f071ad90bbb126a6edfe6b5
2011-07-20 17:12:52 -07:00
Mathias Agopian
50c24a2000
clean-up. get rid ofunused code and members in Surface[Control].cpp
...
Change-Id: Ia7790ae28af2c2ac99eae01c2c5044ace4a490a4
2011-07-20 16:53:13 -07:00
Xavier Ducrohet
a125c937de
resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp
...
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
2011-07-20 16:31:25 -07:00
James Dong
0f4e81df99
Merge "Let the media recording framework release the Camera object when it is the owner"
2011-07-20 16:08:32 -07:00
Xavier Ducrohet
ea9e6d24a4
am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
...
* commit 'b582af31c74a58922120fdb747c1a3b867d95e90':
Added Caching for PreProcessed PNGs
2011-07-20 16:02:33 -07:00
Xavier Ducrohet
b582af31c7
am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs"
...
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
Added Caching for PreProcessed PNGs
2011-07-20 16:00:44 -07:00
Xavier Ducrohet
0bc12a0b13
Merge "Added Caching for PreProcessed PNGs"
2011-07-20 15:55:33 -07:00
Xavier Ducrohet
2c311be720
am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
...
* commit '3082449508a8c574d0476fdb988f98d9554637ae':
Add generation of dependency file for .ap_ package
2011-07-20 15:27:39 -07:00
Xavier Ducrohet
3082449508
am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package"
...
* commit '1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
Add generation of dependency file for .ap_ package
2011-07-20 15:23:55 -07:00
Josiah Gaskin
8a39da80b3
Added Caching for PreProcessed PNGs
...
Added a cache management system for pre-processed PNG files
along with unit tests. The cache system will be used if
the --no-crunch flag is passed to AAPT during the package
phase. The cache can be updated by a call to 'aapt crunch'
(see usage statement). Also put in benchmarking code.
Change-Id: I58271fb2ee2f5f9075fd74d4ff6f15e7afabd05c
2011-07-20 15:20:26 -07:00
Jeff Brown
ac386073df
Remove unimplemented memory pool.
...
dlmalloc does such a great job that we don't need a pool anyways.
Change-Id: I105b28c4a5c491543959190c7c0a9de75a5b8052
2011-07-20 15:19:50 -07:00
Jim Miller
83261239b0
Merge "Fix 5056699: GridLayout should maintain static indices for "gone" views."
2011-07-20 15:19:19 -07:00