OSDN Git Service
Lajos Molnar [Thu, 14 May 2015 21:33:19 +0000 (21:33 +0000)]
am
6500bbd4: am
51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
* commit '
6500bbd4ed468e5b1fa615f19daa537dbccf7e3b':
media: remove setPlaybackRate from MediaPlayer and MediSync
Lajos Molnar [Thu, 14 May 2015 21:33:13 +0000 (21:33 +0000)]
am
879d52f1: am
af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
* commit '
879d52f1763a07d5abf8b941244cacc409f5058f':
media: change final fields to accessors in MediaTimestamp
Xiaohui Chen [Thu, 14 May 2015 21:33:09 +0000 (21:33 +0000)]
am
2e036538: am
55a30240: Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
* commit '
2e0365386fce8360988362022bd924bff7fcac72':
wallpaper: avoid exception when user is not initialized
Lajos Molnar [Thu, 14 May 2015 21:25:36 +0000 (21:25 +0000)]
am
51bf5d9c: Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
* commit '
51bf5d9c078a57b52da786979103674588c2116c':
media: remove setPlaybackRate from MediaPlayer and MediSync
Lajos Molnar [Thu, 14 May 2015 21:25:30 +0000 (21:25 +0000)]
am
af047944: Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
* commit '
af0479446bf2bfaa252bfe4bc924346632013f40':
media: change final fields to accessors in MediaTimestamp
Xiaohui Chen [Thu, 14 May 2015 21:21:07 +0000 (21:21 +0000)]
am
55a30240: Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
* commit '
55a302402be3240c9e3289351c01e1cd2e853bc8':
wallpaper: avoid exception when user is not initialized
Lajos Molnar [Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)]
Merge "media: remove setPlaybackRate from MediaPlayer and MediSync" into mnc-dev
Lajos Molnar [Thu, 14 May 2015 21:17:27 +0000 (21:17 +0000)]
Merge "media: change final fields to accessors in MediaTimestamp" into mnc-dev
Chien-Yu Chen [Thu, 14 May 2015 21:06:11 +0000 (21:06 +0000)]
am
ca0d787f: am
3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
* commit '
ca0d787f3863b4996b86a8f3f2fe9da850511004':
Camera2: Fix reprocessing API naming and docs
Mikhail Naganov [Thu, 14 May 2015 21:06:07 +0000 (21:06 +0000)]
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
Xiaohui Chen [Thu, 14 May 2015 21:05:35 +0000 (21:05 +0000)]
Merge "wallpaper: avoid exception when user is not initialized" into mnc-dev
Joseph Wen [Thu, 14 May 2015 20:51:57 +0000 (20:51 +0000)]
am
487e1655: am
de355db3: Merge "Change the location of Brandmaster statement file." into mnc-dev
* commit '
487e165547e089593aafe69eb4edc87f7f87a6fc':
Change the location of Brandmaster statement file.
Chien-Yu Chen [Thu, 14 May 2015 20:50:31 +0000 (20:50 +0000)]
am
3b7bc569: Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
* commit '
3b7bc569e6e31b7cb4a074e0d23994f7a4797feb':
Camera2: Fix reprocessing API naming and docs
Mikhail Naganov [Thu, 14 May 2015 20:50:26 +0000 (20:50 +0000)]
am
93559668: Merge "Tiny fix after updating the error reporting API" into mnc-dev
* commit '
9355966878460e3103a8da5eac8ecb5d2de97717':
Tiny fix after updating the error reporting API
Chien-Yu Chen [Thu, 14 May 2015 20:46:35 +0000 (20:46 +0000)]
Merge "Camera2: Fix reprocessing API naming and docs" into mnc-dev
Mikhail Naganov [Thu, 14 May 2015 20:43:04 +0000 (20:43 +0000)]
Merge "Tiny fix after updating the error reporting API" into mnc-dev
Alan Viverette [Thu, 14 May 2015 20:41:47 +0000 (20:41 +0000)]
am
462e926f: am
f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
* commit '
462e926f1012b7855ce5cc4b0090db5e5634eb52':
Avoid sealed check when unparceling AccessibilityNodeInfo
Jason Sams [Thu, 14 May 2015 20:41:42 +0000 (20:41 +0000)]
am
afff09ae: am
f0616532: Merge "Fix issues found during CTS testing of FP16" into mnc-dev
* commit '
afff09ae74db9f62120e8a786750cb5e51d716ae':
Fix issues found during CTS testing of FP16
Joseph Wen [Thu, 14 May 2015 20:39:46 +0000 (20:39 +0000)]
am
de355db3: Merge "Change the location of Brandmaster statement file." into mnc-dev
* commit '
de355db3ec6e24dd75ccec93f6c613f8f114ab28':
Change the location of Brandmaster statement file.
Joseph Wen [Thu, 14 May 2015 20:31:06 +0000 (20:31 +0000)]
Merge "Change the location of Brandmaster statement file." into mnc-dev
Mikhail Naganov [Thu, 14 May 2015 20:30:13 +0000 (13:30 -0700)]
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
Alan Viverette [Thu, 14 May 2015 20:29:18 +0000 (20:29 +0000)]
am
f93d16bc: Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
* commit '
f93d16bc705027aaca3a9c36788e0c1f26233bd0':
Avoid sealed check when unparceling AccessibilityNodeInfo
Jason Sams [Thu, 14 May 2015 20:29:13 +0000 (20:29 +0000)]
am
f0616532: Merge "Fix issues found during CTS testing of FP16" into mnc-dev
* commit '
f06165320281ef1cb5e7ebbeef42a93a77cbd553':
Fix issues found during CTS testing of FP16
Craig Mautner [Thu, 14 May 2015 20:22:02 +0000 (20:22 +0000)]
am
b6291689: am
fed0196b: Merge "Lock top task if whitelisting arrives after start." into mnc-dev
* commit '
b6291689527a40a13dc07485e1a4655f045930c3':
Lock top task if whitelisting arrives after start.
Alan Viverette [Thu, 14 May 2015 20:20:47 +0000 (20:20 +0000)]
Merge "Avoid sealed check when unparceling AccessibilityNodeInfo" into mnc-dev
Jason Sams [Thu, 14 May 2015 20:15:39 +0000 (20:15 +0000)]
Merge "Fix issues found during CTS testing of FP16" into mnc-dev
Joseph Wen [Thu, 14 May 2015 18:13:11 +0000 (14:13 -0400)]
Change the location of Brandmaster statement file.
Change the location of statement file for web asset
from /.well-known/associations.json to /.well-known/statements.json.
BUG=
21153250
Change-Id: Ie8538b852d62c54254c895e0abadc7f502ea2181
Craig Mautner [Thu, 14 May 2015 20:09:55 +0000 (20:09 +0000)]
am
fed0196b: Merge "Lock top task if whitelisting arrives after start." into mnc-dev
* commit '
fed0196b9500b9f1e58071b177fb02245d8e4e91':
Lock top task if whitelisting arrives after start.
Craig Mautner [Thu, 14 May 2015 20:03:03 +0000 (20:03 +0000)]
Merge "Lock top task if whitelisting arrives after start." into mnc-dev
Craig Mautner [Wed, 13 May 2015 20:06:11 +0000 (13:06 -0700)]
Lock top task if whitelisting arrives after start.
If the DevicePolicyManagerService updates the whitelist after a task
in the whitelist has started then the task won't have started locked.
When the updated whitelist arrives this change automatically locks the
topmost task if it is in the whitelist.
Also more locktask debugging.
Fixes bug
21031298.
Change-Id: I2494af6f2819ca91bc01abc5decb3d1adc088226
Wale Ogunwale [Thu, 14 May 2015 19:46:51 +0000 (19:46 +0000)]
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."
Wale Ogunwale [Thu, 14 May 2015 19:37:25 +0000 (19:37 +0000)]
am
92847c96: Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev
* commit '
92847c968754f3fc2ffe849cf54ef6dd49b3e744':
Revert "Update IME focus when the active view is losing the focus."
Yorke Lee [Thu, 14 May 2015 19:30:35 +0000 (19:30 +0000)]
am
eb497822: am
0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev
* commit '
eb4978224d8979611e1014fe55f33f9dc0fcc06b':
Make Conferenceable an abstract class
Andrei Stingaceanu [Thu, 14 May 2015 19:30:29 +0000 (19:30 +0000)]
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.
Clara Bayarri [Thu, 14 May 2015 19:30:09 +0000 (19:30 +0000)]
am
53abb7b4: am
fdf9f40c: Merge "PhoneWindow ActionMode handling tests" into mnc-dev
* commit '
53abb7b463052600cf83067b996b4258c1b624fa':
PhoneWindow ActionMode handling tests
Alan Viverette [Thu, 14 May 2015 19:30:03 +0000 (19:30 +0000)]
am
e3a32490: am
8d0cf8bc: Merge "Add example for detectResourceMismatches()" into mnc-dev
* commit '
e3a324900b88a7dc7d8694cd2c38882f39db52cc':
Add example for detectResourceMismatches()
Daniel Sandler [Thu, 14 May 2015 19:29:55 +0000 (19:29 +0000)]
am
15de90de: am
9cb90cbb: Merge "Revert "Icon support comes to Notification."" into mnc-dev
* commit '
15de90de0e7f2da9e28d1b46644faeb21df13300':
Revert "Icon support comes to Notification."
Joe Fernandez [Thu, 14 May 2015 19:29:39 +0000 (19:29 +0000)]
am
df0946b6: am
dfdbc3a8: am
a90cb675: am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
df0946b67ff1289794bbe5520da3c933d9d2a551':
docs: Add weekly subscriptions and grace period information to IAB docs
Wale Ogunwale [Thu, 14 May 2015 19:29:34 +0000 (19:29 +0000)]
Merge "Revert "Update IME focus when the active view is losing the focus."" into mnc-dev
Paul McLean [Thu, 14 May 2015 19:29:34 +0000 (19:29 +0000)]
am
b0f9f7b8: am
f799491f: Merge "New policy for internal and wired device names." into mnc-dev
* commit '
b0f9f7b8a6bc573918378ac617f6751c305f9cd6':
New policy for internal and wired device names.
Paul McLean [Thu, 14 May 2015 19:29:27 +0000 (19:29 +0000)]
am
5326ff97: am
fc56b88a: Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev
* commit '
5326ff9757b9b48deaf85c2802661d79d09e28e3':
Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI.
Chris Craik [Thu, 14 May 2015 19:29:21 +0000 (19:29 +0000)]
am
18069065: am
30bc0b9e: Merge "Add tracing for path texture upload" into mnc-dev
* commit '
18069065d4e8752f55c78b62d679d3f7291270ac':
Add tracing for path texture upload
Alex Klyubin [Thu, 14 May 2015 19:29:13 +0000 (19:29 +0000)]
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.
Michael Wright [Thu, 14 May 2015 19:29:06 +0000 (19:29 +0000)]
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.""
Zoltan Szatmary-Ban [Thu, 14 May 2015 19:28:59 +0000 (19:28 +0000)]
am
392f8ff5: am
39b8c69a: Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
* commit '
392f8ff51332395db515370f7093556f135f386e':
Rename NetworkUsageStats -> NetworkStats
Dan Sandler [Thu, 14 May 2015 19:28:53 +0000 (19:28 +0000)]
am
644d0318: am
5bcbf857: Merge "Fix icon-related crash." into mnc-dev
* commit '
644d0318f59a8057e219be6469ea66ba6d2ce3c1':
Fix icon-related crash.
Lorenzo Colitti [Thu, 14 May 2015 19:28:48 +0000 (19:28 +0000)]
am
e0efd004: am
9e2d14be: Merge "Don\'t display the "no Internet access" prompt on captive portals." into mnc-dev
* commit '
e0efd0047b07b76941c4a01ff8fa4fd038c6c7a9':
Don't display the "no Internet access" prompt on captive portals.
Xiyuan Xia [Thu, 14 May 2015 19:28:43 +0000 (19:28 +0000)]
am
f1844556: am
09e8303f: Merge "Clear security message on user input" into mnc-dev
* commit '
f1844556cb440c3328d1c0ad73ebb305fd86b1b9':
Clear security message on user input
John Reck [Thu, 14 May 2015 19:28:35 +0000 (19:28 +0000)]
am
24592866: am
a0f6b87b: am
570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
* commit '
24592866835a221ba1d0c3456827f89d04d4bd97':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
Andrei Stingaceanu [Thu, 14 May 2015 19:28:29 +0000 (19:28 +0000)]
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
Rubin Xu [Thu, 14 May 2015 19:28:24 +0000 (19:28 +0000)]
am
e52807d3: am
6e1c17a3: Merge "clear caller identify before sending system update notification" into mnc-dev
* commit '
e52807d3d00d103c4be78fc7ca447cf1bd994045':
clear caller identify before sending system update notification
Michael Wright [Thu, 14 May 2015 19:28:16 +0000 (19:28 +0000)]
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."
Michael Wright [Thu, 14 May 2015 19:28:09 +0000 (19:28 +0000)]
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.
Wojciech Staszkiewicz [Thu, 14 May 2015 19:27:51 +0000 (19:27 +0000)]
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
Andrei Stingaceanu [Thu, 14 May 2015 19:27:43 +0000 (19:27 +0000)]
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
Alan Viverette [Thu, 14 May 2015 19:26:49 +0000 (12:26 -0700)]
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
Wale Ogunwale [Thu, 14 May 2015 19:20:53 +0000 (12:20 -0700)]
Revert "Update IME focus when the active view is losing the focus."
This reverts commit
97c381304207013fd95c7806df4dcca0c69006c0.
This causes issue with the right IME window getting focus.
Bug:
21144633
Change-Id: I4c75b6e7dd87c10f008444d2059164b52a8f4335
Lajos Molnar [Wed, 13 May 2015 22:30:58 +0000 (15:30 -0700)]
media: change final fields to accessors in MediaTimestamp
Bug:
20887706
Change-Id: Iea0acdeec9dd7e818c80454af639f9480ff6b285
Lajos Molnar [Thu, 14 May 2015 19:13:32 +0000 (12:13 -0700)]
media: remove setPlaybackRate from MediaPlayer and MediSync
Condensed them to an internal easyPlaybackParams to create
PlaybackParams from a rate and audio mode.
Bug:
21045118
Change-Id: I89879a3034c905e34cabef8ff0237048e097a8e0
Yorke Lee [Thu, 14 May 2015 17:44:57 +0000 (17:44 +0000)]
am
0125d76f: Merge "Make Conferenceable an abstract class" into mnc-dev
* commit '
0125d76fa37d26a29f06371ff349546e21cd3f4d':
Make Conferenceable an abstract class
Andrei Stingaceanu [Thu, 14 May 2015 17:32:48 +0000 (17:32 +0000)]
am
d674f230: Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev
* commit '
d674f2308aa1dd8f6f6df9d3cdd552e2aec0e64e':
Editor: enable double tap for selection after cut/copy.
Yorke Lee [Thu, 14 May 2015 17:32:44 +0000 (17:32 +0000)]
Merge "Make Conferenceable an abstract class" into mnc-dev
Andrei Stingaceanu [Thu, 14 May 2015 17:21:08 +0000 (17:21 +0000)]
Merge "Editor: enable double tap for selection after cut/copy." into mnc-dev
Clara Bayarri [Thu, 14 May 2015 16:51:54 +0000 (16:51 +0000)]
am
fdf9f40c: Merge "PhoneWindow ActionMode handling tests" into mnc-dev
* commit '
fdf9f40cb8ca35a1d56d8cde494c6ed9602b4e48':
PhoneWindow ActionMode handling tests
Alan Viverette [Thu, 14 May 2015 16:45:06 +0000 (16:45 +0000)]
am
8d0cf8bc: Merge "Add example for detectResourceMismatches()" into mnc-dev
* commit '
8d0cf8bc457b48a0c8d43cf23928956ae3ca2a28':
Add example for detectResourceMismatches()
Daniel Sandler [Thu, 14 May 2015 16:45:01 +0000 (16:45 +0000)]
am
9cb90cbb: Merge "Revert "Icon support comes to Notification."" into mnc-dev
* commit '
9cb90cbbf8fc91793dad1d1cb317079dbc7e8421':
Revert "Icon support comes to Notification."
Clara Bayarri [Thu, 14 May 2015 16:44:45 +0000 (16:44 +0000)]
Merge "PhoneWindow ActionMode handling tests" into mnc-dev
Alan Viverette [Thu, 14 May 2015 16:39:18 +0000 (16:39 +0000)]
Merge "Add example for detectResourceMismatches()" into mnc-dev
Daniel Sandler [Thu, 14 May 2015 16:34:52 +0000 (16:34 +0000)]
Merge "Revert "Icon support comes to Notification."" into mnc-dev
Daniel Sandler [Thu, 14 May 2015 15:32:28 +0000 (15:32 +0000)]
Revert "Icon support comes to Notification."
This reverts commit
08a04c15245c970856022d0779aa27d4d63cdee3.
This also reverts commit
5bcbf857d129f4513e562801a4e88077b2655ade.
Change-Id: Ia0b0a5339d523581c877822a3a1feec97ae4b73d
Joe Fernandez [Thu, 14 May 2015 16:17:28 +0000 (16:17 +0000)]
am
dfdbc3a8: am
a90cb675: am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
dfdbc3a8918a698a69880816a59d9e5ca2ee185f':
docs: Add weekly subscriptions and grace period information to IAB docs
Joe Fernandez [Thu, 14 May 2015 16:05:33 +0000 (16:05 +0000)]
am
a90cb675: am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
a90cb675a53ebf9a749bcaefc19ba00c8cbf7570':
docs: Add weekly subscriptions and grace period information to IAB docs
Paul McLean [Thu, 14 May 2015 16:03:39 +0000 (16:03 +0000)]
am
f799491f: Merge "New policy for internal and wired device names." into mnc-dev
* commit '
f799491fb4781c890625cfd0d2b397abbfb169e3':
New policy for internal and wired device names.
Paul McLean [Thu, 14 May 2015 16:03:34 +0000 (16:03 +0000)]
am
fc56b88a: Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev
* commit '
fc56b88ac4ea56c53f9ab648b6a92d85a05562c8':
Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI.
Chris Craik [Thu, 14 May 2015 16:03:29 +0000 (16:03 +0000)]
am
30bc0b9e: Merge "Add tracing for path texture upload" into mnc-dev
* commit '
30bc0b9ebb6ea60427f4c42bb019557299dc2753':
Add tracing for path texture upload
Alex Klyubin [Thu, 14 May 2015 16:03:25 +0000 (16:03 +0000)]
am
a1fb2cf6: Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev
* commit '
a1fb2cf6a6b8e69b57346b598e1c0904614250d7':
Move Android Keystore impl to android.security.keystore.
Paul McLean [Thu, 14 May 2015 15:59:37 +0000 (15:59 +0000)]
Merge "New policy for internal and wired device names." into mnc-dev
Paul McLean [Thu, 14 May 2015 15:59:18 +0000 (15:59 +0000)]
Merge "Add manufacturer-provided device name for AudioPort name field for BT devices. Change "a2dp-device" to empty string for EnumAPI." into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:53:44 +0000 (15:53 +0000)]
am
a0f0b5bf: am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
a0f0b5bfd8df9e0caa6848bc479f1ed3dc492efc':
docs: Add weekly subscriptions and grace period information to IAB docs
Chris Craik [Thu, 14 May 2015 15:53:17 +0000 (15:53 +0000)]
Merge "Add tracing for path texture upload" into mnc-dev
Alex Klyubin [Thu, 14 May 2015 15:51:00 +0000 (15:51 +0000)]
Merge "Move Android Keystore impl to android.security.keystore." into mnc-dev
Michael Wright [Thu, 14 May 2015 15:45:34 +0000 (15:45 +0000)]
am
1b2e5c11: Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
* commit '
1b2e5c11b6a89d56d5058907c3b0c88bf0170857':
Revert "Revert "Add new MotionEvent actions for button press and release.""
Joe Fernandez [Thu, 14 May 2015 15:40:38 +0000 (15:40 +0000)]
am
574690b1: Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
* commit '
574690b13c8f0d4835c6d86b8e26fc4c9b914037':
docs: Add weekly subscriptions and grace period information to IAB docs
Clara Bayarri [Thu, 7 May 2015 15:13:41 +0000 (16:13 +0100)]
PhoneWindow ActionMode handling tests
Tests focusing on action mode creation, how the two types of
modes are handled together and how the lifecycle is handled.
Change-Id: I17fe7a83cba4651b295a8ce80bc449f2f2538048
Michael Wright [Thu, 14 May 2015 15:31:10 +0000 (15:31 +0000)]
Merge "Revert "Revert "Add new MotionEvent actions for button press and release.""" into mnc-dev
Joe Fernandez [Thu, 14 May 2015 15:26:36 +0000 (15:26 +0000)]
Merge "docs: Add weekly subscriptions and grace period information to IAB docs" into lmp-mr1-ub-docs
Zoltan Szatmary-Ban [Thu, 14 May 2015 15:20:16 +0000 (15:20 +0000)]
am
39b8c69a: Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
* commit '
39b8c69a2356b03b56c7f11385a35bef58d2fceb':
Rename NetworkUsageStats -> NetworkStats
Dan Sandler [Thu, 14 May 2015 15:14:28 +0000 (15:14 +0000)]
am
5bcbf857: Merge "Fix icon-related crash." into mnc-dev
* commit '
5bcbf857d129f4513e562801a4e88077b2655ade':
Fix icon-related crash.
Lorenzo Colitti [Thu, 14 May 2015 15:14:22 +0000 (15:14 +0000)]
am
9e2d14be: Merge "Don\'t display the "no Internet access" prompt on captive portals." into mnc-dev
* commit '
9e2d14beb32bde5c5093f6fb0f1a5c8e14e41029':
Don't display the "no Internet access" prompt on captive portals.
Xiyuan Xia [Thu, 14 May 2015 15:14:17 +0000 (15:14 +0000)]
am
09e8303f: Merge "Clear security message on user input" into mnc-dev
* commit '
09e8303fd8eb2368f2de0763ecf6fee868d5d71c':
Clear security message on user input
Zoltan Szatmary-Ban [Thu, 14 May 2015 15:13:33 +0000 (15:13 +0000)]
Merge "Rename NetworkUsageStats -> NetworkStats" into mnc-dev
Andrei Stingaceanu [Wed, 29 Apr 2015 13:39:40 +0000 (14:39 +0100)]
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
Dan Sandler [Thu, 14 May 2015 15:10:01 +0000 (15:10 +0000)]
Merge "Fix icon-related crash." into mnc-dev
Lorenzo Colitti [Thu, 14 May 2015 15:07:09 +0000 (15:07 +0000)]
Merge "Don't display the "no Internet access" prompt on captive portals." into mnc-dev
Xiyuan Xia [Thu, 14 May 2015 15:05:53 +0000 (15:05 +0000)]
Merge "Clear security message on user input" into mnc-dev
John Reck [Thu, 14 May 2015 15:02:19 +0000 (15:02 +0000)]
am
a0f6b87b: am
570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
* commit '
a0f6b87bbbbc10700aa14d2c4d9191fe1f064a60':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
John Reck [Thu, 14 May 2015 14:51:06 +0000 (14:51 +0000)]
am
570b2052: (-s ours) DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
* commit '
570b2052bb8eec8c510941b0a6d77262df28b922':
Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
Lorenzo Colitti [Thu, 14 May 2015 14:15:10 +0000 (23:15 +0900)]
Don't display the "no Internet access" prompt on captive portals.
Bug:
20081183
Bug:
21066461
Change-Id: Idc71844a604f9ca655411c6916de256780ea4586
Andrei Stingaceanu [Thu, 14 May 2015 14:39:51 +0000 (14:39 +0000)]
am
fa660f79: Merge "Fix: text selection bubbles move along with the text" into mnc-dev
* commit '
fa660f79e9551ca46efa6eaed26cff06095fbcd8':
Fix: text selection bubbles move along with the text
John Reck [Thu, 14 May 2015 14:38:07 +0000 (07:38 -0700)]
DO NOT MERGE resolved conflicts for merge of
951f2347 to lmp-mr1-ub-dev
Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1