summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Add onSurfaceTextureDestroyed() callback.Romain Guy2011-06-101-10/+37
| | | | | | | | This is needed for Renderscript and it also makes implementations of TextureView cleaner. This change also hooks up the onSurfaceTextureSizeCHanged() callback whenever the view size changes. Change-Id: I2f972ee4504d800329defefacf32cf20547d31a3
* Add a way to measure potential framerate of the view hierarchy.Romain Guy2011-06-092-8/+58
| | | | Change-Id: Ia19c7ed143d8a823fd678ffab84613ea075d228a
* Remove obsolete code.Romain Guy2011-06-084-111/+0
| | | | Change-Id: I2f990528bdc0dc6127f367e55c55287d43dd29f9
* am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTEJohn Wang2011-06-085-1/+405
|\ | | | | | | | | * commit '1f8665895f71904b9d757854277cb637841356c3': Add SIM PUK unlockscreen.
| * am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTEJohn Wang2011-06-075-1/+405
| |\ | | | | | | | | | | | | * commit '71030e536522449f34dc584fda94f34e7be6ee19': Add SIM PUK unlockscreen.
| | * Merge "Add SIM PUK unlockscreen." into honeycomb-LTEJohn Wang2011-06-075-1/+405
| | |\
| | | * Add SIM PUK unlockscreen.John Wang2011-06-075-1/+405
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Puk unlockscreen is implemented as SimPukUnlockScreen. Added config_enable_puk_unlock_screen to control the display of puk unlock screen. Using config_voice_capable to control the display of emergency call button. bug:4384956 Change-Id: I2b8256b4ecdf3d4f1e85c4e868fac1810cfd29be
* | | | The service part of the user space VPN support.Chia-chi Yeh2011-06-083-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | The dialogs will be in another change. Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc
* | | | Merge "Move NDEF URI helper method into android.nfc.NfcRecord"Nick Pelly2011-06-081-0/+91
|\ \ \ \
| * | | | Move NDEF URI helper method into android.nfc.NfcRecordNick Pelly2011-06-081-0/+91
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia044e45cbe2cd06c4844d15a57f1c1f392cf65cd
* | | | | Merge "Add 'Property' object"Chet Haase2011-06-0812-93/+925
|\ \ \ \ \
| * | | | | Add 'Property' objectChet Haase2011-06-0812-93/+925
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a generic Property facility to the SDK, which allows an easy way to reference fields (private or otherwise) in a general way. For example, animations can use this facility to animate 'properties' on target objects in a way that is more code- and compiler-friendly than the existing String-based approach (for objects which have implemented Properties, of course). The animator classes have been updated to use this new approach (in addition to Strings, which are still more generally useful for objects which have get/set functions but not Property objects). The change also includes new Property objects on View (which can now be used in creating animations on Views). There is an unrelated change on GLES20RecordingCanvas to change the way we cache bitmaps, which avoids spurious garbage by using an ArrayList instead of a HashSet. Change-Id: I167b43a3fca20e7695b1a23ca81274367539acda
* | | | | | Merge "Implement Felica timeout handling (API)."Martijn Coenen2011-06-084-11/+28
|\ \ \ \ \ \
| * | | | | | Implement Felica timeout handling (API).Martijn Coenen2011-06-084-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows controlling the timeout for transceive on Felica. Change-Id: I5c62b3ea0e8a16bc006feac6ec759cdb730bc938
* | | | | | | Merge "resolved conflicts for merge of e139167c to master"Robert Greenwalt2011-06-081-9/+7
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ resolved conflicts for merge of e139167c to masterRobert Greenwalt2011-06-081-9/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
| | * | | | | am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-9/+9
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | * commit '5df69fad6e5021d2862bff0553a510f8d6729fbd': Reveal some network constants.
| | | * | | | resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-9/+9
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
| | | | * \ \ \ Merge "Reveal some network constants." into honeycomb-mr2Robert Greenwalt2011-06-071-9/+9
| | | | |\ \ \ \
| | | | | * | | | Reveal some network constants.Robert Greenwalt2011-05-311-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we've already decided to inc the sdk version we should try to get these in too. bug:4500218 Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
* | | | | | | | | Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"Mike Lockwood2011-06-081-20/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | UsbManager: Clean up extras for ACTION_USB_STATE broadcastMike Lockwood2011-06-081-20/+19
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added name for new PTP USB function Change-Id: Ia2775ba2b23ef6a6108ca7e060239eb51c2eecc8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | Merge "Updates to Camera API documentation."Eino-Ville Talvala2011-06-081-67/+98
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updates to Camera API documentation.Eino-Ville Talvala2011-06-071-67/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I716a36becce436f57ea62fcfecd9021eb29b76ea
* | | | | | | | | | Merge "Merge WebKit at r82507: Update useragent string"Steve Block2011-06-081-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge WebKit at r82507: Update useragent stringSteve Block2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie24ef844bdaf07a6aee848a04a49d0845b52ee64
* | | | | | | | | | Merge "Fix the display name of InputMethodSubtype"satok2011-06-081-13/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix the display name of InputMethodSubtypesatok2011-06-081-13/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also fixed hashCode Change-Id: I4ef4bf42e4b73d11e23a89c5df3947411e654c04
* | | | | | | | | | | Merge "Fix the threading behaviour of TTS audio requests."Narayan Kamath2011-06-087-240/+686
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Fix the threading behaviour of TTS audio requests.Narayan Kamath2011-06-077-240/+686
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All audio is played back on a separate thread. Change-Id: I2bbb7b3140f6a04ef705cadb2bd1ae88951e3c48
* | | | | | | | | | Intent to manage application network data usage.Jeff Sharkey2011-06-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will be launched by Settings when presenting detailed network data usage for a specific application. Offers easy access into application settings to change behavior. Change-Id: I4ee0fdbc69f6a800ad59aca8db6b21f15ca71a66
* | | | | | | | | | Compute range-based usage in NetworkStatsHistory.Jeff Sharkey2011-06-072-2/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given a start/end range, interpolate between buckets to return the total network usage. Used to summarize detailed UID stats. Method to combine NetworkStatsHistory regardless of bucket size. Used to combine all histories matching a template. Added tests for both methods. Change-Id: Ia463910c0ecf7cf08dcf97c658ad99742bd6b882
* | | | | | | | | | UID network stats, secure settings, and random.Jeff Sharkey2011-06-073-10/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collect UID-granularity network stats during regular poll event. Add dumpsys argument to generate fake historical data for debugging, and move stats parameters to Settings.Secure. Change-Id: I09b36a2955dc10c697d4b9c3ff23dcb3ac37bd70
* | | | | | | | | | Map network identity using ConnectivityService.Jeff Sharkey2011-06-0710-62/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of deriving network identity based on raw subsystem broadcasts, listen for updates from ConnectivityService. Added atomic view of all active NetworkState, and build map from "iface" to NetworkIdentity set for stats tracking. To avoid exposing internal complexity, INetworkStatsService calls use general templates. Added TelephonyManager mapping to classify network types using broad labels like "3G" or "4G", used to drive templates. Cleaned up Objects and Preconditions. Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
* | | | | | | | | | Merge "Use external/mockwebserver in frameworks/base"Jesse Wilson2011-06-074-14/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use external/mockwebserver in frameworks/baseJesse Wilson2011-06-074-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb45671e3e7256692c74587984ee5fe1d0eca181
* | | | | | | | | | | resolved conflicts for merge of a7d01a75 to masterAdam Powell2011-06-071-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
| * | | | | | | | | | am 212d15c7: am a476813d: Make Theme.Holo.Light.NoActionBar and ↵Adam Powell2011-06-071-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Theme.Holo.Light.NoActionBar.Fullscreen public. * commit '212d15c746f2611339026c16e5fa1aeb7f9090b7': Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
| | * | | | | | | | | am a476813d: Make Theme.Holo.Light.NoActionBar and ↵Adam Powell2011-06-071-0/+4
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Theme.Holo.Light.NoActionBar.Fullscreen public. * commit 'a476813dccec241632810c1cbb11bcfbf17841b0': Make Theme.Holo.Light.NoActionBar and Theme.Holo.Light.NoActionBar.Fullscreen public.
| | | * | | | | | | Make Theme.Holo.Light.NoActionBar andAdam Powell2011-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Theme.Holo.Light.NoActionBar.Fullscreen public. Change-Id: I623b5908b080e8703b825707a024fa922cd954ab
* | | | | | | | | | resolved conflicts for merge of 8b2c0014 to masterJeff Brown2011-06-071-3/+37
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
| * | | | | | | | | am b3536145: am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into ↵Jeff Brown2011-06-061-3/+37
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'b3536145725250401d25ffa00cda85d222dfc21e': Touch pad improvements. Bug: 4124987
| | * | | | | | | | am ed48fa89: Merge "Touch pad improvements. Bug: 4124987" into honeycomb-mr2Jeff Brown2011-06-061-3/+37
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ed48fa89a8e31b04681347a9235c2a566e7dbb8e': Touch pad improvements. Bug: 4124987
| | | * | | | | | | Touch pad improvements.Jeff Brown2011-06-061-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4124987 Only show one spot per touch point instead of one spot per finger for multitouch gestures. Tweaked the pointer acceleration curves. Dissociated the hover/tap timeouts from the "tap" timeout since they mean very different things. Change-Id: I7c2cbd30feeb65ebc12f6c7e33a67dc9a9f59d4c
* | | | | | | | | | am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when ↵Jeff Brown2011-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | / / / / / / | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | using the mouse wheel." into honeycomb-mr2 * commit 'c3709f2509bfc15d13a590b8342503f858ee67e2': Improve browser scrolling when using the mouse wheel.
| * | | | | | | | am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the ↵Jeff Brown2011-06-061-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mouse wheel." into honeycomb-mr2 * commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e': Improve browser scrolling when using the mouse wheel.
| | * | | | | | | am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." ↵Jeff Brown2011-06-061-1/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit 'c1830a77a7fe0f1ccd52f405cb076d40fe085e2f': Improve browser scrolling when using the mouse wheel.
| | | * | | | | | Improve browser scrolling when using the mouse wheel.Jeff Brown2011-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way that smooth scrolling is implemented in the Browser, repeated requests to scroll by a certain amount do not add up to one large scroll by the cumulative amount. This makes the mouse wheel unusable on large pages because the Browser will scroll at a more or less constant rate no matter how often the wheel is turned. The fix is to not animate scrolls when using the mouse wheel. Change-Id: I23c05cdd2383944b8730deb225b7f3f57f1729df
| * | | | | | | | Merge branch 'honeycomb-plus-aosp' of ↵Nick Pelly2011-06-0641-2/+412
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
| | * \ \ \ \ \ \ \ am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-06-0641-2/+412
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d': Import revised translations. DO NOT MERGE