am: f36a9954  -s ours

Change-Id: Icf392e8e462ed9bb42b9b8b67850ab702078e559

* changes:
  Fixed the accessibility of the reply button
  Avoiding weird icon positions

The new button didn't have a content description before
and could therefore not be read.

Change-Id: I66f2c52b50494f7347d5beebc44c7d4fecfd33b2
Fixes: 62639422
Test: manual add reply notification, observe talkback

When expanding quickly we switch to a linear interpolation.
In this case the last icon may be stuck in between the
shelf position and the notification position, which looks pretty bad.
We therefore optimize this case better to avoid these weird
in-between cases.

Test: manual, expand with various notifications
Fixes: 63088105
Fixes: 62374617
Change-Id: I95f72c9defc6c941a5a6a71829d239529c3861e9

Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." into oc-dr1-dev

Internal API, available through AudioManagerInternal, to flag
  a UID as having lost the ability to play audio. When that
  happens, all players associated with this UID are paused, and
  future players are immediately paused when they report they
  started.
Users of this API must "enable" a previously banned UID when
  it is no longer in use.

Test: upcoming manual test with background apps
Bug: 34471029
Change-Id: Ic1c103aabe8f3897072b3ce938d84cb949540e23

key,to the modem.

We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG: 35606429
Test: manual
(cherry picked from commit 6d50fec3)
Merged-In: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b
Change-Id: Idf835d9b99a26cb0c0d73fb70ffa9875843ac62b

The message sent from NetworkScanRequestTracker to TelephonyScanManager
might be across different process, so we have to wrap the List<CellInfo> into
Bundle because List<> is not parcelable.

Test: Telephony sanity tests
Bug: 30954762
Change-Id: I77945b247530b85c0b82876d528549498a711550

am: 0d1b1a25

Change-Id: Idd633c178416ababe623f02327a830939ee769ba

Merge "Merge "Use content type specified on the command line" into oc-dev am: f89bf303" into oc-dr1-dev

am: f89bf303

Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0

Test: visual
Bug: 37115488
Change-Id: I43fe6648f56d25f41fadefcaa27d2c0cf3f077ba

Adds new mechanism for activities in sysui to be replaced by plugins
and allows that to happen for recents.

Test: runtest systemui
Change-Id: I8b570ce7c57484c58a52afe5e247d24ebfa0c57f

Once the user has entered normal usage their locale configuration is
essentially guaranteed to be what they intend to use.  Don't override
it during deferred restore.  (We distinguish based on whether the
device is already marked as 'provisioned'.)

Bug 62224214
Test: manual

Change-Id: Icedef6a86a2b8942937b1384b204def88f2238d2

am: f1b57080

Change-Id: I23d69f5d9b27f893f2b8e8c38f021900d5eb83c2

am: a0376f25  -s ours

Change-Id: I5331ee04e4cd08a2280e07c06f973329a3c41ab4

Also test to make sure the colors stay the same.

Test: runtest -x frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/graph/BatteryMeterDrawableBaseTest.java
Bug: 62668861
Change-Id: I7d01fd41aeedcb182dc05da8d7b0501a6b5b8539