drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,241 Commits 1 Branch 0 Tags
Commit Graph

81241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
c516507404 am 6c1f2b13: am b8b47c22: Merge "Remove redundant ">"" 
* commit '6c1f2b136b2fc55ddd2df7db6b6e48a8665acc98':
  Remove redundant ">"
 2012-06-23 07:15:39 -07:00
Jean-Baptiste Queru
41e6e0c49f am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
* commit 'c34188a95405526416325604386af4f48ba20918':
  Add the possibility to modify the View focus rect
 2012-06-23 07:13:25 -07:00
Jean-Baptiste Queru
695b2d089e am 5f77f82e: Merge "Another case of extra ">"" 
* commit '5f77f82e609b24504e026751228b399b8dc57ab5':
  Another case of extra ">"
 2012-06-23 07:12:19 -07:00
Jean-Baptiste Queru
6c1f2b136b am b8b47c22: Merge "Remove redundant ">"" 
* commit 'b8b47c22c8dc1f5facfbb4729511772630cc3aa6':
  Remove redundant ">"
 2012-06-23 07:12:16 -07:00
Jean-Baptiste Queru
c34188a954 resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
 2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
5f77f82e60 Merge "Another case of extra ">"" 2012-06-23 05:59:11 -07:00
Jean-Baptiste Queru
b8b47c22c8 Merge "Remove redundant ">"" 2012-06-23 05:58:56 -07:00
Jean-Baptiste Queru
f8f76d52a7 Merge "Add the possibility to modify the View focus rect" 2012-06-23 05:52:53 -07:00
Scott Main
4786626b0f am 0e61a726: am 6f3e5e03: docs: remove ICS from developer hompage 
* commit '0e61a7268460392b706904c032cb6ae7f931692f':
  docs: remove ICS from developer hompage
 2012-06-23 05:39:32 -07:00
Scott Main
3c91c95e03 am 9b7596e1: am 4708d8f5: Merge "docs: add jelly bean to homepage" into jb-dev 
* commit '9b7596e1cc47ffd52cadfb079670c4d5ac206d7b':
  docs: add jelly bean to homepage
 2012-06-23 05:39:29 -07:00
Adam Powell
f681e74064 am 56fbd14f: am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog 
* commit '56fbd14f3d02220eb3b35b3d62750d12ae402c6e':
  Sanity check while updating volume in MediaRouteChooserDialog
 2012-06-23 05:39:26 -07:00
Adam Powell
0c26f97684 am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit '3b939b7242f9c4155f4d8b34cb474abc77c6417f':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:39:23 -07:00
Scott Main
11905d5974 am b9975454: am fa54ba47: Merge "docs: change class names for links to design docs" into jb-dev 
* commit 'b9975454ed01ba88aaa1b95b631e45e425982564':
  docs: change class names for links to design docs
 2012-06-23 05:39:20 -07:00
Scott Main
0e61a72684 am 6f3e5e03: docs: remove ICS from developer hompage 
* commit '6f3e5e03cf0affcf7d8761fe2ab58b8a1e91d177':
  docs: remove ICS from developer hompage
 2012-06-23 05:37:03 -07:00
Scott Main
9b7596e1cc am 4708d8f5: Merge "docs: add jelly bean to homepage" into jb-dev 
* commit '4708d8f54bc8908c158b8d6f591f9c132e572417':
  docs: add jelly bean to homepage
 2012-06-23 05:37:00 -07:00
Adam Powell
56fbd14f3d am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog 
* commit '1b4ea7eff50545f4673ca01b664e5edccc784688':
  Sanity check while updating volume in MediaRouteChooserDialog
 2012-06-23 05:36:58 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:36:54 -07:00
Scott Main
b9975454ed am fa54ba47: Merge "docs: change class names for links to design docs" into jb-dev 
* commit 'fa54ba47f34a8d536636f823b8085b043b4fd2d6':
  docs: change class names for links to design docs
 2012-06-23 05:36:50 -07:00
Scott Main
6f3e5e03cf docs: remove ICS from developer hompage 
Change-Id: I6c2ca0f8e859a65f2de1d73198af9fd40d374f95
 2012-06-22 22:18:26 -07:00
Scott Main
4708d8f54b Merge "docs: add jelly bean to homepage" into jb-dev 2012-06-22 21:23:20 -07:00
Scott Main
32c1c5cedc docs: add jelly bean to homepage 
Change-Id: I9e94eca22b7255ee84afc5b5ba320368bdfe2200
 2012-06-22 21:21:35 -07:00
Adam Powell
1b4ea7eff5 Sanity check while updating volume in MediaRouteChooserDialog 
Bug 6720224

When a window dies it's possible to receive a lingering ACTION_CANCEL
event to the SeekBar for volume. Be sure that we don't try to mess
with something that's already gone by that point.

Change-Id: I4f6119718fc21204d9013d591bc984b785b698b4
 2012-06-22 20:41:31 -07:00
The Android Automerger
5611a76418 merge in jb-release history after reset to jb-dev 2012-06-22 20:37:59 -07:00
Adam Powell
fd3fd482ab Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 2012-06-22 19:58:13 -07:00
Adam Powell
f3b653a21c Update route count properly when MediaRouteButton detects 
grouped/ungrouped events

Change-Id: I1b00678cc3b548f347c51c3fcbfce18ecc8fbabe
 2012-06-22 19:22:38 -07:00
The Android Automerger
1f7611976d merge in jb-release history after reset to jb-dev 2012-06-22 18:22:43 -07:00
Scott Main
a39d13c1be docs: move NDK into Download section 
Change-Id: I7c16b465c45ac4456f689ff81300f65f767acb12
 2012-06-22 17:15:11 -07:00
Craig Mautner
10943335a4 Merge "Step 1 in consolidating wallpaper animation." 2012-06-22 17:14:29 -07:00
Craig Mautner
9e80944876 Step 1 in consolidating wallpaper animation. 
- Merge testWallpaperAndBackgroundLocked into
updateWindowsAndWallpaperLocked. Eliminates mDetachedWallpaper,
mWindowAnimationBackground, and mWindowAnimationBackgroundColor.

- Merge multiple calls to perform layout into one.

- Cleaned up debug output.

Change-Id: I5dc2d8330dc092ee2b165867cddb7d16b431fa0b
 2012-06-22 17:13:04 -07:00
Jason Simmons
1d11e356f5 am 92f5f589: (-s ours) Do not report a duration for a live stream. 
* commit '92f5f589d21ffe547e4599b3dbc21920770bc08d':
  Do not report a duration for a live stream.
 2012-06-22 17:02:22 -07:00
Scott Main
fa54ba47f3 Merge "docs: change class names for links to design docs" into jb-dev 2012-06-22 17:01:03 -07:00
Irfan Sheriff
491906a7f1 Merge "Move ARP test functionality to ArpPeer" 2012-06-22 16:38:09 -07:00
Jason Simmons
92f5f589d2 Do not report a duration for a live stream. 
Also, do not clamp the playback position to the duration if the duration
is unknown.

Bug: 6672119
Change-Id: Id18bf3d45d4fe7d5edc2ac2da492ca5b4f217826
 2012-06-22 16:19:06 -07:00
Craig Mautner
4170c37446 Merge "Move animation step from layout to animator." 2012-06-22 15:46:28 -07:00
Hiroshi Lockheimer
0f5541775c am 3fee3eb7: am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev 
* commit '3fee3eb7e0a83cd7fc8df3994692232ba6953c02':
  Don't display based on a dummy animation.
 2012-06-22 15:39:55 -07:00
Jeff Brown
8411df2ffd Merge "Remove dead code in PowerManagerService." 2012-06-22 15:37:56 -07:00
Hiroshi Lockheimer
3fee3eb7e0 am 5beeb04b: Merge "Don\'t display based on a dummy animation." into jb-dev 
* commit '5beeb04b528fec320d3453601b4adf4efbd8eba7':
  Don't display based on a dummy animation.
 2012-06-22 15:34:56 -07:00
Jeff Brown
dc6f8b2b8c Merge "Deprecate DatabaseUtils.InsertHelper." 2012-06-22 15:34:33 -07:00
Hiroshi Lockheimer
5beeb04b52 Merge "Don't display based on a dummy animation." into jb-dev 2012-06-22 15:33:15 -07:00
Jeff Brown
b33eb4e32a Deprecate DatabaseUtils.InsertHelper. 
This class does not offer any advantages over SQLiteStatement
and just makes code more complex and error-prone.

Documented that the class is not thread-safe.

Removed a potential deadlock in insert() and replace() caused
by the insertInternal() method being synchronized in the case
where the class was being used concurrently (woe to you!).

Thread A would start a transaction.
Thread B would call insertInternal() and acquire the object monitor,
but block because it could not obtain the db connection because
thread A is holding onto it.
Thread A would call insertInternal() and block because Thread B
was holding the object monitor.
Deadlock.

Changed this code to use a transaction instead of a lock,
which provides the necessary mutual exclusion guarantee without
the potential for a deadlock.  Even so, the class really isn't
thread safe.

Bug: 6625094
Change-Id: I51d9a15567a6f2bad6f25e550b48f8f6ffcab2a7
 2012-06-22 15:24:26 -07:00
The Android Open Source Project
b06e79d737 am de9d2fb6: Reconcile with jb-release 
* commit 'de9d2fb699bd5162a66910e68db989a7bad0575b':
 2012-06-22 15:23:54 -07:00
The Android Open Source Project
de9d2fb699 Reconcile with jb-release 
Change-Id: I55842c8ce980d1a5ea7bb4dcb3eb7d8dd4c9dbac
 2012-06-22 15:20:16 -07:00
Craig Mautner
9c5bf3b36f Don't display based on a dummy animation. 
The Starting window was being made visible early because the app
token had the dummy animation set. When the real animation started
the Starting window picked it up and became transparent causing
the underlying window to become visible again => jank.

Fixes bug 6691421.

Change-Id: I95fe88d2887760e6da3adedeb6be300eb6755283
 2012-06-22 15:19:13 -07:00
The Android Automerger
b519fac279 merge in jb-release history after reset to jb-dev 2012-06-22 15:07:26 -07:00
Ying Wang
bd1404519c am 5539e720: (-s ours) am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '5539e720b45418e5d159a66beb29e38044a5f733':
  Import translations. DO NOT MERGE
 2012-06-22 15:04:22 -07:00
Ying Wang
5539e720b4 am ddeb7bd3: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'ddeb7bd3c7593d51d4d2bfd9fe39d5f0ffa05d89':
  Import translations. DO NOT MERGE
 2012-06-22 15:01:52 -07:00
Ying Wang
ddeb7bd3c7 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-22 14:58:39 -07:00
Ying Wang
604d3eb76a Merge "Import translations. DO NOT MERGE" 2012-06-22 14:58:26 -07:00
Michael Jurka
0adefbd1d1 Merge "Remove duplicate code to update wallpaper" 2012-06-22 14:44:06 -07:00
Michael Jurka
e1a1e40358 am 037faad0: am ab779e0b: Merge "Increase bitmap memory cap for widgets (Bug 6597440)" into jb-dev 
* commit '037faad0f437c5fdc5435c030ef03d61de75090f':
  Increase bitmap memory cap for widgets (Bug 6597440)
 2012-06-22 14:42:07 -07:00