Commit Graph

45861 Commits

Author SHA1 Message Date
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
Craig Mautner
b916836e8d Change ActivityView startActivity state sequence
Problems arise if an activity is started in an ActivityView when the
parent activity is not resumed. In particular the ActivityView can
be brought to the front in front of other activities that have been
started by the parent.

This change checks the state of the parent when the ActivityView is
starting and if it is not resumed, throws an Exception.

This change also removes the queueing up of Intents if the surface
does not exist when startActivity is called. Now, the owner of the
ActivityView is notified when the surface becomes available. If
startActivity is called before that notification an Exception will be
thrown.

Fixes bug 19147472.

Change-Id: I6712cf1929fe65c4238ce7f3feb4e8511ed97244
2015-03-03 10:15:21 -08:00
Chris Craik
4939e2bf36 Merge "Improve docs for drawable tint and color filters" 2015-03-03 16:46:48 +00:00
Joe Fernandez
5864f5ed4b am 55902316: am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '559023163d7e9e0aad4846bc0fccfc5c28705ec7':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:48:21 +00:00
Joe Fernandez
559023163d am 1137ca03: am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '1137ca03be9b9143c472d9adc51ea511cfd68a6b':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:42:39 +00:00
Joe Fernandez
1137ca03be am 246a3a4a: am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '246a3a4a797edf5850073ec8f6b8aa997947d09b':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:36:02 +00:00
Joe Fernandez
246a3a4a79 am 14fcef3b: am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit '14fcef3bf02f46a057676d7a6d755daee735c4ea':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:29:33 +00:00
Joe Fernandez
14fcef3bf0 am c4418980: am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit 'c4418980a083c1cd26b789297f084e03036b5fdd':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:22:42 +00:00
Joe Fernandez
c4418980a0 am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
  Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:15:29 +00:00
Selim Gurun
9205071093 am 545093df: am 75666e90: Merge "Revert "Add potential future APIs for postmessage""
* commit '545093df16ed2a94c1636ec8e8148574e6cad303':
  Revert "Add potential future APIs for postmessage"
2015-03-03 02:28:48 +00:00
Selim Gurun
545093df16 am 75666e90: Merge "Revert "Add potential future APIs for postmessage""
* commit '75666e9054d97a9daecd5648f71414406413c6d9':
  Revert "Add potential future APIs for postmessage"
2015-03-03 02:20:57 +00:00
Selim Gurun
75666e9054 Merge "Revert "Add potential future APIs for postmessage"" 2015-03-03 02:14:19 +00:00
Selim Gurun
49f9ad8e2a Revert "Add potential future APIs for postmessage"
This reverts commit 37bd8907cb.

Change-Id: Iaa9356b95859846ce9c3209d3d1bcfc800d2ff93
2015-03-03 01:54:25 +00:00
Andrew Solovay
27f5337841 Minor typo fixes in managed profile Javadoc reference pages.
See first comment for stage location.

bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
2015-03-02 17:22:18 -08:00
Santos Cordon
c66f3baa42 Hide calllog entries for unregistered phone accounts
Change-Id: If1f873dd41c973442fa7a24020e56d13b7b5ad2c
2015-03-03 00:33:35 +00:00
Chris Craik
bd3bfc5285 Improve docs for drawable tint and color filters
bug:19564477
Change-Id: I7e11baae2d4dd245965904c85b8855de71f6b6ac
2015-03-02 16:21:02 -08:00
Ed Heyl
93cbe27804 Fix build: Revert "Add potential future APIs for postmessage"
This reverts commit 37bd8907cb.
2015-03-02 16:03:52 -08:00
Selim Gurun
61c5cf135d am 4de38166: am aef98356: am 9fc8356b: Merge "Add potential future APIs for postmessage"
* commit '4de38166c6dbc1108a64cf772abe61b6ddaa2804':
  Add potential future APIs for postmessage
2015-03-02 23:21:54 +00:00
Selim Gurun
4de38166c6 am aef98356: am 9fc8356b: Merge "Add potential future APIs for postmessage"
* commit 'aef983562a74cfd573bd5a13dd5bf9123fd3b92f':
  Add potential future APIs for postmessage
2015-03-02 23:14:36 +00:00
Selim Gurun
aef983562a am 9fc8356b: Merge "Add potential future APIs for postmessage"
* commit '9fc8356baa7816a13e0c140788ccf67301cbd28d':
  Add potential future APIs for postmessage
2015-03-02 23:07:36 +00:00
Selim Gurun
9fc8356baa Merge "Add potential future APIs for postmessage" 2015-03-02 23:02:11 +00:00
Selim Gurun
37bd8907cb Add potential future APIs for postmessage
Bug: 10237116

The APIs are hidden while work is ongoing.

Change-Id: I3e2f06d6e41af276171b127f06bdd74924c2e74c
2015-03-02 14:53:01 -08:00
James Cook
c1bce3de90 Merge "Fix crash in UndoManager after parceling TextView" 2015-03-02 22:43:51 +00:00
Alan Viverette
445e1c5ddd Merge "Improve handling of activity destroy during popup exit animation" 2015-03-02 22:24:25 +00:00
Adam Lesinski
a4005662c7 Merge "Add generic "INTERACTION" event type to UsageStatsManager" 2015-03-02 22:22:58 +00:00
James Cook
f143ace3aa Fix crash in UndoManager after parceling TextView
UndoOwner maintains a manual reference count of the number of undo operations
it is associated with, but this count is not restored (and hence becomes zero)
when UndoManager is parceled and unparceled. This can cause the count to
underflow on subsequent text editing.

A test for this will land separately in CTS.

Bug: 19568283
Change-Id: Ic50890828db9679c7cef805388957d66dc75422d
2015-03-02 13:27:51 -08:00
Adam Lesinski
978a1ed5aa Add generic "INTERACTION" event type to UsageStatsManager
This will allow for updating a package's last time used
property for packages that are interacted in ways other than
launching their activities (interacting with notifications, etc.)

Change-Id: Ic6f9519f46fa04abd37ea6fc9475bcd9ea721003
2015-03-02 12:54:14 -08:00
John Spurlock
7b91c55b3f Merge "Remove unused imports in frameworks/base." 2015-03-02 20:43:50 +00:00
Alan Viverette
df4639a013 Improve handling of activity destroy during popup exit animation
Ensures the decor view isn't double-removed and that we don't try to
dereference a null anchor view.

Bug: 19553353
Bug: 19551371
Change-Id: I191a41f9065b68e49d66f96794cb7456f79d2d34
2015-03-02 12:40:34 -08:00
Clara Bayarri
727899fd0d Merge "Floating Toolbar: Wrap the ActionBar ActionMode handling." 2015-03-02 10:04:42 +00:00
Scott Kennedy
dd3fc6b907 Merge "Annotate Bundle with @Nullable" 2015-03-02 03:38:11 +00:00
Scott Kennedy
c6a65dff3d Annotate Bundle with @Nullable
Change-Id: Ide572124deea8271ca5c47009acb62603d644363
2015-03-01 17:19:29 -08:00
Scott Kennedy
9f78f6528f Mark arg and extras @Nullable in ContentProvider#call()
Change-Id: I431b01323fe76c744520c72661d30f6b9cb6b7f1
2015-03-01 15:29:58 -08:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
James Cook
99e6d7a17a Merge "Add TextView XML attribute for undo support" 2015-02-27 22:35:15 +00:00
James Cook
bcd42a8d5a Merge "Reland: Improvements to TextView Ctrl-Z undo support" 2015-02-27 22:02:38 +00:00
Jim Miller
c5ff04cbc4 Merge "Add fingerprint settings support to the framework" 2015-02-27 21:51:27 +00:00
James Cook
f1dad1ea82 Add TextView XML attribute for undo support
* Defaults to true, but can easily be changed if we decide that undo
  should be off by default.

Bug: 19332904
Change-Id: Ic4f3814a1b0a5e25171a910f2fe628606e16104e
2015-02-27 13:40:56 -08:00
James Cook
471559f129 Reland: Improvements to TextView Ctrl-Z undo support
This relands commit 7713d18847 which was
reverted in commit 3ac0bcb095.

Original description:
* Undo/redo restores cursor position
* Multiple deletes are consolidated into a single operation
* Don't create undo history for invalid or no-op operations
* Move logic for merging operations into Editor.EditOperation

CTS tests in android.widget.cts.TextViewTest will land separately.

Bug: 19332904
Bug: 19450037
Bug: 19505388
Change-Id: Ice27e3c4e5e421b47be8c4e9964c10844e61b0fc
2015-02-27 13:39:56 -08:00
Alan Viverette
e1f58a02e4 Merge "Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500"" 2015-02-27 20:51:41 +00:00
James Cook
7af589995f Merge "Reland: Add basic support for Ctrl-Z to editable TextViews" 2015-02-27 20:44:45 +00:00
Alan Viverette
25f0e6183b Revert "Use ObjectAnimator for fading scrollbars, set initial duration to 1500"
Bug: 19522833
Bug: 19528265
This reverts commit 72710f11ec.

Change-Id: I7235ae3ca53696f029cc18f19fe1d373c4f54bbf
2015-02-27 12:34:30 -08:00
Jim Miller
ba67aee02c Add fingerprint settings support to the framework
- cleanup thread issue and simplify native FingerprintService methods
- add new permissions and enforce them
- add fingerprint hardware detection API

Change-Id: I87c2243ea2412061f1e85b044138480d0161bcdf
2015-02-27 12:03:32 -08:00
Mike Lockwood
238cba3593 Merge "Move ALSA utilities to com.android.internal.alsa package" 2015-02-27 18:42:13 +00:00