Commit Graph

6216 Commits

Author SHA1 Message Date
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
TreeHugger Robot
c1720dce1b Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev 2016-06-16 04:19:48 +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
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
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
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
03f759e87e Merge "Add InputConnection#insertContent()." into nyc-mr1-dev 2016-06-14 00:26:39 +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
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
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
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
Adam Lesinski
d499d79b07 Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am: 094c40b2cc

Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993
2016-06-10 02:21:54 +00:00
TreeHugger Robot
094c40b2cc Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev 2016-06-10 02:12:23 +00:00
Adam Lesinski
3ee3f63eb8 BatteryStats: Record fine grained battery discharge
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.

Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Phil Weaver
d567ae1b87 Merge \"Improve accessibility window title behavior\" into nyc-dev
am: f8af34365c

Change-Id: I620cb3dc270a8ad409ec1760cedd778821fd8d98
2016-06-09 23:41:45 +00:00
Doris Liu
c9493879d7 Support Keyframe definition for AVD on RT
BUG: 27441613
Change-Id: Iece386f65f3704d1b7caa2b3690a8d3048ccf6e2
2016-06-09 14:40:32 -07:00
Phil Weaver
155edc693e Improve accessibility window title behavior
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.

Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
2016-06-09 13:45:46 -07:00
Adrian Roos
7d76682bb3 Merge "Seascape Navigation Bar View" into nyc-mr1-dev 2016-06-09 18:22:22 +00:00
Adam Lesinski
a78fa63f75 Merge \"Consume the first sample of KernelUidCpuTimeReader\" into nyc-dev
am: e5417a3863

Change-Id: I6188a7261443e192fb355033f7ff1cc01ea47c33
2016-06-08 22:55:39 +00:00
Adam Lesinski
e7f4f0297f Consume the first sample of KernelUidCpuTimeReader
If the system_server crashes, when it starts back up
it will assume that the entries in kernelUidCpuTimeReader
are all fresh and we will end up double counting cpu time
and power.

Bug:29163081
Change-Id: I73e693199c170229af57efd610950e90263ac9bc
2016-06-08 14:19:09 -07:00
TreeHugger Robot
3e2bfbd135 Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev
* changes:
  Give WakeupMessage the ability to transport an object as well.
  Don't treat the lingerExpired broadcast specially.
  Add a test for mobile data always on.
  Add a FakeSettingsProvider and use it in ConnectivityServiceTest.
2016-06-08 06:35:32 +00:00
Lorenzo Colitti
eab17da588 Give WakeupMessage the ability to transport an object as well.
Bug: 23113288
Change-Id: Ic98e3bcb3ea8b0b28a309bd647fb4178311c46a3
2016-06-08 14:11:52 +09:00
Phil Weaver
5c32d65e78 Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22
2016-06-08 02:24:42 +00:00
Phil Weaver
fc71309640 Merge "Revert "Improve accessibility window title behavior"" into nyc-dev 2016-06-08 02:19:34 +00:00
Andreas Gampe
89b7934905 Merge \"Frameworks/base: Fix FastPrintWriter infinite loop\" into nyc-dev
am: c82a2b5358

Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4
2016-06-08 00:45:34 +00:00
TreeHugger Robot
c82a2b5358 Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev 2016-06-08 00:39:00 +00:00
Jim Miller
21c77ed1a8 Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
am: 4401e24add

Change-Id: Ibe8709900618cc5d9c5ca18a88ca6fce8c552d54
2016-06-08 00:38:25 +00:00
Phil Weaver
266ed9acc3 Revert "Improve accessibility window title behavior"
Bug: 29127065

This reverts commit 2a7e4442bf.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
2016-06-08 00:34:40 +00:00
TreeHugger Robot
4401e24add Merge "Move legacy full disk encryption code to Settings." into nyc-dev 2016-06-08 00:31:31 +00:00
Andreas Gampe
ce78b9e114 Frameworks/base: Fix FastPrintWriter infinite loop
Check for error condition in loop.

Bug: 29123428
Change-Id: I361ed27ecb8f05512d7e17f8045f3d34667d32d8
2016-06-07 16:02:23 -07:00
Jim Miller
525ca53b4f Move legacy full disk encryption code to Settings.
Fixes bug 27617297

Change-Id: I59455cc1fc46949348d2922834724ab40c14f886
2016-06-03 18:39:16 -07:00
Adrian Roos
85d202b18a Seascape Navigation Bar View
Allow placing navigation bar on the left side aka seascape. Also
deal with fallout from this change in frame calculations, decor view,
and all over SystemUI - notably no changes to the navigation bar view.

Bug: 28823676
Change-Id: I91187a974a10a940787a858e2609f2e9c5bade78
2016-06-02 16:29:10 -07:00
Dianne Hackborn
340f22fcc6 Merge "Work on issue #29042642: Watchdog going off" into nyc-dev
am: 5a6cf3ac9a

* commit '5a6cf3ac9a3945c2d1f0e5e28ffda9e52124eb15':
  Work on issue #29042642: Watchdog going off

Change-Id: I2a3b120648aef7401bb6d4c2460f868cdc16c1a0
2016-06-02 18:50:24 +00:00
Dianne Hackborn
5a6cf3ac9a Merge "Work on issue #29042642: Watchdog going off" into nyc-dev 2016-06-02 18:31:16 +00:00
Dianne Hackborn
9b78db41a0 Work on issue #29042642: Watchdog going off
Have FastPrintWriter note all cases where an exception is
thrown, and stop trying to push more data into the output
stream when this happens.

Change-Id: I51a1eeb26578f02b2a6f45ef7bc2513dfde702a2
2016-06-01 18:19:24 -07:00
David Sehr
2855609944 Merge "Installer connection support for dump_profiles" into nyc-dev
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I6cf3d4fe88577ef1d149c3c4b1c3ee7160d9c7e6
2016-06-01 23:03:50 +00:00
David Sehr
7c5bcfc21a Merge "Installer connection support for dump_profiles" into nyc-dev 2016-06-01 22:16:05 +00:00
David Sehr
a877708286 Installer connection support for dump_profiles
Bug: 28748264
Change-Id: I22322b5a0716a030d9873edcc6dfd7f3ef2d3bca
2016-06-01 08:21:27 -07:00