Commit Graph

51987 Commits

Author SHA1 Message Date
Svet Ganov
4e76ee07f7 Merge "Fix easter egg setting validator to accept valid values" into mnc-dev 2015-05-15 16:34:54 +00:00
Svet Ganov
b1918a0568 Fix easter egg setting validator to accept valid values
bug:21188928

Change-Id: I5f6d445aad7231a907026c552c87f9cdfe024d32
2015-05-15 09:33:00 -07:00
Zhijun He
99dc89961f Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-dev 2015-05-15 16:03:31 +00:00
Tor Norbye
f02fd46d34 Merge "Add bluetooth permission annotations" into mnc-dev 2015-05-15 14:21:16 +00:00
George Mount
b1f1293355 Merge "Remove hidden/deleted APIs." into mnc-dev 2015-05-15 14:08:19 +00:00
Dan Sandler
d63f9321e6 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

(This patch fixes a number of bugs in the initial
implementation, but other than that, it's the same as it
ever was.)

Bug: 18568715
Bug: 21141842
Change-Id: I1d3f9427abd7f0bb57e533fcfac708851ff644b6
2015-05-15 12:35:21 +00:00
Christopher Tate
abcbf05c98 Merge "fullBackupContent isn't public API" into mnc-dev 2015-05-15 01:50:39 +00:00
Ruben Brunk
096c11dc37 Merge "camera2: Fix work-profile eviction handling." into mnc-dev 2015-05-15 01:45:19 +00:00
Ruben Brunk
7f75da2405 camera2: Fix work-profile eviction handling.
Bug: 20124384

Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
2015-05-14 18:39:50 -07:00
Tor Norbye
2d49752ee0 Add bluetooth permission annotations
Change-Id: I5bc86f8ec6ea5c873f1e14dab0e0c47c5c9df7f7
2015-05-15 00:18:28 +00:00
John Reck
0e4a2b5ff0 Merge "Check for setting to already set" into mnc-dev 2015-05-14 23:27:49 +00:00
John Reck
6d8371e73f Check for setting to already set
Bug: 20105644
Change-Id: Ia79d2ae5c725c139d2b7c423a899be625cb8f14f
2015-05-14 16:06:12 -07:00
Zhijun He
527d522f34 Camera2: get ride of sceneModeOverrides in API doc
sceneModeOverrides isn't public API.

Bug: 20152738
Change-Id: I4024b152c47c1d0184971539c99a2f1cc1b1c1a0
2015-05-14 15:36:04 -07:00
Christopher Tate
474bb82fd5 Merge "Clarify docs for BackupTransport.initializeDevice()" into mnc-dev 2015-05-14 22:16:33 +00:00
Yin-Chia Yeh
a0807a65e9 Merge "Camera: tonemap linkify update" into mnc-dev 2015-05-14 22:12:43 +00:00
Christopher Tate
98fa656f16 fullBackupContent isn't public API
Bug 21090205

Change-Id: I1b468f1e7bf86455576760e4a1d1ea9657074a9e
2015-05-14 15:01:45 -07:00
George Mount
5aec62eae1 Remove hidden/deleted APIs.
Change-Id: Iabeaac2c9b485f1f25fb2fcc3193610b0d6478c4
2015-05-14 14:12:16 -07:00
Chien-Yu Chen
3b7bc569e6 Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 2015-05-14 20:46:38 +00:00
Mikhail Naganov
6162eafe7a Tiny fix after updating the error reporting API
Temporarily make WebResourceError.getDescription() non-abstract
so the current version of WebView doesn't crash on it.

Bug: 20064008, 21063767
Change-Id: I15a1abb5df76263006d14eb589fe0076d5aac582
2015-05-14 13:30:13 -07:00
Alan Viverette
f93d16bc70 Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev 2015-05-14 20:20:48 +00:00
Christopher Tate
56341e70a2 Clarify docs for BackupTransport.initializeDevice()
Explicitly call out that even if the backend is in an undefined state
(such as no authenticated account, so there is by definition no work
that can be done here), the transport should return TRANSPORT_OK in
response to initializeDevice().  Error returns from that method must
only be used to indicate that the initialize should be *retried*.

Bug 21136957

Change-Id: I41ad115b92c16092b4d931d9c554a44b77945359
2015-05-14 12:54:24 -07:00
Wale Ogunwale
92847c9687 Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev 2015-05-14 19:29:35 +00:00
Alan Viverette
c921f27694 Avoid sealed check when unparceling AccessibilityNodeInfo
Previously the unparceling code relied on addAction(), which would
incorrectly crash if the node was sealed.

Bug: 21135077
Change-Id: I773ac27b2dee501ffea0a0587536a192af402c32
2015-05-14 12:26:49 -07:00
Wale Ogunwale
159c3d8a8b Revert "Update IME focus when the active view is losing the focus."
This reverts commit 97c3813042.

This causes issue with the right IME window getting focus.

Bug: 21144633
Change-Id: I4c75b6e7dd87c10f008444d2059164b52a8f4335
2015-05-14 12:25:24 -07:00
Andrei Stingaceanu
d674f2308a Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev 2015-05-14 17:21:11 +00:00
Alan Viverette
8d0cf8bc45 Merge "Add example for detectResourceMismatches()" into mnc-dev 2015-05-14 16:39:20 +00:00
Daniel Sandler
9cb90cbbf8 Merge "Revert "Icon support comes to Notification."" into mnc-dev 2015-05-14 16:34:53 +00:00
Daniel Sandler
09e51a739f Revert "Icon support comes to Notification."
This reverts commit 08a04c1524.
This also reverts commit 5bcbf857d1.

Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
2015-05-14 12:23:24 -04:00
Alex Klyubin
a1fb2cf6a6 Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev 2015-05-14 15:51:01 +00:00
Michael Wright
1b2e5c11b6 Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev 2015-05-14 15:31:14 +00:00
Zoltan Szatmary-Ban
39b8c69a23 Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev 2015-05-14 15:13:34 +00:00
Andrei Stingaceanu
fae270c108 Editor: enable double tap for selection after cut/copy.
* detect double tap in the TextView and pass it to Editor.
* add a timer (with getDoubleTapTimeout) for executing the
  single tap job in Editor.
* if double tap is detected then cancel the single tap job.

This way one tap shows the toolbar if within the timeframe
and two taps select the word and show the toolbar.

Bug: 20442587
Change-Id: I0a117939c896fcb13669346e30c9c48d319576dd
2015-05-14 16:11:07 +01:00
Dan Sandler
5bcbf857d1 Merge "Fix icon-related crash." into mnc-dev 2015-05-14 15:10:03 +00:00
Dan Sandler
98b0290bbe Fix icon-related crash.
Bug: 21144636
Change-Id: Ib686e9a9a18ac6b9f1e249bcde74be9212e0f53b
2015-05-14 09:53:31 -04:00
Michael Wright
5bd69e6e61 Revert "Revert "Add new MotionEvent actions for button press and release.""
This reverts commit 9623805162.
2015-05-14 14:48:08 +01:00
Michael Wright
3d52869834 Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev 2015-05-14 13:47:10 +00:00
Michael Wright
9623805162 Revert "Add new MotionEvent actions for button press and release."
This reverts commit ec0ce51b73.
2015-05-14 14:46:25 +01:00
Michael Wright
07b83f1c9e Merge "Add new MotionEvent actions for button press and release." into mnc-dev 2015-05-14 13:31:29 +00:00
Andrei Stingaceanu
35c550c854 Fix: text selection bubbles move along with the text
Always hide the selection cursor when showing the
insertion cursor.

Bug: 19857679
Change-Id: I549552fa5026e60f94900364b8194217e0de4b4a
2015-05-14 14:30:18 +01:00
Michael Wright
ec0ce51b73 Add new MotionEvent actions for button press and release.
Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to
signal a button press or release. If these actions happen
simulanteously with a DOWN or UP event then they're explicitly
ordered to happen after the DOWN or preceding the UP in order to send
them to the most recently targeted view.

Also, introduce new stylus button constants that differ from the
constants we use for mouse buttons.

Bug: 20704355
Change-Id: I5b75e5c5e692171c1c117ee687dd185a0d9dd15c
2015-05-14 14:18:05 +01:00
Wojciech Staszkiewicz
be752b1f28 Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev 2015-05-14 10:27:24 +00:00
Andrei Stingaceanu
c398adf81c Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev 2015-05-14 10:23:09 +00:00
Andrei Stingaceanu
78e2f07e81 Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev 2015-05-14 09:33:58 +00:00
Wojciech Staszkiewicz
9e9e2e73c6 Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.

bug: b/20849543

Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
2015-05-14 10:24:34 +01:00
Chris Banes
e695bb8a28 Fix build; doc link in ImageView
Change-Id: Ie3057fc2b920f71ff89eee0d3577d21d0e9930c3
2015-05-14 10:12:20 +01:00
Robin Lee
39087b1cec Replace String host:port/url args with Uri arg
Uri provides a stronger guarantee of well-formedness and lets apps do
nice extra things like specifying scheme etc. without twisting any
expectations.

Bug: 20820034
Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
2015-05-14 07:15:18 +01:00
Deepanshu Gupta
e646022429 Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev 2015-05-14 04:52:59 +00:00
Keisuke Kuroyanagi
0433488daa Merge "Track difference between touch and word in x coordinate." into mnc-dev 2015-05-14 04:26:21 +00:00
Deepanshu Gupta
5987e553c2 Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
This reverts commit c73a1aaa90. The change
causes an NPE when rendering ListViews.
2015-05-13 21:25:57 -07:00
Dan Sandler
08a04c1524 Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
  And you may ask yourself: where does that API go to?
  And you may ask yourself: is it a resource? is it a Bitmap?
  And you may say to yourself: my god, what have I done

Bug: 18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
2015-05-13 23:50:43 -04:00