Commit Graph

6748 Commits

Author SHA1 Message Date
Yohei Yukawa
045de3f08c Merge \\"API Rename: IC#inputContent to IC#commitContent.\\" into nyc-mr1-dev am: 01e7c10d37
am: 0d7dcf7bc3

Change-Id: I5c4209a79e7426192da082100ac2a7517de36b81
2016-06-17 23:38:28 +00:00
Yohei Yukawa
0d7dcf7bc3 Merge \"API Rename: IC#inputContent to IC#commitContent.\" into nyc-mr1-dev
am: 01e7c10d37

Change-Id: I5aa903ee453a3945d3f2710d2b6734443fcbd972
2016-06-17 23:31:12 +00:00
Yohei Yukawa
adebb52588 API Rename: IC#inputContent to IC#commitContent.
As shown in below, we have already used commit* naming convention in
InputConnection.

 - InputConnection#commitCompletion(CompletionInfo);
 - InputConnection#commitCorrection(CorrectionInfo);
 - InputConnection#commitText(CharSequence, int);

Hence renaming IC#inputContent() to IC#commitContent() would make the
new method more consistent.

Bug: 29450024
Change-Id: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
2016-06-17 10:10:39 -07:00
Selim Cinek
e6ec63ffa6 Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc-dev am: c1720dce1b am: 0630d92064
am: 7a0051b68f

Change-Id: Ia1052c236a6dd85e694992db4f7515bab6c78764
2016-06-16 04:35:48 +00:00
Selim Cinek
7a0051b68f Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
am: 0630d92064

Change-Id: I01afc02fe75b0ae7223e9deba6355ed00961faaa
2016-06-16 04:30:32 +00:00
Selim Cinek
447ee99755 Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I14674254eb79fef58e4dcb1a8d7ecaab24831691
2016-06-16 04:25:26 +00:00
Selim Cinek
0630d92064 Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I25bd41f1307233bba14067952086ca7be3118505
2016-06-16 04:25:26 +00:00
TreeHugger Robot
c1720dce1b Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev 2016-06-16 04:19:48 +00:00
Mihai Nita
90804d48f9 Merge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into nyc-dev am: c8c9afeacb am: 44080ac5bf
am: ba183ff406

Change-Id: Ic812636f47ec7fd348e00d2d2bb7df883e5ab8cd
2016-06-16 01:04:17 +00:00
Mihai Niță
ba183ff406 Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb
am: 44080ac5bf

Change-Id: Ib9f1021c18187364d23058fdff39405a00402efe
2016-06-16 00:41:59 +00:00
Mihai Nita
d80a8e8fe7 Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am: c8c9afeacb

Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25
2016-06-16 00:37:54 +00:00
Mihai Nita
44080ac5bf Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am: c8c9afeacb

Change-Id: Iaa4df1af4a18ad0bc4e99a5bd47aa8f6c1357e50
2016-06-16 00:34:30 +00:00
Mihai Niță
c8c9afeacb Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev 2016-06-16 00:28:37 +00:00
Mihai Nita
1711d430cb Fix for NullPointerException in SuggestedLocaleAdapter
Bug: 28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69
2016-06-15 17:07:10 -07:00
Selim Cinek
e9bad242f3 Added dismiss, expand, and collapse accessibility actions
Fixes: 20343017
Fixes: 29368014
Change-Id: Ib571242aac04c67aea2f3c3ce76139eaedc1f3f1
2016-06-15 16:30:09 -07:00
Todd Kennedy
20c0209e2f Merge \\"New API w/ multiple prefixes\\" into nyc-mr1-dev am: d07b87cb1c
am: 162b74a6fd

Change-Id: I81d79930c6d3d42be61a9ab1cdb5f29d677cd3de
2016-06-15 00:07:56 +00:00
Todd Kennedy
162b74a6fd Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
am: d07b87cb1c

Change-Id: I3296ac4343cfedb5b88470963cb4671e9e3427f6
2016-06-15 00:03:12 +00:00
Yohei Yukawa
acf01a9f12 Merge \\\"Quick workaround for a performance regression in IME APIs.\\\" into nyc-dev am: 6fe4865e85 am: bb587122c6
am: da7846ae8b

Change-Id: If0edca2cc2a512d6c0d2dc4d6206068f411edb14
2016-06-14 23:09:55 +00:00
Todd Kennedy
a97045b245 New API w/ multiple prefixes
Use the new API that contains multiple hash prefixes and a mask. Also
do some small refactoring necessary to handle multiple prefixes and
use a common implementation of the hash generation

Change-Id: Ib52f767ea6aadc30c67c5bdee949e9f9c5f04e44
2016-06-14 16:01:05 -07:00
Yohei Yukawa
da7846ae8b Merge \\"Quick workaround for a performance regression in IME APIs.\\" into nyc-dev am: 6fe4865e85
am: bb587122c6

Change-Id: I678349a113f27a1aa41a404ca97411f2c524a511
2016-06-14 22:53:27 +00:00
Yohei Yukawa
cb2c497230 Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
am: 6fe4865e85

Change-Id: I96bef7f47729282a57b6acc11c8bf4ada42c6a06
2016-06-14 22:48:35 +00:00
Yohei Yukawa
bb587122c6 Merge \"Quick workaround for a performance regression in IME APIs.\" into nyc-dev
am: 6fe4865e85

Change-Id: Id039d1dd681483c1d86349ee7e765b2f1f4fa95f
2016-06-14 22:47:28 +00:00
Yohei Yukawa
6fe4865e85 Merge "Quick workaround for a performance regression in IME APIs." into nyc-dev 2016-06-14 22:43:19 +00:00
Yohei Yukawa
ccb024aa2b Quick workaround for a performance regression in IME APIs.
It turns out that the performance of
InputMethodManager#getCurrentInputMethodSubtype() is regressed from ~1ms
to ~20ms when
 - Settings.Secure.SELECTED_INPUT_METHOD_SUBTYPE == -1 and
 - The active IME supports many subtypes (~100)
because we try to find a fallback subtype based on the system locales
every time when IMM#getCurrentInputMethodSubtype() is called.

This could be contributing UI janks because spell checker clients
running in the UI thread indirectly depend on that method.

Fortunatelly the critical path is in
InputMethodUtils#getImplicitlyApplicableSubtypesLockedImpl(), which is
basically a state-less method. We can easily and safely cache its
result by using LocaleList and InputMethod as cache keys.

With this CL the performance basically recovers to the Android M level.

Bug: 28889203
Change-Id: I5ed16c7f14cc18052854f4fd6c9bae8550c332ee
2016-06-14 21:01:41 +00:00
Yohei Yukawa
e3d3740f1c Merge \\"Add InputConnection#insertContent().\\" into nyc-mr1-dev am: 03f759e87e
am: 176642ec2c

Change-Id: I96395b6e883aa7dd462d1281b6859afa7b324937
2016-06-14 00:52:36 +00:00
Yohei Yukawa
176642ec2c Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
am: 03f759e87e

Change-Id: I7ed048eb980a5b6fa5379756cf4679710c8ce358
2016-06-14 00:38:47 +00:00
Yohei Yukawa
03f759e87e Merge "Add InputConnection#insertContent()." into nyc-mr1-dev 2016-06-14 00:26:39 +00:00
Adrian Roos
5adaba4b21 Merge \"Merge \\\"Add MessagingStyle transitions\\\" into nyc-dev am: a5e2aa99c0 am: 0a91c8dddf\" into nyc-mr1-dev-plus-aosp
am: 70cfa1625b

Change-Id: I4b222abebb42b89ea36fd6f273c85c860c1d22f0
2016-06-13 22:52:58 +00:00
Adrian Roos
4c9e82dba4 Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
am: 0a91c8dddf

Change-Id: Ifd034837a0b82416e6f87dffb944b0761734a59a
2016-06-13 22:33:38 +00:00
Adrian Roos
0a91c8dddf Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: I96170c3811dd624969a1f93bb7a2dc65b8d5df0a
2016-06-13 22:20:05 +00:00
Adrian Roos
c8649b381d Merge \"Add MessagingStyle transitions\" into nyc-dev
am: a5e2aa99c0

Change-Id: Ib667411e14309d38f60b254178d7fc7d71eedde0
2016-06-13 21:55:06 +00:00
Adrian Roos
a5e2aa99c0 Merge "Add MessagingStyle transitions" into nyc-dev 2016-06-13 21:45:08 +00:00
Adrian Roos
feafa052f3 Add MessagingStyle transitions
Fixes a particularly bad transition in the case where there
is one incoming message to a group.

Change-Id: Ieddece4a496292a69e14cdcd74d94986938d8223
Fixes: 29043489
2016-06-13 14:31:51 -07:00
Yohei Yukawa
152944f490 Add InputConnection#insertContent().
Providing an official protocol for IMEs to insert an image to the
application is something that has been requested from many IME
developers to Android OS.  With this CL, IMEs are able to ask
applications to insert a content including image files as follows.

 1. An application that opts in to this protocol specifies a list of
    supported content MIME types in EditorInfo#contentMimeTypes.
 2. When an IME is actively interacting with such an application, the
    IME can call InputConnection#insertContent() with a InputContentInfo
    that contains content URI, metadata (ClipDescription), and an
    optional link URI.
 3. The application can read the stream data from the given content URI
    to insert the content into somewhere in the application.

Detailed design background can be found in the JavaDoc of
InputConnection#insertContent().

Bug: 22830793
Change-Id: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
2016-06-10 19:04:34 -07:00
Andrii Kulian
b55f328e56 Merge \\\"Reinflate primary action mode view after detach\\\" into nyc-dev am: 82f2df6108 am: 6e6b0ce1a6
am: 5a80940852

Change-Id: I0686820d937d10faa01baaeba815548c6775755f
2016-06-11 01:46:25 +00:00
Andrii Kulian
5a80940852 Merge \\"Reinflate primary action mode view after detach\\" into nyc-dev am: 82f2df6108
am: 6e6b0ce1a6

Change-Id: I712344966dfe02a647e5751c9741c6677e414f6e
2016-06-11 01:42:47 +00:00
Andrii Kulian
6e6b0ce1a6 Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am: 82f2df6108

Change-Id: I80f1aa56145ea12001942c57161305b3fcdcc226
2016-06-11 01:38:37 +00:00
Andrii Kulian
a9b59e9cf2 Merge \"Reinflate primary action mode view after detach\" into nyc-dev
am: 82f2df6108

Change-Id: Ic6def2b3eb5e654b028d11773a9527f01943289d
2016-06-11 01:38:36 +00:00
TreeHugger Robot
82f2df6108 Merge "Reinflate primary action mode view after detach" into nyc-dev 2016-06-11 01:31:15 +00:00
Michael Kwan
ccbc102030 Merge \\"Temp fix to split header and position count behaviour for watches.\\" into nyc-mr1-dev am: 5985e3f92f
am: 5c30475094

Change-Id: I1c5ca571e461b6d82480b0738c2924e0e20521d8
2016-06-11 00:16:44 +00:00
Michael Kwan
5c30475094 Merge \"Temp fix to split header and position count behaviour for watches.\" into nyc-mr1-dev
am: 5985e3f92f

Change-Id: I2167505e4c71d6f7bc32d3a90c0c94a0d92319ab
2016-06-11 00:13:22 +00:00
TreeHugger Robot
5985e3f92f Merge "Temp fix to split header and position count behaviour for watches." into nyc-mr1-dev 2016-06-11 00:06:56 +00:00
Andrii Kulian
8d6ac26504 Reinflate primary action mode view after detach
When app is resized in multi-window mode we preserve the window along
with the decor view. If action mode view was shown before such config
change, its view is detached, but the mPrimaryActionModeView variable
is not cleared. So when action mode view is shown again after that it
thinks that its view is still alive.
This CL adds additional check to inflate new mPrimaryActionModeView
if it is not attached to any window.

Bug: 28971666
Change-Id: Ia8c24d4322be32e8b2c8967301beb3a4d889d501
2016-06-10 16:07:43 -07:00
Adam Lesinski
03c3edabaa Merge \\\"BatteryStats: Fix read/write parcel order\\\" into nyc-dev am: e8a442ccd6 am: 860e09ddce
am: e9fdfb6334

Change-Id: I5cdf50d4c89fd135571d97ab3c4072a6b56bc76c
2016-06-10 22:52:19 +00:00
Adam Lesinski
e9fdfb6334 Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6
am: 860e09ddce

Change-Id: I9f8cbdd345bf6b5c95cab4360d89efb9909b3dfd
2016-06-10 22:47:46 +00:00
Adam Lesinski
643fc8341a Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am: e8a442ccd6

Change-Id: Ic0a5b9acedd9ed56aaa189aaf89aaa10f273f019
2016-06-10 22:43:49 +00:00
Adam Lesinski
860e09ddce Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
am: e8a442ccd6

Change-Id: I08f02adc6014ff9bcae60f60a091bba74695488d
2016-06-10 22:43:45 +00:00
Adam Lesinski
e8a442ccd6 Merge "BatteryStats: Fix read/write parcel order" into nyc-dev 2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849 BatteryStats: Fix read/write parcel order
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.

Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
2016-06-10 15:24:16 -07:00
Michael Kwan
937035ef57 Temp fix to split header and position count behaviour for watches.
Bug: 29010414
Bug: 29244476
Change-Id: I5c8616304e7d44f423636612670d9187ad030679
2016-06-10 12:01:23 -07:00