82609 Commits

Author SHA1 Message Date
Baligh Uddin
36d60383c1 Import translations. DO NOT MERGE
Change-Id: Id596c71fef96c4ca0b23bdabcba326171d625ab5
Auto-generated-cl: translation import
2012-08-08 11:34:09 -07:00
John Spurlock
ec0feefd44 Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev 2012-08-08 08:48:07 -07:00
Daniel Sandler
5927d957ea Merge "Migrate Dreams default settings to DatabaseHelper." into jb-mr1-dev 2012-08-08 08:47:40 -07:00
John Spurlock
786546eacc Check the ACTIVATE_ON_DOCK setting in DockObserver.
Otherwise docking the device will always launch a Dream.

Change-Id: I2e74ca62f80d7e386d11c00920a75a5a6e78926c
2012-08-08 11:40:20 -04:00
Daniel Sandler
fdb7c36a10 Migrate Dreams default settings to DatabaseHelper.
Also switch Dreams on for all charging devices by default.

Change-Id: Iccbcc2906d55214320b2f467e88ba9cb188f4886
2012-08-08 08:38:48 -04:00
Matthew Xie
1ae86869bc Merge "Auto connection/disconnection related changes" into jb-mr1-dev 2012-08-08 00:31:53 -07:00
Romain Guy
0a332e39eb Merge "Draw an empty border around glyphs to avoid sampling issues Bug #6942209" into jb-mr1-dev 2012-08-07 19:12:09 -07:00
Romain Guy
33fa1f774c Draw an empty border around glyphs to avoid sampling issues
Bug #6942209

The font renderer was preserving a 1 px border around each glyph to ensure
bilinear filtering would work nicely. Unfortunately, this border was not
set to 0 when glyphs were added in the cache to replace old evicted glyphs.

Change-Id: Ib85afca7ebad5cb63f960dc0e87ae162333dbfe8
2012-08-07 19:09:57 -07:00
Adam Powell
96f1ee9867 Merge "Fix a padding resolution bug for adapter-based views" into jb-mr1-dev 2012-08-07 18:04:16 -07:00
Adam Powell
60b645f673 Merge "Fix padding in global actions list item" into jb-mr1-dev 2012-08-07 17:42:41 -07:00
Adam Powell
6571c7896d Fix padding in global actions list item
Re-align the icon edges with the expected amount of padding in the
long-press power dialog.

Change-Id: I0d2f86447e635d5c339b07c261716e12670dc06d
2012-08-07 17:39:56 -07:00
Adam Powell
0090f20001 Fix a padding resolution bug for adapter-based views
If padding has not been resolved by the time measure() is called,
resolve it.

Bug 6938579

Change-Id: Idd3ffa3e4e441cd462d6594b1e20d153d7632994
2012-08-07 17:16:49 -07:00
Jason Simmons
336b31c28a Merge "Add an empty stub status bar service implementation" into jb-mr1-dev 2012-08-07 16:14:50 -07:00
Mike Lockwood
08fe2687aa Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev 2012-08-07 15:34:49 -07:00
The Android Open Source Project
c452e025be am 02c99918: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '02c9991834eecb161a90475b2a2076e44628c9f9':
2012-08-07 15:14:21 -07:00
The Android Open Source Project
02c9991834 Reconcile with jb-mr0-release - do not merge
Change-Id: I79a1cf96dc3fb5ead2ace604370cbaed2d1bc534
2012-08-07 14:59:03 -07:00
Romain Guy
b260f3531b Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339" into jb-mr1-dev 2012-08-07 14:52:35 -07:00
Mike Lockwood
2d286f4984 MediaFile: Fix case sensitive file extension matching for computing MTP format code
Bug: 6939136

Change-Id: Iefd4083aefbd4b175a2f8c860a9e13c99ded9c82
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-08-07 14:43:59 -07:00
Romain Guy
2440e670de Catch padding changes in ViewGroup to properly clip children
Bug #6886339

RTL support introduced a new way to handle padding which broke
existing behavior in ViewGroup.setPadding(). The new code path
was not notifying ViewGroup which would prevent it from setting
a flag used to clip children.

Change-Id: I584143714cb81fd664b4ecd9fb51d56bae04ba05
2012-08-07 14:43:43 -07:00
Stephen Hines
b0e0c1c02a Merge "Add case for NEON min to RSTest" into jb-mr1-dev 2012-08-07 14:32:30 -07:00
Rajeev Sharma
6e1b917759 Add case for NEON min to RSTest
Regression test for bug 6841495.

Change-Id: If98380f402a711592dcddba5438e3cce5b008131
2012-08-07 14:30:50 -07:00
Katie McCormick
e4fcedff53 Merge "cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9" into jb-mr1-dev 2012-08-07 14:22:17 -07:00
Scott Main
a335b06c67 am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '9e28fa459bac0322a5608a4f6c682e0ff9051bed':
  docs: fix hdef variable
2012-08-07 14:05:32 -07:00
Scott Main
b53e9b42c3 am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file
* commit 'a8583c2934836572632bb82d1fe7607392d4ca72':
  docs: fix broken links and update sitemap text file
2012-08-07 14:05:28 -07:00
Scott Main
9e28fa459b am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev
* commit '0d3a127742b56a9aae9c9c018b7042f49902db8a':
  docs: fix hdef variable
2012-08-07 14:04:09 -07:00
Scott Main
a8583c2934 am 40eee61e: docs: fix broken links and update sitemap text file
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
  docs: fix broken links and update sitemap text file
2012-08-07 14:04:04 -07:00
Scott Main
0d3a127742 Merge "docs: fix hdef variable" into jb-dev 2012-08-07 14:01:34 -07:00
Scott Main
b111b5785e docs: fix hdef variable
Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
2012-08-07 13:59:12 -07:00
Adam Powell
4224790ffa Merge "Animate the action bar's Up chevron as it shows and hides." into jb-mr1-dev 2012-08-07 13:48:04 -07:00
Adam Powell
fd75eef161 Animate the action bar's Up chevron as it shows and hides.
Change-Id: I2cf0283cc644a62ad83cb5641b8f56cc8229b86f
2012-08-07 13:47:11 -07:00
Elliott Hughes
b14c215eb2 am 4b4b4438: am 33c5670b: Merge "Fewer warnings in aidl generated code."
* commit '4b4b44381b133e9ab7418806c046774b7fd31393':
  Fewer warnings in aidl generated code.
2012-08-07 13:20:50 -07:00
Elliott Hughes
4b4b44381b am 33c5670b: Merge "Fewer warnings in aidl generated code."
* commit '33c5670b315810f1f3dc66fe8cd38f7b3e05f3ac':
  Fewer warnings in aidl generated code.
2012-08-07 13:18:53 -07:00
The Android Automerger
9ec5855611 merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:14 -07:00
Katie McCormick
e5cefd1d52 cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I584ba81e923d4150d2b4aed940d790c8298bae7c
2012-08-07 13:00:10 -07:00
Baligh Uddin
53bec9af8b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-07 12:40:12 -07:00
Baligh Uddin
2cfa7d8943 Import translations. DO NOT MERGE
Change-Id: Ia88ed38a8472e03ac23c36dc8fe86643af9bb2d6
Auto-generated-cl: translation import
2012-08-07 12:24:57 -07:00
Elliott Hughes
33c5670b31 Merge "Fewer warnings in aidl generated code." 2012-08-07 12:19:22 -07:00
Romain Guy
03ad783c50 Merge "Cleanup of libhwui" into jb-mr1-dev 2012-08-07 11:59:39 -07:00
Dianne Hackborn
a419150573 Merge "Add power menu action to take a bug report" into jb-mr1-dev 2012-08-07 11:45:47 -07:00
Dianne Hackborn
5773bfdb7c Add power menu action to take a bug report
Change-Id: I5f58d99e9a27a1fc496fa54e0c0ee333087155da
2012-08-07 11:42:09 -07:00
Romain Guy
17112ad8a2 Cleanup of libhwui
Change-Id: Ib7f5771548462c00027a8ad57badfb68c50644f9
2012-08-07 11:25:15 -07:00
Martin Storsjo
d932de9aff mediacodec: Don't crash if trying to open a codec that does not exist
Change-Id: If75e3156517993629f50622a84a9ac573fced815
2012-08-07 11:11:24 -07:00
Martin Storsjo
b529e4c9ca mediacodec: Don't suggest calling getOutputFormat() immediately
Calling getOutputFormat() at this point currently crashes in
native code. (After a fix to the native code, this gives an
IllegalStateException instead.)

Change-Id: Ia45c4820bb3d9ed435a0aeef1ff8c230524f2e1f
2012-08-07 11:07:12 -07:00
Elliott Hughes
b327c41e12 Fewer warnings in aidl generated code.
Bug: http://code.google.com/p/android/issues/detail?id=19196
Change-Id: If054e60c19dc73fe32f55d0fa1054309565a6de6
2012-08-07 10:34:02 -07:00
Nick Kralevich
6624afe37b Merge "Explicitly export content providers" into jb-mr1-dev 2012-08-07 08:55:25 -07:00
Nick Kralevich
b1f938c1c1 Merge "Show more info when a testcase fails." into jb-mr1-dev 2012-08-07 08:42:49 -07:00
Svetoslav Ganov
85b1041f89 Merge "Window position not reported if the window is not moved." into jb-mr1-dev 2012-08-06 23:51:36 -07:00
Svetoslav Ganov
758143ecfe Window position not reported if the window is not moved.
1.If a window is shown but never moved the window window
  is never notified for its current location. Therefore,
  accessibility nodes do not contain correct bounds in
  screen coordinates.

bug:6926295

Change-Id: I7df18b095d33ecafffced75aba9e4f4693b0c393
2012-08-06 23:49:38 -07:00
Ganesh Ganapathi Batta
6f6c54519a Auto connection/disconnection related changes
Remove ACTION_CONNECT_OTHER_PROFILES as it is no longer used
Allow only PRIORITY_ON and PRIORTY_OFF  as priority params for SetPriority()
API in BluetoothA2DP and BluetoothHeadset
BluetoothPBAP: Pass on proxy object as part of Service Connected callback

Change-Id: Ida00fc2b7d1dcb91b01f7ddd2cea482367a3b334
2012-08-06 23:24:26 -07:00
Scott Main
40eee61e25 docs: fix broken links
and update sitemap text file

Change-Id: I6982c3f029c46135ae856b8484d906c2882bad3a
2012-08-06 18:04:23 -07:00