OSDN Git Service
Dianne Hackborn [Thu, 2 Jun 2011 17:17:05 +0000 (10:17 -0700)]
Merge "resolved conflicts for merge of
76450622 to master"
Gilles Debunne [Thu, 2 Jun 2011 16:45:32 +0000 (09:45 -0700)]
Merge "Remove suggestion span underline on device rotation"
Fabrice Di Meglio [Thu, 2 Jun 2011 16:34:10 +0000 (09:34 -0700)]
Merge "Add more unit tests cases for BiDi / RTL"
Fabrice Di Meglio [Thu, 2 Jun 2011 16:33:24 +0000 (09:33 -0700)]
Merge "Add more unit tests for RelativeLayout"
Dianne Hackborn [Thu, 2 Jun 2011 16:20:52 +0000 (09:20 -0700)]
resolved conflicts for merge of
76450622 to master
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
Glenn Kasten [Thu, 2 Jun 2011 14:26:17 +0000 (07:26 -0700)]
Merge "Use android.os.Process.THREAD_PRIORITY_* symbols"
Glenn Kasten [Thu, 2 Jun 2011 14:24:14 +0000 (07:24 -0700)]
Merge "Remove unnecessary level of priority indirection"
Eric Fischer [Thu, 2 Jun 2011 10:21:06 +0000 (03:21 -0700)]
am
0bb63c58: (-s ours) am
90856661: am
66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
0bb63c58a464e7df60de103319204b7b590e5d75':
Import revised translations. DO NOT MERGE
Ben Murdoch [Thu, 2 Jun 2011 10:03:15 +0000 (03:03 -0700)]
Merge "Merge WebKit at r80534: Update user agent string."
satok [Thu, 2 Jun 2011 09:34:32 +0000 (02:34 -0700)]
Merge "Add an api to get the display name for InputMethodSubtype"
Jeff Sharkey [Thu, 2 Jun 2011 00:54:37 +0000 (17:54 -0700)]
Merge "Collect historical network stats."
Adam Powell [Thu, 2 Jun 2011 00:50:13 +0000 (17:50 -0700)]
Merge "Implement bug
4500971 - Collapsable action views"
Fabrice Di Meglio [Thu, 2 Jun 2011 00:40:11 +0000 (17:40 -0700)]
Merge "Fix bug #
4509967 (layout_gravity not always respected)"
Daniel Lehmann [Thu, 2 Jun 2011 00:30:50 +0000 (17:30 -0700)]
Merge "Enable strict mode as a public api to catch sql injections"
Jeff Sharkey [Thu, 2 Jun 2011 00:18:15 +0000 (17:18 -0700)]
Merge "Policy and rules work for ConnectivityManager."
Yu Shan Emily Lau [Thu, 2 Jun 2011 00:13:30 +0000 (17:13 -0700)]
Merge "Convert the video editor performance test suite output from float to int."
Christopher Tate [Wed, 1 Jun 2011 23:55:31 +0000 (16:55 -0700)]
Merge "Filter backup/restore confirmation buttons when obscured"
Brett Chabot [Wed, 1 Jun 2011 23:08:20 +0000 (16:08 -0700)]
Merge "Move bluetooth tests to their own package."
Andy Stadler [Wed, 1 Jun 2011 22:59:58 +0000 (15:59 -0700)]
Merge "Use unchecked admin lookup for getStorageEncryption()"
Teng-Hui Zhu [Wed, 1 Jun 2011 22:53:18 +0000 (15:53 -0700)]
Merge "Correctly detect when switching back from full screen"
Brian Carlstrom [Wed, 1 Jun 2011 22:31:46 +0000 (15:31 -0700)]
Merge "Restore ResponseCodes for use with getLastError"
Glenn Kasten [Wed, 1 Jun 2011 22:22:49 +0000 (15:22 -0700)]
Merge "Revert "Use AudioTrack::event_type not int in callback""
Fabrice Di Meglio [Wed, 1 Jun 2011 22:16:41 +0000 (15:16 -0700)]
Merge "Fix View default horizontal direction"
Christopher Tate [Wed, 1 Jun 2011 22:14:36 +0000 (15:14 -0700)]
Merge "Restore from a previous full backup's tarfile"
Christopher Tate [Wed, 18 May 2011 23:28:19 +0000 (16:28 -0700)]
Restore from a previous full backup's tarfile
Usage: adb restore [tarfilename]
Restores app data [and installs the apps if necessary from the backup
file] captured in a previous invocation of 'adb backup'. The user
must explicitly acknowledge the action on-device before it is allowed
to proceed; this prevents any "invisible" pushes of content from the
host to the device.
Known issues:
* The settings databases and wallpaper are saved/restored, but lots
of other system state is not yet captured in the full backup. This
means that for practical purposes this is usable for 3rd party
apps at present but not for full-system cloning/imaging.
Change-Id: I0c748b645845e7c9178e30bf142857861a64efd3
Romain Guy [Wed, 1 Jun 2011 21:56:19 +0000 (14:56 -0700)]
Merge "Add support to OpenGLRendere to draw BiDi text. Bug #
4350336"
Glenn Kasten [Wed, 1 Jun 2011 21:40:45 +0000 (14:40 -0700)]
Merge "Use AudioTrack::event_type not int in callback"
Brian Carlstrom [Wed, 1 Jun 2011 21:33:31 +0000 (14:33 -0700)]
Merge "Integrating keystore with keyguard (Part 1 of 4)"
Brian Carlstrom [Tue, 31 May 2011 08:00:15 +0000 (01:00 -0700)]
Integrating keystore with keyguard (Part 1 of 4)
Summary:
frameworks/base
keystore rewrite
keyguard integration with keystore on keyguard entry or keyguard change
KeyStore API simplification
packages/apps/Settings
Removed com.android.credentials.SET_PASSWORD intent support
Added keyguard requirement for keystore use
packages/apps/CertInstaller
Tracking KeyStore API changes
Fix for NPE in CertInstaller when certificate lacks basic constraints
packages/apps/KeyChain
Tracking KeyStore API changes
Details:
frameworks/base
Move keystore from C to C++ while rewriting password
implementation. Removed global variables. Added many comments.
cmds/keystore/Android.mk
cmds/keystore/keystore.h
cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp
Changed saveLockPattern and saveLockPassword to notify the keystore
on changes so that the keystore master key can be reencrypted when
the keyguard changes.
core/java/com/android/internal/widget/LockPatternUtils.java
Changed unlock screens to pass values for keystore unlock or initialization
policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java
KeyStore API changes
- renamed test() to state(), which now return a State enum
- made APIs with byte[] key arguments private
- added new KeyStore.isEmpty used to determine if a keyguard is required
keystore/java/android/security/KeyStore.java
In addition to tracking KeyStore API changes, added new testIsEmpty
and improved some existing tests to validate expect values.
keystore/tests/src/android/security/KeyStoreTest.java
packages/apps/Settings
Removing com.android.credentials.SET_PASSWORD intent with the
removal of the ability to set an explicit keystore password now
that the keyguard value is used. Changed to ensure keyguard is
enabled for keystore install or unlock. Cleaned up interwoven
dialog handing into discrete dialog helper classes.
AndroidManifest.xml
src/com/android/settings/CredentialStorage.java
Remove layout for entering new password
res/layout/credentials_dialog.xml
Remove enable credentials checkbox
res/xml/security_settings_misc.xml
src/com/android/settings/SecuritySettings.java
Added ability to specify minimum quality key to ChooseLockGeneric
Activity. Used by CredentialStorage, but could also be used by
CryptKeeperSettings. Changed ChooseLockGeneric to understand
minimum quality for keystore in addition to DPM and device
encryption.
src/com/android/settings/ChooseLockGeneric.java
Changed to use getActivePasswordQuality from
getKeyguardStoredPasswordQuality based on experience in
CredentialStorage. Removed bogus class javadoc.
src/com/android/settings/CryptKeeperSettings.java
Tracking KeyStore API changes
src/com/android/settings/vpn/VpnSettings.java
src/com/android/settings/wifi/WifiSettings.java
Removing now unused string resources
res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-bg/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-ms/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tl/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values-zu/strings.xml
res/values/strings.xml
packages/apps/CertInstaller
Tracking KeyStore API changes
src/com/android/certinstaller/CertInstaller.java
Fix for NPE in CertInstaller when certificate lacks basic constraints
src/com/android/certinstaller/CredentialHelper.java
packages/apps/KeyChain
Tracking KeyStore API changes
src/com/android/keychain/KeyChainActivity.java
src/com/android/keychain/KeyChainService.java
support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
tests/src/com/android/keychain/tests/KeyChainServiceTest.java
Change-Id: Ic141fb5d4b43d12fe62cb1e29c7cbd891b4be35d
Shimeng (Simon) Wang [Wed, 1 Jun 2011 21:28:54 +0000 (14:28 -0700)]
Merge "Fix overview scale setting for mobile sites."
Amith Yamasani [Wed, 1 Jun 2011 21:15:09 +0000 (14:15 -0700)]
Merge "Keep track of USER_QUERY to pass to the intent."
Jean-Michel Trivi [Wed, 1 Jun 2011 18:04:15 +0000 (11:04 -0700)]
Merge "Use channel mask instead of channel count for track creation"
Gilles Debunne [Wed, 1 Jun 2011 17:13:42 +0000 (10:13 -0700)]
Merge "Select all for text shown as an icon on smaller screens"
Gilles Debunne [Wed, 1 Jun 2011 17:12:11 +0000 (10:12 -0700)]
Merge "ActionBar makes room for icons when no title is provided"
Wink Saville [Wed, 1 Jun 2011 06:41:32 +0000 (23:41 -0700)]
am
7f9d3210: am
f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE
* commit '
7f9d3210cbef5c5e797f78fd3a2f836979de32e3':
Remove or disable some verbose debugging.
Dianne Hackborn [Wed, 1 Jun 2011 06:34:46 +0000 (23:34 -0700)]
Merge "resolved conflicts for merge of
590ec479 to master"
Dianne Hackborn [Wed, 1 Jun 2011 01:26:45 +0000 (18:26 -0700)]
resolved conflicts for merge of
590ec479 to master
Change-Id: I30503da6a73b9cb15eee66a67c75d50ccdc4b9f0
Svetoslav Ganov [Wed, 1 Jun 2011 01:13:16 +0000 (18:13 -0700)]
Merge "Removed unused service declaration from core tests."
Matthew Xie [Wed, 1 Jun 2011 01:04:36 +0000 (18:04 -0700)]
Merge "Add public api BluetoothSocket.isConnected."
Mike Lockwood [Wed, 1 Jun 2011 00:54:05 +0000 (17:54 -0700)]
Merge "UsbService: Refactor USB host and device support into two separate classes"
James Dong [Wed, 1 Jun 2011 00:25:47 +0000 (17:25 -0700)]
Merge "Send estimated bandwidth value as informational event when cache fetcher pauses"
Fabrice Di Meglio [Tue, 31 May 2011 23:57:55 +0000 (16:57 -0700)]
Merge "Fix TextView potential NPE in isLayoutRtl()"
RoboErik [Tue, 31 May 2011 23:44:04 +0000 (16:44 -0700)]
Merge "Work on changing syncx to cal_syncx"
Mike Lockwood [Tue, 31 May 2011 23:14:08 +0000 (16:14 -0700)]
Merge "Move stringToFile utility from ConnectivityService to FileUtils"
Jeff Brown [Tue, 31 May 2011 23:03:07 +0000 (16:03 -0700)]
am
3f5b95b0: am
a4e74744: am
fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2
* commit '
3f5b95b05efcf7ab2e8f193649b841dc1786f2ef':
Touch pad UX improvements.
Jeff Brown [Tue, 31 May 2011 23:02:54 +0000 (16:02 -0700)]
am
fd86ab8a: (-s ours) am
919a2efe: am
5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2
* commit '
fd86ab8a0f15bb15a8c274b8ea61743216f39532':
Fix deadlock in dispatcher. (DO NOT MERGE)
Adam Powell [Tue, 31 May 2011 23:02:41 +0000 (16:02 -0700)]
am
31caa0e6: am
b017632d: am
5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2
* commit '
31caa0e6e5c83cb03518ffe423ea5e37e452c8ae':
Updated popup dialog 9 patches (light)
Joe Onorato [Tue, 31 May 2011 23:02:26 +0000 (16:02 -0700)]
am
7f818d0a: am
94a06bd8: am
6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2
* commit '
7f818d0a97ecd7793811ff5549a4b67521d93f49':
Move status bar icons to sw600.
Jeff Hamilton [Tue, 31 May 2011 23:00:46 +0000 (16:00 -0700)]
am
7c324a3f: am
5e654d02: am
14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2
* commit '
7c324a3f7dde4be26b7a996b485a92ba25de3251':
Swap Mifare for MIFARE.
Joe Onorato [Tue, 31 May 2011 22:35:11 +0000 (15:35 -0700)]
Merge "Merge commit '
fce12613' into HEAD"
James Dong [Tue, 31 May 2011 21:33:20 +0000 (14:33 -0700)]
Merge "Add some comment to MediaRecorder.stop() about the stop() failure (-1007)"
Chet Haase [Tue, 31 May 2011 21:24:22 +0000 (14:24 -0700)]
Merge "Fixes for AnimationDrawable"
Joe Onorato [Tue, 31 May 2011 21:11:58 +0000 (14:11 -0700)]
Merge commit '
fce12613' into HEAD
Conflicts:
core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
core/res/res/layout/status_bar_latest_event_content_large_icon.xml
Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
Daniel Sandler [Tue, 31 May 2011 20:22:30 +0000 (13:22 -0700)]
Merge "Turn off navbar by default...again."
Daniel Sandler [Tue, 31 May 2011 20:17:33 +0000 (13:17 -0700)]
Merge "Move navigation bar to right-hand-side of seascape."
Svetoslav Ganov [Tue, 31 May 2011 19:53:12 +0000 (12:53 -0700)]
Merge "Updating the API since I forgot after rebase"
Joe Onorato [Tue, 31 May 2011 19:44:13 +0000 (12:44 -0700)]
Merge "Reduce log spew."
Svetoslav Ganov [Tue, 31 May 2011 19:05:54 +0000 (12:05 -0700)]
Merge "Accessibility serviceconfiguration via meta-data"
Fabrice Di Meglio [Tue, 31 May 2011 18:56:59 +0000 (11:56 -0700)]
Merge "Fix default for getAbsoluteGravity()"
Gilles Debunne [Tue, 31 May 2011 17:41:58 +0000 (10:41 -0700)]
Merge "Fix for bug
4499752 - Detect nulled layouts in HandleViews"
Marco Nelissen [Tue, 31 May 2011 17:26:17 +0000 (10:26 -0700)]
Merge "Fix crash when nesting Picture recording."
Eric Laurent [Tue, 31 May 2011 17:26:00 +0000 (10:26 -0700)]
Merge "Removed interface to load audio effects libraries"
Tadashi G. Takaoka [Tue, 31 May 2011 08:55:32 +0000 (01:55 -0700)]
Merge "Fix input type judgment of WebTextView"
Elliott Hughes [Sat, 28 May 2011 00:15:55 +0000 (17:15 -0700)]
Merge "FileOutputStream guarantees to open O_TRUNC (unless you explicitly ask otherwise)."
Mathias Agopian [Wed, 18 May 2011 05:54:42 +0000 (22:54 -0700)]
9-axis sensor fusion with Kalman filter
Add support for 9-axis gravity and linear-acceleration sensors
virtual orientation sensor using 9-axis fusion
Change-Id: I6717539373fce781c10e97b6fa59f68a831a592f
Mathias Agopian [Sat, 28 May 2011 00:02:27 +0000 (17:02 -0700)]
Merge "model rotation can now be controlled by the device's sensors"
Mathias Agopian [Sat, 28 May 2011 00:02:02 +0000 (17:02 -0700)]
Merge "Fix a few issues with sensors reference-counting"
Svetoslav Ganov [Fri, 27 May 2011 23:40:17 +0000 (16:40 -0700)]
Merge "Refatoring a bit of accessibility code"
Mathias Agopian [Fri, 27 May 2011 23:37:51 +0000 (16:37 -0700)]
Merge "sensorservice can now be ran standalone"
Gilles Debunne [Fri, 27 May 2011 23:12:19 +0000 (16:12 -0700)]
Merge "Replacement spans correctly measured in TextView"
Fabrice Di Meglio [Fri, 27 May 2011 22:35:12 +0000 (15:35 -0700)]
Merge "Fix overrides of isLayoutRtl(Drawable dr)"
Adam Powell [Fri, 27 May 2011 22:32:44 +0000 (15:32 -0700)]
Merge "Fix bug
4399686 - missing menu after returning from fullscreen video playback in browser"
Eric Laurent [Fri, 27 May 2011 22:26:25 +0000 (15:26 -0700)]
Merge "New effect library API"
Adam Powell [Fri, 27 May 2011 20:44:33 +0000 (13:44 -0700)]
Merge "Action bar tab layout tweaks."
Romain Guy [Fri, 27 May 2011 18:44:44 +0000 (11:44 -0700)]
Merge "Fix issue with drawColor(color, Mode.Clear)"
Jason Sams [Fri, 27 May 2011 18:37:45 +0000 (11:37 -0700)]
Merge "Cleaup of rsComponent to remove GL types."
Fabrice Di Meglio [Fri, 27 May 2011 18:28:43 +0000 (11:28 -0700)]
Merge "Add support for Gravity BEFORE and AFTER"
Martijn Coenen [Fri, 27 May 2011 17:55:13 +0000 (10:55 -0700)]
Merge "Fix NdefRecord flags handling."
Amith Yamasani [Fri, 27 May 2011 17:24:59 +0000 (10:24 -0700)]
Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones."
Romain Guy [Fri, 27 May 2011 17:23:09 +0000 (10:23 -0700)]
Merge "Prettify memory dump."
Brian Carlstrom [Fri, 27 May 2011 17:12:34 +0000 (10:12 -0700)]
Merge "Tracking merge of dalvik-dev to master"
Tadashi G. Takaoka [Fri, 27 May 2011 16:54:02 +0000 (09:54 -0700)]
Merge "Fix InputType determination of WebTextView"
Gilles Debunne [Fri, 27 May 2011 16:26:53 +0000 (09:26 -0700)]
Merge "EditText notifies the IME when a suggestion is picked."
Adam Powell [Fri, 27 May 2011 01:56:08 +0000 (18:56 -0700)]
Merge "Sync holo button bar styles with UX."
Romain Guy [Fri, 27 May 2011 01:49:30 +0000 (18:49 -0700)]
Merge "Remove extraneous log."
Romain Guy [Fri, 27 May 2011 01:40:13 +0000 (18:40 -0700)]
Merge "Fix texture coordinates for sub-bitmap rendering."
Matthew Xie [Fri, 27 May 2011 01:13:08 +0000 (18:13 -0700)]
Merge "Add wide band speech feature flag"
Romain Guy [Thu, 26 May 2011 23:43:26 +0000 (16:43 -0700)]
Merge "Correctly implement the CLEAR xfermode."
Jason Sams [Thu, 26 May 2011 23:37:09 +0000 (16:37 -0700)]
Merge "Start splitting allocation into hal and core."
Huahui Wu [Thu, 26 May 2011 23:31:28 +0000 (16:31 -0700)]
Merge "b/
4452171 Dumping video playbacks to files."
Adam Powell [Thu, 26 May 2011 22:47:21 +0000 (15:47 -0700)]
Merge "Fix bug
4487948 - action bar tabs + configuration change = :("
Eric Fischer [Thu, 26 May 2011 22:37:27 +0000 (15:37 -0700)]
Merge "Import revised translations."
Dianne Hackborn [Thu, 26 May 2011 21:14:35 +0000 (14:14 -0700)]
am
d5238cc1: am
7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit '
d5238cc1ab8366389b2aada228f2f2e5cbb3244e':
Rework how we decide whether to use system or status bar.
Eric Fischer [Thu, 26 May 2011 21:14:31 +0000 (14:14 -0700)]
am
90856661: am
66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
90856661cf07453a23c3737f421a4686b70d95c1':
Import revised translations. DO NOT MERGE
Dianne Hackborn [Thu, 26 May 2011 20:34:33 +0000 (13:34 -0700)]
am
7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2
* commit '
7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
Rework how we decide whether to use system or status bar.
Eric Fischer [Thu, 26 May 2011 20:34:29 +0000 (13:34 -0700)]
am
66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
66fd9ab236b3df85a32792caec41a2cd83622e28':
Import revised translations. DO NOT MERGE
James Dong [Thu, 26 May 2011 19:00:51 +0000 (12:00 -0700)]
Merge "Extract embedded cover art (aka poster frame) in mp4 files"
James Dong [Thu, 26 May 2011 18:41:30 +0000 (11:41 -0700)]
am
c004a0c9: am
05e13b9e: am
c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
* commit '
c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
Revert "Use pread() to get the decrypted data for container based DRM file."
Jeff Brown [Thu, 26 May 2011 18:41:12 +0000 (11:41 -0700)]
am
a1a56bd0: (-s ours) am
6ef142a0: am
b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
* commit '
a1a56bd0e3d730edab327495acd5d90b10a6f1e4':
Fix bug reporting presence of orientation axis. (DO NOT MERGE)
Jeff Brown [Thu, 26 May 2011 18:40:46 +0000 (11:40 -0700)]
am
23e620b3: (-s ours) am
53c3d5b1: am
325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
* commit '
23e620b32f9c243e124309681b95fe228feb53b8':
Add tap/drag touchpad gesture. (DO NOT MERGE)