summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | Merge "Warn about changed behavior around '+' characters."Jesse Wilson2011-11-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Warn about changed behavior around '+' characters.Jesse Wilson2011-11-111-0/+3
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://code.google.com/p/android/issues/detail?id=21064 Change-Id: I086c2c8433f05185a1496e2662734d239d8cbb74
* | | | | | | | | | | | | | | | | am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ↵Akwasi Boateng2011-11-1113-32/+198
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp * commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8': Make the overridden ImageView#setVisibility remotable Clamp non-monotonic stats instead of dropping. DO NOT MERGE. Fix leak in LayoutTransition Fix lastVisible/global rects Fix Wimax-less build. Fix leak in LayoutTransition Deferring wallpaper update to improve workspace scrolling (issue 5506959) Terminate EGL when an app goes in the background boot animation is dithered and scaled Fix NdefRecord byte-stream constructor. PopupWindow dismiss() can get into a recursive loop. Fold WiMAX state into the mobile RSSI. Remove dedicated wimax icon to fix RSSI layout.
| * | | | | | | | | | | | | | | am 7b8bec28: Merge "PopupWindow dismiss() can get into a recursive loop." ↵Svetoslav Ganov2011-11-111-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit '7b8bec280f20e8a5863d8214bbc195497335eba6': PopupWindow dismiss() can get into a recursive loop.
| | * | | | | | | | | | | | | | Merge "PopupWindow dismiss() can get into a recursive loop." into ics-mr0Svetoslav Ganov2011-11-111-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | PopupWindow dismiss() can get into a recursive loop.Svetoslav Ganov2011-11-101-1/+2
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The dismiss method in a PopupWindow is first removing the popup View from the WindowManager and then if the content View differs from the popup View the former is removed from the latter. Then dismiss() clears the dismissed flag so a subsequent call to dismiss() is a NOP. However, removing a View both from the WindowManager and from its parent ViewGroup triggers stuff wich may lead to a subsequent call to dismiss(). This leads to a stack overflow exception. bug:5598944 Change-Id: I2aeeda591be3e9aa98fec1ee17ea8f0e746e6992
| | * | | | | | | | | | | | | | DO NOT MERGE. Fix leak in LayoutTransitionChet Haase2011-11-101-0/+9
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutTransition was making an incorrect assumption that there could only be one transition animation on a child of a transitioning container. But if multiple children are added/removed to/from that container, there would be multiple calls to set up changing animations for each existing child of that container. This meant that the child would have multiple, new OnLayoutChangeListeners added to it as part of the setup process. Meanwhile, we would cache only the latest listener in a hashmap that used the child as a key for the listener. Then when we cleaned up the hashmap later, we would remove only the latest listener from the child, leaving the rest there for eternity. The fix is to skip the setup entirely for children that already have listeners set on them; they must, if that's the case, already have been set up and are already listening for layout changes. Setting up the animation is redundant, and adding another listener is a leak. issue #5588509: memory leak in systemui Change-Id: Ie2192593d84702be7243c18760dfdb3a027b761c
| | * | | | | | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-085-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46ccb7f02a64e3e6c7597b0dc295450b4f5625e6
| * | | | | | | | | | | | | | Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1Jeff Sharkey2011-11-101-1/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Clamp non-monotonic stats instead of dropping.Jeff Sharkey2011-11-101-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When encountering non-monotonic stats rows, recover remaining data by clamping to 0. In particular, this avoids edge-case where persisting threshold checks would never trigger. Also recover when tethering snapshots are missing. Bug: 5600785, 5433871, 5600678 Change-Id: I1871954ce3955cc4ac8846f9841bae0066176ffe
| * | | | | | | | | | | | | | | Merge "Make the overridden ImageView#setVisibility remotable" into ics-mr1Adam Powell2011-11-101-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Make the overridden ImageView#setVisibility remotableAdam Powell2011-11-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idaf061ea8c2a06ec8abaf74cf865446d9092afa2
| * | | | | | | | | | | | | | | | Merge "Deferring wallpaper update to improve workspace scrolling (issue ↵Adam Cohen2011-11-101-11/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | / / / | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | 5506959)" into ics-mr1
| | * | | | | | | | | | | | | | Deferring wallpaper update to improve workspace scrolling (issue 5506959)Adam Cohen2011-11-101-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -> On the Xoom, this change gets us back up to 60 fps. The change is really more of a workaround for the fact that we don't have vsync, and we ought to be able to change it back once we do. Change-Id: I80888f18887bf5f2fed72c19641ed430ef6dbfcf
| * | | | | | | | | | | | | | | Merge "Fix lastVisible/global rects" into ics-mr1John Reck2011-11-101-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix lastVisible/global rectsJohn Reck2011-11-101-4/+4
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5601629 References tend to always be equal to the things they are referencing, use copies instead. Change-Id: I0827878e91ef1fa6e0abe2d6499d55f4a211d890
| * | | | | | | | | | | | | | | Merge "Fix NdefRecord byte-stream constructor." into ics-mr1Martijn Coenen2011-11-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Fix NdefRecord byte-stream constructor.Martijn Coenen2011-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5601404 Change-Id: I30fada97487829a8b2ccc1a1e7a32837c29ddd70
| * | | | | | | | | | | | | | | | Merge "Fix leak in LayoutTransition" into ics-mr1Chet Haase2011-11-101-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix leak in LayoutTransitionChet Haase2011-11-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutTransition was making an incorrect assumption that there could only be one transition animation on a child of a transitioning container. But if multiple children are added/removed to/from that container, there would be multiple calls to set up changing animations for each existing child of that container. This meant that the child would have multiple, new OnLayoutChangeListeners added to it as part of the setup process. Meanwhile, we would cache only the latest listener in a hashmap that used the child as a key for the listener. Then when we cleaned up the hashmap later, we would remove only the latest listener from the child, leaving the rest there for eternity. The fix is to skip the setup entirely for children that already have listeners set on them; they must, if that's the case, already have been set up and are already listening for layout changes. Setting up the animation is redundant, and adding another listener is a leak. issue #5588509: memory leak in systemui Change-Id: I2c9f312cc2bcf4f2d08ac6b5d8f8e495aa4f3597
| * | | | | | | | | | | | | | | | Merge "Terminate EGL when an app goes in the background" into ics-mr1Romain Guy2011-11-106-14/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Terminate EGL when an app goes in the backgroundRomain Guy2011-11-107-14/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not happen on high end gfx devices. This happens only if only one EGL context is initialized in the current process. Change-Id: Ibd1737efdf84eef8a84108b05795440d1ae9964e
* | | | | | | | | | | | | | | | | am f1062114: am a3cc20ff: Merge "Initialize egl_cache with an app writeable ↵Romain Guy2011-11-105-1/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file" into ics-mr1 * commit 'f1062114874f1cf46de479031d9ad3ad3cae1131': Initialize egl_cache with an app writeable file
| * | | | | | | | | | | | | | | | Merge "Initialize egl_cache with an app writeable file" into ics-mr1Romain Guy2011-11-105-1/+99
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Initialize egl_cache with an app writeable fileRomain Guy2011-11-105-1/+99
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5dda234feab0fedd6e4179a80715ae20dee1c833
* | | | | | | | | | | | | | | | am f52df796: am 15843aa5: Merge "lock pattern width spec set to max" into ↵Peter Ng2011-11-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit 'f52df7961f29a2f508fb7421f8cd9c95b9b409aa': lock pattern width spec set to max
| * | | | | | | | | | | | | | | Merge "lock pattern width spec set to max" into ics-mr1Peter Ng2011-11-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | lock pattern width spec set to maxPeter Ng2011-11-091-1/+1
| | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5853d3c7ee2d2330c06f5c802f66249ab3f2694
* | | | | | | | | | | | | | | | am 08158c55: am bce7812b: Merge "Cleaning up tablet assets by deleting ↵Peter Ng2011-11-1080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drawable-xlarge and large folders" into ics-mr1 * commit '08158c5526ded5599b183e5d8380809571e5c56a': Cleaning up tablet assets by deleting drawable-xlarge and large folders
| * | | | | | | | | | | | | | | Merge "Cleaning up tablet assets by deleting drawable-xlarge and large ↵Peter Ng2011-11-1080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders" into ics-mr1
| | * | | | | | | | | | | | | | Cleaning up tablet assets by deleting drawable-xlarge and large foldersPeter Ng2011-11-1080-0/+0
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -keeping default wallpaper in xlarge-nodpi Bug:5596158 Change-Id: I18ec8b0aa648fa95a1f6ebb4380c630f05e24ecb
* | | | | | | | | | | | | | | am aa771ceb: am 71282a47: Merge "Fix access modifiers on ImageView ↵Adam Powell2011-11-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overrides" into ics-mr1 * commit 'aa771ceb0919f2a66ba9c927e5617d15471d70e2': Fix access modifiers on ImageView overrides
| * | | | | | | | | | | | | | Fix access modifiers on ImageView overridesAdam Powell2011-11-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I64cc10c877ac4adc4b79abcd7c7617480bd82906
* | | | | | | | | | | | | | | Merge "Import revised translations."Eric Fischer2011-11-1046-4943/+4959
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Import revised translations.Eric Fischer2011-11-1046-4943/+4959
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac6e1ff785d898d65934cdfdaf3d92a56324282c
* | | | | | | | | | | | | | | | am ba44080d: am 67121fd7: Merge "Fix bug 5581874 - Animated drawables don\'t ↵Adam Powell2011-11-102-4/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start as expected" into ics-mr1 * commit 'ba44080d834d23d0bc7d118a4950f837eeaca96a': Fix bug 5581874 - Animated drawables don't start as expected
| * | | | | | | | | | | | | | | Merge "Fix bug 5581874 - Animated drawables don't start as expected" into ↵Adam Powell2011-11-102-4/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1
| | * | | | | | | | | | | | | | | Fix bug 5581874 - Animated drawables don't start as expectedAdam Powell2011-11-102-4/+36
| | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug that caused animated drawables to not schedule properly when a view has not yet been attached. Also make ImageViews update their drawable visibility state properly, which will handle scheduling concerns as ImageViews are attached and detached from their windows. This should also fix the bug where animated notification icons in the status bar do not animate until the posting app posts an update to the notification. Change-Id: I24c403182831258d1f251736e920c9efe1d38299
| * | | | | | | | | | | | | | | Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." ↵Martijn Coenen2011-11-101-0/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (DO NOT MERGE)." into ics-mr1
| | * | | | | | | | | | | | | | Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT ↵Martijn Coenen2011-11-101-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE). This reverts commit 562dfff65ac79590c0b7c50019cd3d107e8b4e0e. These API's are still used by GMM in the version that ships with MR1, so we need them to keep Beam working for GMM. Note that these APIs are hidden. From version 5.13 onwards GMM will use the new API's. Change-Id: I316a9c9b7d0052a14f6c1df70f2ed463bca61800
* | | | | | | | | | | | | | | | am 0bbd151e: am faa81c82: Merge "Revert "Add new secure setting for ↵Tom Taylor2011-11-102-19/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controlling Messaging notifications"" into ics-mr1 * commit '0bbd151e1dab043226725d23f0ca26f4d09ee76f': Revert "Add new secure setting for controlling Messaging notifications"
| * | | | | | | | | | | | | | | Merge "Revert "Add new secure setting for controlling Messaging ↵Tom Taylor2011-11-102-19/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications"" into ics-mr1
| | * | | | | | | | | | | | | | Revert "Add new secure setting for controlling Messaging notifications"Tom Taylor2011-11-102-19/+1
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 03da2f00aac04e6565a02cf5a9bf6bb1ec926930. Committer: Tom Taylor <tomtaylor@google.com> On branch revertsetting Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: api/current.txt modified: core/java/android/provider/Settings.java modified: core/java/android/provider/Telephony.java modified: packages/SettingsProvider/res/values/defaults.xml modified: packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java We've decided not to disable messaging notifications with a secure setting. Instead, all the work will be done within the messaging app itself. Change-Id: Icde6894e76da1007b6026c8ec7dc56e488453c06
* | | | | | | | | | | | | | | am 22c2d1d6: am c1c5d4fa: Merge "Add a sound-playing method to Camera API." ↵Eino-Ville Talvala2011-11-101-3/+206
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '22c2d1d6ae48c348f4c331361a6e3f2c63b2aa8f': Add a sound-playing method to Camera API.
| * | | | | | | | | | | | | | Add a sound-playing method to Camera API.Eino-Ville Talvala2011-11-101-3/+206
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow applications with non-standard Camera use cases to use the platform sound files and routing, add a method to play any of the standard Camera sounds (shutter, autofocus, record start/stop) using a background thread. Bug: 5447107 Change-Id: I2524853a626e3ce334a7aad2f7de061d5c04abd0
* | | | | | | | | | | | | | am 0f077739: am 843e04d9: Merge "Pause drawing when not visible" into ics-mr1John Reck2011-11-101-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f0777399defe6bca965d9c33e9dfe256eb56fee': Pause drawing when not visible
| * | | | | | | | | | | | | Merge "Pause drawing when not visible" into ics-mr1John Reck2011-11-101-0/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Pause drawing when not visibleJohn Reck2011-11-091-0/+28
| | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5594608 If onPause is called or if the view or view's window is no longer visible, pause webview drawing. Calls to onDraw will continue to work, but animations and other continual drawing will stop Change-Id: I11640f087852d1a9a33b945ff72297fab1d25b94
| * | | | | | | | | | | | | Merge "DO NOT MERGE Set the initial scroll position for RTL." into ics-mr1George Mount2011-11-103-21/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | DO NOT MERGE Set the initial scroll position for RTL.George Mount2011-11-093-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5268793 Webkit knows about the correct initial position for web pages. On initial show, scroll to the webkit position. Cherry-picked from master CL: I2537b84a External WebKit CL: I6a91b97f Change-Id: I2537b84a30a26a79a8a0f23fe62b9ed757f9c5a4
generated by cgit v1.1 at 2025-03-23 16:26:36 +0000