Adam Lesinski
8549988a89
Merge \\\"BatteryStats: record best estimated battery capacity\\\" into nyc-dev am: c2e06a55f9 am: a804fae3be
...
am: 0f7b0a8cc6
2016-06-20 20:05:22 +00:00
Adam Lesinski
0f7b0a8cc6
Merge \\"BatteryStats: record best estimated battery capacity\\" into nyc-dev am: c2e06a55f9
...
am: a804fae3be
2016-06-20 20:00:07 +00:00
Adam Lesinski
a804fae3be
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
...
am: c2e06a55f9
2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
2016-06-20 19:49:46 +00:00
Adam Lesinski
f9b20a9ec4
BatteryStats: record best estimated battery capacity
...
Using the coulomb counter, record the estimated max battery
capacity.
Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
2016-06-20 10:58:37 -07:00
Christopher Ferris
9738e7d393
resolve merge conflicts of cf11123 to master
...
Change-Id: I6d65685d415edea0be48bab04a71d4c52b1c66fe
2016-06-17 18:12:01 -07:00
Wei Wang
cf11123025
Merge \"remove Intent.FLAG_ACTIVITY_NEW_TASK flag check\" into nyc-mr1-dev
...
am: 4828bb9330
2016-06-18 00:29:44 +00:00
TreeHugger Robot
4828bb9330
Merge "Catch throwable exceptions." into nyc-mr1-dev
2016-06-18 00:26:43 +00:00
Yohei Yukawa
045de3f08c
Merge \\"API Rename: IC#inputContent to IC#commitContent.\\" into nyc-mr1-dev am: 01e7c10d37
...
am: 0d7dcf7bc3
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
2016-06-17 23:31:12 +00:00
Christopher Ferris
ea8b5de33d
Catch throwable exceptions.
...
If the zygote dies early enough, certain exceptions disappear and never
result in an error message in the log. Fix the code to catch all
Throwable exceptions so that an error message does not result in a
silent restart of the zygote.
Bug: 29400363
Change-Id: Ib044006629ea4441728921f3c587d0cb295ec745
2016-06-17 15:29:58 -07: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
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
2016-06-16 04:30:32 +00:00
Selim Cinek
447ee99755
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
...
am: c1720dce1b
2016-06-16 04:25:26 +00:00
Selim Cinek
0630d92064
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
...
am: c1720dce1b
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
2016-06-16 01:04:17 +00:00
Mihai Niță
ba183ff406
Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb
...
am: 44080ac5bf
2016-06-16 00:41:59 +00:00
Mihai Nita
d80a8e8fe7
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
...
am: c8c9afeacb
2016-06-16 00:37:54 +00:00
Mihai Nita
44080ac5bf
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
...
am: c8c9afeacb
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
2016-06-15 00:07:56 +00:00
Todd Kennedy
162b74a6fd
Merge \"New API w/ multiple prefixes\" into nyc-mr1-dev
...
am: d07b87cb1c
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
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
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
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
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
2016-06-14 00:52:36 +00:00
Yohei Yukawa
176642ec2c
Merge \"Add InputConnection#insertContent().\" into nyc-mr1-dev
...
am: 03f759e87e
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
2016-06-13 22:52:58 +00:00
Adrian Roos
4c9e82dba4
Merge \\"Add MessagingStyle transitions\\" into nyc-dev am: a5e2aa99c0
...
am: 0a91c8dddf
2016-06-13 22:33:38 +00:00
Adrian Roos
0a91c8dddf
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
2016-06-13 22:20:05 +00:00
Adrian Roos
c8649b381d
Merge \"Add MessagingStyle transitions\" into nyc-dev
...
am: a5e2aa99c0
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
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
2016-06-11 01:42:47 +00:00
Andrii Kulian
6e6b0ce1a6
Merge \"Reinflate primary action mode view after detach\" into nyc-dev
...
am: 82f2df6108
2016-06-11 01:38:37 +00:00
Andrii Kulian
a9b59e9cf2
Merge \"Reinflate primary action mode view after detach\" into nyc-dev
...
am: 82f2df6108
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
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
2016-06-11 00:13:22 +00:00
