Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,397 Commits 3 Branches 0 Tags
33db304c162c38aa4d248093f7197297e40468b4
Commit Graph

52114 Commits

Author SHA1 Message Date
Chien-Yu Chen
6f9e7a5567 am ca0d787f: am 3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 
* commit 'ca0d787f3863b4996b86a8f3f2fe9da850511004':
  Camera2: Fix reprocessing API naming and docs
 2015-05-14 21:06:11 +00:00
Mikhail Naganov
99b972c544 am 993a0f70: am 93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev 
* commit '993a0f7088ba3d04e49251df40a6fdc28cdbd4c8':
  Tiny fix after updating the error reporting API
 2015-05-14 21:06:07 +00:00
Chien-Yu Chen
3b7bc569e6 Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev 2015-05-14 20:46:38 +00:00
Alan Viverette
9f233c51b2 am 462e926f: am f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev 
* commit '462e926f1012b7855ce5cc4b0090db5e5634eb52':
  Avoid sealed check when unparceling AccessibilityNodeInfo
 2015-05-14 20:41:47 +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
Wale Ogunwale
1fbd367cdc am a14ebc73: am 92847c96: Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev 
* commit 'a14ebc73cf26f893a8e72671a7562937ecbe6f2e':
  Revert "Update IME focus when the active view is losing the focus."
 2015-05-14 19:46:51 +00:00
Andrei Stingaceanu
ed146a9607 am c2bdee59: am d674f230: Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev 
* commit 'c2bdee591f663fb41006f9b816f0098b10a3610f':
  Editor: enable double tap for selection after cut/copy.
 2015-05-14 19:30:29 +00:00
Alan Viverette
d8d85131ed am e3a32490: am 8d0cf8bc: Merge "Add example for detectResourceMismatches()" into mnc-dev 
* commit 'e3a324900b88a7dc7d8694cd2c38882f39db52cc':
  Add example for detectResourceMismatches()
 2015-05-14 19:30:03 +00:00
Daniel Sandler
b5b114a3f0 am 15de90de: am 9cb90cbb: Merge "Revert "Icon support comes to Notification."" into mnc-dev 
* commit '15de90de0e7f2da9e28d1b46644faeb21df13300':
  Revert "Icon support comes to Notification."
 2015-05-14 19:29:55 +00: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
Alex Klyubin
ff5972b64d am 567936c9: am a1fb2cf6: Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev 
* commit '567936c9ab300884aeb54c68e6f0f90fe89a32b3':
  Move Android Keystore impl to android.security.keystore.
 2015-05-14 19:29:13 +00:00
Michael Wright
27a2455506 am edc7560a: am 1b2e5c11: Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev 
* commit 'edc7560af4534f881480b24dbeac4d44bdb5dee8':
  Revert "Revert "Add new MotionEvent actions for button press and release.""
 2015-05-14 19:29:06 +00:00
Zoltan Szatmary-Ban
dabd7d9015 am 392f8ff5: am 39b8c69a: Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev 
* commit '392f8ff51332395db515370f7093556f135f386e':
  Rename NetworkUsageStats -> NetworkStats
 2015-05-14 19:28:59 +00:00
Dan Sandler
70479a3234 am 644d0318: am 5bcbf857: Merge "Fix icon-related crash." into mnc-dev 
* commit '644d0318f59a8057e219be6469ea66ba6d2ce3c1':
  Fix icon-related crash.
 2015-05-14 19:28:53 +00:00
Andrei Stingaceanu
fcd68d3487 am 6f885d1b: am fa660f79: Merge "Fix: text selection bubbles move along with the text" into mnc-dev 
* commit '6f885d1bb1bfb964d4404abe8ee63f25d24e68e9':
  Fix: text selection bubbles move along with the text
 2015-05-14 19:28:29 +00:00
Michael Wright
c52a59597b am 87d3e2f4: am 3d528698: Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev 
* commit '87d3e2f4cdfcf5bf0e659f66b16dda165696e471':
  Revert "Add new MotionEvent actions for button press and release."
 2015-05-14 19:28:16 +00:00
Michael Wright
0a998bd760 am ce0b8585: am 07b83f1c: Merge "Add new MotionEvent actions for button press and release." into mnc-dev 
* commit 'ce0b858573c07c9394d81ee6960c42650b78f7df':
  Add new MotionEvent actions for button press and release.
 2015-05-14 19:28:09 +00:00
Wojciech Staszkiewicz
b8ee07d10c am e2ad30ef: am be752b1f: Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev 
* commit 'e2ad30ef5168d55f7c1b4a2dc4fe699be1bf8a48':
  Pass charset to XmlPullParser.setInput instead of null
 2015-05-14 19:27:51 +00:00
Andrei Stingaceanu
c84dfea8f9 am dee1479c: am c398adf8: Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev 
* commit 'dee1479c90179b7307cb889a4a233ef8633fabe8':
  Fix floating toolbar popping frequently after Replace/Copy
 2015-05-14 19:27:43 +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
1496cdd09d am 46044e85: am 78e2f07e: Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev 
* commit '46044e85433e0b13619a1e8f15978cae9b6992a2':
  Fix: replace terminates extract mode (floating toolbar)
 2015-05-14 09:50:56 +00:00
Chris Banes
9637545abe am dc6125d4: am 18ee0524: Merge "Fix build; doc link in ImageView" into mnc-dev 
* commit 'dc6125d4fd57db5fed3f9fbce569e587e345c4fa':
  Fix build; doc link in ImageView
 2015-05-14 09:50:51 +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
af1985b317 am f8bb8595: am 39087b1c: Replace String host:port/url args with Uri arg 
* commit 'f8bb8595f8c653e3e9b693f9d6c35bc4f5be6cd6':
  Replace String host:port/url args with Uri arg
 2015-05-14 06:51:55 +00:00
Deepanshu Gupta
da3fb48c8a am 70854ba9: am e6460224: Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev 
* commit '70854ba90279b748a9b33fcaf1b5c03475a6ccc5':
  Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
 2015-05-14 06:40:53 +00:00
Keisuke Kuroyanagi
57f3e109b2 am 5c43d546: am 0433488d: Merge "Track difference between touch and word in x coordinate." into mnc-dev 
* commit '5c43d546d2831922cd25b1afb4d7adf2ac735660':
  Track difference between touch and word in x coordinate.
 2015-05-14 06:40:04 +00:00
Dan Sandler
9349eb5640 am 6da734c6: am 08a04c15: Icon support comes to Notification. 
* commit '6da734c6caf0952fd030273ee861cbcc14110047':
  Icon support comes to Notification.
 2015-05-14 06:39:57 +00:00
Dan Sandler
38b003001a am 96952c74: am a22a380f: Add Icon support to ImageView. 
* commit '96952c741b5e04f390df3c83e761070ee2cf35fc':
  Add Icon support to ImageView.
 2015-05-14 06:39:51 +00:00