Commit Graph

45905 Commits

Author SHA1 Message Date
Hiroshi Yamauchi
f045198fb3 Merge "Deprecate things that rely on Debug.startAllocCounting." 2015-03-06 17:43:53 +00:00
Torne (Richard Coles)
8c1db3734f Merge "Fix typo in WebSettings javadoc." 2015-03-06 17:25:49 +00:00
James Cook
f7e503de70 Merge "Support undo of some programmatic TextView changes" 2015-03-06 15:42:06 +00:00
Torne (Richard Coles)
2b666c96e2 Fix typo in WebSettings javadoc.
We accidentally repeated the same enum value twice; fixed to mention the
three values correctly.

Change-Id: Iba6a7edd8e1a5b429728056a8f56634427758c73
2015-03-06 14:20:00 +00:00
Mikhail Naganov
25e8954573 Provide better error reporting for WebView
Add new callbacks into WebViewClient that will provide notifications
about subresource loading errors and HTTP errors received from servers.

Bug: 19313118
Change-Id: Idb47f53ef7e72cb95f3e9b89d1e238d69e896b8b
2015-03-06 10:12:14 +00:00
Scott Kennedy
5dc5c0aac8 Merge "Mark setAccessibilityDelegate()'s argument as @Nullable" 2015-03-06 02:31:30 +00:00
Scott Kennedy
89809a1cd4 Mark setAccessibilityDelegate()'s argument as @Nullable
Change-Id: I3c087e953e29e81285fc8efa4157f694eeaf075d
2015-03-05 17:49:11 -08:00
John Reck
0affc5f3eb Merge "Cleanup Bitmap JNI attempt #2" 2015-03-05 23:55:14 +00:00
Julia Reynolds
2482100fed Merge "Allow device and profile owners to set a user icon." 2015-03-05 23:39:04 +00:00
Yigit Boyar
38d909a57d Fix build. getAlingment should not be public
Change-Id: I4abde1ddc78367795601215106388d6eb535cbca
2015-03-05 22:40:06 +00:00
Yigit Boyar
6dafd87fb4 Fix some weight bugs in grid layout
This CL also changes how GONE views are considered.
Previously, they would still participate in weight calculations.
Now, they are ignored.

Bug: 19546781

Sub bugs:

Bug: 19571249
Bug: 19571653
Bug: 19571319
Bug: 19571841
Change-Id: I7344f757d3a76be98bb92660f07d2a0cafa9ac12
2015-03-05 22:01:14 +00:00
John Reck
f4faeac352 Cleanup Bitmap JNI attempt #2
Original version missed a spot

This reverts commit c02977e3bb.

Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
2015-03-05 13:56:16 -08:00
Raph Levien
560a433c44 Merge "Add JNI StaticLayout.Builder" 2015-03-05 21:26:32 +00:00
Chad Jones
b9a468eb19 Merge "Revert "Cleanup Bitmap JNI"" 2015-03-05 19:35:15 +00:00
Chad Jones
c02977e3bb Revert "Cleanup Bitmap JNI"
This reverts commit b2915245b7.

Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
2015-03-05 19:34:26 +00:00
Brian Attwell
54b804fa74 Merge "Prioritize regular names over phonetic names. P1" 2015-03-05 19:26:36 +00:00
Hiroshi Yamauchi
172da26d45 Deprecate things that rely on Debug.startAllocCounting.
android.os.Debug.startAllocCounting() is deprecated but other things
that rely on it or do not make sense without it aren't deprecated.

Bug: 8241521
Change-Id: Ib769cb8f4e96f41ed310e17e7345acb2a630a076
2015-03-05 11:22:37 -08:00
John Reck
35da7d904b Merge "Cleanup Bitmap JNI" 2015-03-05 18:12:35 +00:00
Raph Levien
4c1f12efcf Add JNI StaticLayout.Builder
This patch adds a native C++ Builder object for StaticLayout to
complement the Java one introduced in a previous patch.

The Builder object contains state used in constructing a layout, as well
as temporary buffers, to avoid having to allocate such. In particular,
it holds a break iterator, so avoids the cost of constructing that in
the common case of a single locale.

Change-Id: I1125103b7ccf00b8674c1586c3ea8d5d915fdd5b
2015-03-05 10:07:33 -08:00
John Reck
b2915245b7 Cleanup Bitmap JNI
Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense

Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
2015-03-05 09:55:02 -08:00
Julia Reynolds
be331a3809 Merge "Add security check for clearDeviceInitializer in the service." 2015-03-05 17:52:21 +00:00
Andreas Gampe
d833ba8d4e am ecb48c16: am 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit 'ecb48c16b7839bdcda84ac0ba7c61248b814eb71':
  Frameworks/base: Add removeAll for ArraySet
2015-03-05 17:41:14 +00:00
Andreas Gampe
ecb48c16b7 am 9c0ba24f: am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '9c0ba24f3b54fa7916626f3d76ec6818d78ca47e':
  Frameworks/base: Add removeAll for ArraySet
2015-03-05 17:33:13 +00:00
Andreas Gampe
9c0ba24f3b am 6695b992: Merge "Frameworks/base: Add removeAll for ArraySet"
* commit '6695b9920d15f8d9a17d6b0c66b863d1c2e38584':
  Frameworks/base: Add removeAll for ArraySet
2015-03-05 17:15:58 +00:00
Julia Reynolds
1c3754a35c Add security check for clearDeviceInitializer in the service.
Bug: 19230954
Change-Id: I5c648492bef0d2b579b6f59b91afc890e3092d36
2015-03-05 11:47:14 -05:00
Mady Mellor
138bc2f37b Merge "Text selection changes - smart handles & drag accelerator" 2015-03-05 15:15:26 +00:00
Benjamin Franz
43261140c3 Clean up the lock task APIs for COSU devices.
Clean up and increase readability of internal handling of lock task mode APIs.
Add a public API to query the lock task mode state with pinned and locked as
possible outcomes. Additionally, change wording in lock task toasts when in
locked mode and update the javadoc regarding onLockTaskModeEntering and
onLockTaskModeExiting to represent the actual behaviour.

Bug: 19377096
Change-Id: Ia563078ca6ef6d6fc7e75130e6b94ba18af69340
2015-03-05 15:02:27 +00:00
Brian Attwell
643db51d4e Prioritize regular names over phonetic names. P1
Bug: 19587274
Change-Id: I503c0fff6da30b9f1d6b6cbeaedfc4d9314f8a00
2015-03-05 05:54:04 +00:00
Andreas Gampe
f9345e93db Frameworks/base: Add removeAll for ArraySet
Add a simple ArraySet.removeAll(ArraySet) method. This avoids two
allocations, a MapCollections helper and an Iterator object, over
the removeAll(Collection) code.

KeySetManagerService heavily calls removeAll during boot (about 9K
times in AOSP). This reduces GC stress and optimizes the removal
(about half the time the removed collection has only one element).
The removal method in KeySetManagerService is also done under a lock,
so that it gates parallelization efforts in PackageManagerService.

Bug: 19498314
Change-Id: Ib0e483adfd09831cd66ab19a820ebf6544a2b66f
2015-03-04 17:14:10 -08:00
Adam Powell
27b7c1f526 Merge "Add ChooserTargetService API" 2015-03-05 00:07:53 +00:00
Julia Reynolds
a9b33ddf31 Merge "DOs can clear the DI; rehide hasUserSetupCompleted." 2015-03-04 22:38:23 +00:00
Julia Reynolds
e925440a55 DOs can clear the DI; rehide hasUserSetupCompleted.
Bug: 19230954
Change-Id: I97467229b23f3c9be1c3c4fff1c888a812f14a95
2015-03-04 17:36:00 -05:00
Raph Levien
35091569b9 Merge "Some refactoring of StaticLayout" 2015-03-04 22:28:19 +00:00
Adam Powell
e30c9af356 Add ChooserTargetService API
A ChooserTargetService can be implemented by apps that wish to offer
additional deep-link targets for the system intent chooser to in turn
offer to the user. This allows apps to create contextually relevant
shortcuts for UI flows that would otherwise require several steps of
explicit disambiguation. For example, a chat app might offer one-touch
access to recent conversations when sharing a photo to it from
elsewhere.

The chooser implementation must limit the number of
ChooserTargetServices it elects to query in order to respect available
system resources. Only the system chooser is permitted to bind to a
ChooserTargetService.

Change-Id: Ia7e075ee649c51cf2035f20aee166c5a27d91aeb
2015-03-04 14:23:30 -08:00
Raph Levien
d3ab692d28 Some refactoring of StaticLayout
This patch refactors construction of StaticLayout to use an explicit
Builder object, which is intended to hold state used for constructing
the layout but not needed for merely reading out the results.

Builder objects are allocated from a pool and explicitly recycled,
so there is insignificant additional allocation cost.

This patch has very little impact on performance (it does avoid
allocating a FontMetricsInt object) but opens the way for significant
performance and functionality improvements as more of the Builder
functionality migrates to native code.

Change-Id: I2a576643e573a38b61f895a80d5d92a85c94b6b4
2015-03-04 13:49:12 -08:00
Dianne Hackborn
e56301f16a Merge "Fix reading of daily data." 2015-03-04 21:34:12 +00:00
Dianne Hackborn
8cfb58bd58 Fix reading of daily data.
Change-Id: I1f581197c938109cfe5cc21109eea57b4e0434dc
2015-03-04 13:28:36 -08:00
Julia Reynolds
fca04ca096 Allow device and profile owners to set a user icon.
Change-Id: I7c2bafb85cff3fa063af7a2f27b76c69172f0525
2015-03-04 16:04:22 -05:00
Julia Reynolds
20118f18c1 Allow the device initializer to perform user setup tasks.
A device initializer is an application that is allowed to run
during user provisioning on device owner devices. During
device provisioning (or, user provisioning of the first user
of the device), a device initializer is granted device owner
permissions. During secondary user provisioning, a device
initializer is granted profile owner permissions. Once
provisioning is complete for a user, all elevated permissions
are removed from the device initializer and the device admin
component of the app is disabled.

Bug: 19230954
Change-Id: Ib6725fb3b09bb21e4198a5dc0b445ccebb40b27e
2015-03-04 10:25:43 -05:00
Dianne Hackborn
7d088428f3 Merge "Add new "daily stats" tracking to battery stats." 2015-03-04 00:57:54 +00:00
Dianne Hackborn
d4a8af7b6a Add new "daily stats" tracking to battery stats.
Currently is only used for tracking the daily charge
and discharge rates.  We keep up to 10 days of data.

Change-Id: I54e29e35ff60d9277da9e476cdab22f4a6d540bf
2015-03-03 15:38:58 -08:00
George Mount
95d2b1032f Merge "Fix TransitionManager.go not running transition." 2015-03-03 23:37:21 +00:00
George Mount
96e54dcfa4 Fix TransitionManager.go not running transition.
Bug 19459362

Change-Id: I17595390c9fb289dec8de44447ca490c46570fb4
2015-03-03 15:28:44 -08:00
James Cook
48e0fac6c2 Support undo of some programmatic TextView changes
Applications can use TextWatcher.afterTextChanged() to implement
post-edit formatting of text, such as inserting spaces in a credit
card number. From the user's perspective, the insertion of the spaces
is not a separate action, so that change should be merged with the
previous undo operation.

* Force merge undo states for edits that are triggered by callbacks
  after the InputFilter, such as TextWatchers.
* Reset the undo state when the whole field is reset with setText().
* Create separate undo operations for direct programmatic changes to
  the Editable (e.g. directly calling insert).
* Remove part of the non-forced replacement edit merging code. An
  improved version will land in the next CL.

Bug: 19332904
Change-Id: Iba5366a5aadbe3534554b668f8d417250deff505
2015-03-03 14:32:44 -08:00
Craig Mautner
4bd091414a am 5d3f00e3: am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
* commit '5d3f00e38b84c107037de1250a6e55d89f84ef77':
  Change ActivityView startActivity state sequence
2015-03-03 22:25:13 +00:00
Chien-Yu Chen
a0e17fafa1 Merge "CameraManager: implement flashlight controls" 2015-03-03 22:24:12 +00:00
Chien-Yu Chen
afa91399fd CameraManager: implement flashlight controls
Implement the flashlight controls and callbacks and update the
torch mode states.

Bug: 2682206
Change-Id: I59025f34f9ece75dd535166a25c428b8d68c6e4b
2015-03-03 13:55:07 -08:00
Joe Fernandez
2eedc9f96a resolved conflicts for merge of 5864f5ed to master
Change-Id: I6e413076af7fce85a5300abb2ba529c589dbc7e8
2015-03-03 13:08:57 -08:00
Craig Mautner
5d3f00e38b am 358188f5: Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev
* commit '358188f5891f5645dbff4fd8cb1a3e7341371f74':
  Change ActivityView startActivity state sequence
2015-03-03 21:08:45 +00:00
Craig Mautner
358188f589 Merge "Change ActivityView startActivity state sequence" into lmp-mr1-modular-dev 2015-03-03 21:03:29 +00:00