OSDN Git Service
Felipe Leme [Fri, 10 Jun 2016 19:56:21 +0000 (19:56 +0000)]
Merge \"Check for valid paths when getVolumeList() returns invisible volumes.\" into nyc-dev
am:
6da2fb61ce
Change-Id: I0f6c6e36c50b56036b43c32680c8abde2db61c7a
Robert Greenwalt [Fri, 10 Jun 2016 19:39:25 +0000 (19:39 +0000)]
Merge "Clean up PCO plumbing." into nyc-mr1-dev
TreeHugger Robot [Fri, 10 Jun 2016 19:38:49 +0000 (19:38 +0000)]
Merge "Check for valid paths when getVolumeList() returns invisible volumes." into nyc-dev
Felipe Leme [Fri, 10 Jun 2016 18:09:11 +0000 (11:09 -0700)]
Check for valid paths when getVolumeList() returns invisible volumes.
The FLAG_INCLUDE_INVISIBLE was created to let SM.getStorageVolumes()
return mounted volumes (like USB drives), but in the current form it
might return invalid volumes. For example, when a SD Card is adopted as
an internal storage, it will return 2 volumes instead of one, the "bad"
one being:
VolumeInfo{emulated}:
type=EMULATED diskId=null partGuid=null mountFlags=0 mountUserId=-1
state=UNMOUNTED
fsType=null fsUuid=null fsLabel=null
path=null internalPath=null
As such, we need to filter out those volumes that don't have a path.
BUG:
29250241
Change-Id: I3f84b53eac98f31f918d843c70f9d42983e2a438
John Reck [Fri, 10 Jun 2016 18:02:57 +0000 (18:02 +0000)]
Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
am:
e4b1fb94e3
Change-Id: I488da6f9f779ddf64beb6ac12d1481d2bfd69821
Dianne Hackborn [Fri, 10 Jun 2016 17:49:37 +0000 (17:49 +0000)]
Merge \"Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format\" into nyc-dev
am:
9303ecb317
Change-Id: Ib7479599ba70cf05dec9b323d62149670612abaa
John Reck [Fri, 10 Jun 2016 17:46:53 +0000 (17:46 +0000)]
Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev
Dianne Hackborn [Fri, 10 Jun 2016 17:43:13 +0000 (17:43 +0000)]
Merge "Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format" into nyc-dev
Tianjie Xu [Fri, 10 Jun 2016 17:23:25 +0000 (17:23 +0000)]
Merge \"Collect statistics of source build version\" into nyc-dev
am:
8872a604b9
Change-Id: Ic920aced4f17c31a09bea55480f92252f20d728d
Chong Zhang [Fri, 10 Jun 2016 17:18:53 +0000 (17:18 +0000)]
Merge \"Use user id 0 to get missing appId for debugger\" into nyc-dev
am:
792918e5fd
Change-Id: I8ccb08fe3aa9c00b715078086b233a55a338eb94
Tianjie Xu [Fri, 10 Jun 2016 17:13:53 +0000 (17:13 +0000)]
Merge "Collect statistics of source build version" into nyc-dev
Chong Zhang [Fri, 10 Jun 2016 17:06:08 +0000 (17:06 +0000)]
Merge "Use user id 0 to get missing appId for debugger" into nyc-dev
Chris Craik [Fri, 10 Jun 2016 16:08:44 +0000 (16:08 +0000)]
Merge \"Fix framebuffer incomplete errors\" into nyc-dev
am:
4bcf66030d
Change-Id: If578de7d7ea10cceb0e19eb68e305432e4177d04
TreeHugger Robot [Fri, 10 Jun 2016 16:03:20 +0000 (16:03 +0000)]
Merge "Fix framebuffer incomplete errors" into nyc-dev
TreeHugger Robot [Fri, 10 Jun 2016 16:00:40 +0000 (16:00 +0000)]
Merge "fix prefix generation" into nyc-mr1-dev
Adam Lesinski [Fri, 10 Jun 2016 02:21:54 +0000 (02:21 +0000)]
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
am:
094c40b2cc
Change-Id: Ie85fcfc2fa7aec5e7c15f57d605840c563c0e993
TreeHugger Robot [Fri, 10 Jun 2016 02:12:22 +0000 (02:12 +0000)]
Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 01:05:03 +0000 (01:05 +0000)]
Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
am:
d75bc225ac
Change-Id: I70dbac4cb8002d8f216991ca78b18e9c1612eb89
Adam Lesinski [Fri, 10 Jun 2016 00:53:43 +0000 (00:53 +0000)]
Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev
Adam Lesinski [Fri, 10 Jun 2016 00:46:19 +0000 (17:46 -0700)]
BatteryStats: Bump checkin format version to 18
Bug:
28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
Adam Lesinski [Wed, 8 Jun 2016 20:55:55 +0000 (13:55 -0700)]
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
Phil Weaver [Fri, 10 Jun 2016 00:16:44 +0000 (00:16 +0000)]
Merge \"Stop magnifying surface insets.\" into nyc-dev
am:
4663b4e806
Change-Id: Id98ea0c13c325d79e5c2ae88184351e75ad7db46
Phil Weaver [Fri, 10 Jun 2016 00:08:21 +0000 (00:08 +0000)]
Merge "Stop magnifying surface insets." into nyc-dev
Chris Craik [Thu, 9 Jun 2016 23:57:11 +0000 (16:57 -0700)]
Fix framebuffer incomplete errors
bug:
29127615
Primarily fixes case where 0 dimensioned layers could be
created/updated. Additionally, adds more logging in incomplete
framebuffer cases, if they still occur.
Change-Id: Ib90dbbafd6905aca3c8f46e64064e13a308f713d
Dianne Hackborn [Thu, 9 Jun 2016 23:58:45 +0000 (16:58 -0700)]
Fix issue #
29252997: Should be able to dump only broadcast stats as checkin format
Change-Id: I36d4e5e20ff2ed1b4d02a04390e0415b9b2394a3
TreeHugger Robot [Thu, 9 Jun 2016 23:53:54 +0000 (23:53 +0000)]
Merge "Fix race conditions between Tethering and TetherInterfaceStateMachine" into nyc-mr1-dev
Christopher Tate [Thu, 9 Jun 2016 23:48:44 +0000 (23:48 +0000)]
Merge \"Don\'t allow restore sessions during backups\" into nyc-dev
am:
9faaf5418a
Change-Id: I68e844ee0710bc4125da7789c2059ab23262ba76
Phil Weaver [Thu, 9 Jun 2016 23:41:45 +0000 (23:41 +0000)]
Merge \"Improve accessibility window title behavior\" into nyc-dev
am:
f8af34365c
Change-Id: I620cb3dc270a8ad409ec1760cedd778821fd8d98
Chong Zhang [Thu, 9 Jun 2016 23:15:27 +0000 (16:15 -0700)]
Use user id 0 to get missing appId for debugger
When forceStopPackageLocked is used to kill existing app process for
relaunching with debugger, user id could be -1 and getPackageUid will
already return -1. This results in killPackageProcessesLocked() not
able to find and kill the app, and wait for debugger will.
This also revert commit
55c9d739 (ag/969408) which tried to fix the
same problem but got it wrong. It's valid to -D when the process is
already running, as we're supposed to kill it. The really problem is
that the killing fails because of bad appId.
bug:
28980761
Change-Id: Ibebdcc26865464216a1f4b6773e540921cdad7d2
TreeHugger Robot [Thu, 9 Jun 2016 23:35:01 +0000 (23:35 +0000)]
Merge "Ephemeral changes for debug builds" into nyc-mr1-dev
Chris Tate [Thu, 9 Jun 2016 23:34:22 +0000 (23:34 +0000)]
Merge "Don't allow restore sessions during backups" into nyc-dev
Doris Liu [Thu, 9 Jun 2016 23:33:50 +0000 (23:33 +0000)]
Merge changes from topic 'VectorDrawable polishing cherrypicks from master' into nyc-mr1-dev
* changes:
Support Keyframe definition for AVD on RT
Throw Exception for wrong valueType with API guard
Phil Weaver [Thu, 9 Jun 2016 23:32:09 +0000 (23:32 +0000)]
Merge "Improve accessibility window title behavior" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 23:28:26 +0000 (16:28 -0700)]
Don't allow restore sessions during backups
Gracefully no-op if apps attempt to restore themselves while there is
a backup pass in flight.
Bug
29135379
Change-Id: I8f0b5cd9d149b703e1de7a3a0b4b54c3aff766b6
John Reck [Thu, 9 Jun 2016 23:26:21 +0000 (16:26 -0700)]
Don't call surfaceCreated for just changed surfaces
Fixes:
29223302
If the surface only changed we want to just call onSurfaceChanged,
not onSurfaceCreated.
Change-Id: I65c8b210a7e34eaa2862020335ee7f6ef56eeac2
Tianjie Xu [Wed, 8 Jun 2016 22:02:35 +0000 (15:02 -0700)]
Collect statistics of source build version
Parse the last_install and report the source build version of an ota
update.
Related CL in: ag/
1121141
Bug:
28658632
Change-Id: I5e835c144aabe97fda681f60397ebf4416f7bd4f
Svet Ganov [Thu, 9 Jun 2016 22:52:26 +0000 (22:52 +0000)]
Merge \"Protect the android.intent.action.CALL_PRIVILEGED broadcast\" into nyc-dev
am:
c94872e940
Change-Id: I722d5bfbed781c28db5da59f303c2579123d8e6e
Svetoslav Ganov [Thu, 9 Jun 2016 22:44:50 +0000 (22:44 +0000)]
Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev
Dianne Hackborn [Thu, 9 Jun 2016 22:22:48 +0000 (22:22 +0000)]
Merge \"Fix more of issue #
28689719: Runtime restart\" into nyc-dev
am:
4781525399
Change-Id: I03d781408ef7b0c7c6156d6b63ca0ab4ee457ae1
Todd Kennedy [Thu, 9 Jun 2016 22:22:15 +0000 (15:22 -0700)]
fix prefix generation
when performing bitwise operations, java promotes byte's to int's.
this is normally okay except when the value is negative. in that
case, java extends the sign bits. this means that after shifting,
all of the upper bits are most likely going to be all f's. instead,
undo the sign extension by pulling out just the 8 bits we're
interested in.
Change-Id: I89f7244f6b675be2cca4a185a7002b5f8a6eece1
Todd Kennedy [Thu, 2 Jun 2016 14:32:17 +0000 (07:32 -0700)]
Ephemeral changes for debug builds
The installer/resolver must typically be specified in a baked in XML
file. But, to aid development, allow the installer/resolver to be
added dynamically on debug builds.
Change-Id: I8617bb2a33a51fc596579bdaadb27a11c3740c14
Dianne Hackborn [Thu, 9 Jun 2016 22:16:26 +0000 (22:16 +0000)]
Merge "Fix more of issue #
28689719: Runtime restart" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 22:13:43 +0000 (22:13 +0000)]
Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
am:
52e323bd38
Change-Id: I71646e6fb8a6996c17a9d2760aca88d6927d33ec
Chris Tate [Thu, 9 Jun 2016 22:06:59 +0000 (22:06 +0000)]
Merge "Turn down factory-default lock wallpaper support" into nyc-dev
Doris Liu [Thu, 2 Jun 2016 23:20:18 +0000 (16:20 -0700)]
Support Keyframe definition for AVD on RT
BUG:
27441613
Change-Id: Iece386f65f3704d1b7caa2b3690a8d3048ccf6e2
Doris Liu [Wed, 1 Jun 2016 21:22:28 +0000 (14:22 -0700)]
Throw Exception for wrong valueType with API guard
Previously, wrong valueType error is swallowed in jni. As a result,
some animations are quietly skipped without letting developers know.
This CL maintains that behavior for pre-N, and throws Exception
to notify developers of the error for N and above.
Bug:
29009391
Change-Id: I3e8f003cdb97d214da72af3f93a84f64797b1c2c
(cherry picked from commit
94db09917a17976135e2c63d8e4171c54730c079)
TreeHugger Robot [Thu, 9 Jun 2016 21:30:12 +0000 (21:30 +0000)]
Merge "Add UCE Service Down protected broadcast" into nyc-mr1-dev
Doris Liu [Thu, 9 Jun 2016 21:30:01 +0000 (21:30 +0000)]
Merge "Handle hidden RT VectorDrawable animators" into nyc-mr1-dev
Doris Liu [Thu, 9 Jun 2016 21:30:01 +0000 (21:30 +0000)]
Merge "Improve the property modification effiency of VectorDrawable animators" into nyc-mr1-dev
Adam Lesinski [Thu, 9 Jun 2016 21:22:34 +0000 (21:22 +0000)]
Merge \"ResourcesManager: Apply ContextThemeWrapper config\" into nyc-dev
am:
9e9c78f8ce
Change-Id: I71250c58f237135d156c64bdc08caafbe5b4a59e
TreeHugger Robot [Thu, 9 Jun 2016 21:16:01 +0000 (21:16 +0000)]
Merge "ResourcesManager: Apply ContextThemeWrapper config" into nyc-dev
Adam Powell [Thu, 9 Jun 2016 21:05:05 +0000 (21:05 +0000)]
Merge \"Make Activity.getReferrer tolerate custom Parcelables in intents\" into nyc-dev
am:
7a37f8945f
Change-Id: I8e14173836f153d75b9c9f29f3493335af5f2763
TreeHugger Robot [Thu, 9 Jun 2016 20:57:52 +0000 (20:57 +0000)]
Merge "Make Activity.getReferrer tolerate custom Parcelables in intents" into nyc-dev
Christopher Tate [Thu, 9 Jun 2016 20:44:48 +0000 (13:44 -0700)]
Turn down factory-default lock wallpaper support
The infrastructure is here but not yet fully plumbed, so gracefully
provide the historical behavior until the rest is in place.
Bug
29220492
Change-Id: I36feaf68099d85e4ae11a5262002ee85346703ed
Phil Weaver [Thu, 9 Jun 2016 17:24:53 +0000 (10:24 -0700)]
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
Philip P. Moltmann [Thu, 9 Jun 2016 20:43:18 +0000 (20:43 +0000)]
Merge \"Cache resources needed to sort media sizes.\" into nyc-dev
am:
142fc425c4
Change-Id: I368ffa5269029801ed191351fb1fff9bde72778a
Philip P. Moltmann [Thu, 9 Jun 2016 20:35:58 +0000 (20:35 +0000)]
Merge "Cache resources needed to sort media sizes." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 20:33:57 +0000 (20:33 +0000)]
Merge \"Don\'t update mTaskToReturnTo when task is cleared\" into nyc-dev
am:
1a77efe9ba
Change-Id: Idb9aad2fb3161552b699f271bed940cb47fd98ad
Andrii Kulian [Thu, 9 Jun 2016 20:27:28 +0000 (20:27 +0000)]
Merge "Don't update mTaskToReturnTo when task is cleared" into nyc-dev
Pavlin Radoslavov [Thu, 9 Jun 2016 20:13:44 +0000 (20:13 +0000)]
Unlock mBluetoothLock.readLock() instead of double-locking it
am:
7ee53be300
Change-Id: I521890b2554b47f278f1e3d169b3a3cde825240f
Stuart Scott [Thu, 9 Jun 2016 19:58:31 +0000 (12:58 -0700)]
Add UCE Service Down protected broadcast
bug:
29173516
Change-Id: I1c5743962dbca9c482ce7d87f6fe570a3249f3fe
Dianne Hackborn [Wed, 8 Jun 2016 23:33:29 +0000 (16:33 -0700)]
Fix more of issue #
28689719: Runtime restart
Change-Id: I0cce1cef884cf1508f1e726ea3439a5ffee84993
Pavlin Radoslavov [Thu, 9 Jun 2016 19:58:07 +0000 (12:58 -0700)]
Unlock mBluetoothLock.readLock() instead of double-locking it
Bug:
29011117
Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1
Adam Lesinski [Thu, 9 Jun 2016 18:17:10 +0000 (11:17 -0700)]
ResourcesManager: Apply ContextThemeWrapper config
The ContextThemeWrapper's configuration override must also
be applied to ResourcesManager during a configuration change.
Bug:
27644297
Change-Id: Ic126308b753979c18801d422a8243aa4daf45147
Adam Powell [Thu, 9 Jun 2016 19:36:16 +0000 (12:36 -0700)]
Make Activity.getReferrer tolerate custom Parcelables in intents
Referrer information is passed as an intent extra to each Activity,
therefore if that intent contains a custom parcelable unmarshaling
the intent extras will fail in a call to getReferrer. Insulate apps
from this concern and log a warning when it happens.
Bug
28972438
Change-Id: I37dbc033bfcfe816e4b58b382c012854fbed943b
Robert Carr [Thu, 9 Jun 2016 19:33:19 +0000 (19:33 +0000)]
Merge \"PiP animation: Move window with resize when ending animation.\" into nyc-dev
am:
4624d687f7
Change-Id: Ib9ce0ef71a71e998e1ffe783c178b8f514ab1469
Philip P. Moltmann [Thu, 9 Jun 2016 19:30:29 +0000 (19:30 +0000)]
Merge \"Handling of Fuji Xerox in RecommendationService.\" into nyc-dev
am:
5398f2731b
Change-Id: I79888e8b145c93eae9bea9c7e6f2c59e3912c29f
TreeHugger Robot [Thu, 9 Jun 2016 19:28:10 +0000 (19:28 +0000)]
Merge "PiP animation: Move window with resize when ending animation." into nyc-dev
Philip P. Moltmann [Thu, 9 Jun 2016 19:24:04 +0000 (19:24 +0000)]
Merge "Handling of Fuji Xerox in RecommendationService." into nyc-dev
Andrii Kulian [Thu, 9 Jun 2016 00:20:44 +0000 (17:20 -0700)]
Don't update mTaskToReturnTo when task is cleared
If activity launch has moved other task that was over home while
clearing task - don't override its mTaskToReturnTo not to loose
the original value of other task.
Bug:
28986980
Change-Id: Ib1680769fbb8a8d99f2b210c8d9cd8fe6fd5a196
Christopher Wiley [Tue, 31 May 2016 17:44:35 +0000 (10:44 -0700)]
Fix race conditions between Tethering and TetherInterfaceStateMachine
( cherry-pick of
de4819dc82b734036b22416228327d2712e01884 )
Previously, Tethering would answer requests for current tethering state
by calling methods on instances of TetherInterfaceStateMachine to build
up that state. This is incorrect, since state queries can come in on an
arbitrary thread, independent of updates to the state machines
instances.
Fix this by:
- Altering TetherInterfaceStateMachine to push consistent state
snapshots to Tethering via notifyInterfaceStateChange()
- Storing the last state snapshot in Tethering.mTetherStates
- Removing public methods to query TetherInterfaceStateMachine state.
- Consistently synchronizing access to Tethering.mTetherStates
Bug:
29009601
Test: WiFi Tethering continues to work, unittests continue to pass
Change-Id: Ied334f5e8739bc3aff1b08a1079095b9cc2a7958
Adrian Roos [Thu, 9 Jun 2016 18:22:21 +0000 (18:22 +0000)]
Merge "Seascape Navigation Bar View" into nyc-mr1-dev
Eric Schmidt [Thu, 9 Jun 2016 18:02:30 +0000 (18:02 +0000)]
Merge \\\"docs: Added links to performance resources section\\\" into mnc-io-docs am:
e4b1149320 am:
2dea7d3836
am:
b1a99c46b6
Change-Id: If38d960ef06b24ea1f23c82b521a8162ca625698
Eric Schmidt [Thu, 9 Jun 2016 17:56:38 +0000 (17:56 +0000)]
Merge \\"docs: Added links to performance resources section\\" into mnc-io-docs am:
e4b1149320
am:
2dea7d3836
Change-Id: I73d48da51be02656ae636686b42253c35ebc3762
Eric Schmidt [Thu, 9 Jun 2016 17:45:53 +0000 (17:45 +0000)]
Merge \"docs: Added links to performance resources section\" into mnc-io-docs
am:
e4b1149320
Change-Id: Ib1fa097035dce4d6e4c55ac6d87aa26bacceade8
Eric Schmidt [Thu, 9 Jun 2016 17:37:25 +0000 (17:37 +0000)]
Merge "docs: Added links to performance resources section" into mnc-io-docs
Robert Carr [Fri, 3 Jun 2016 20:28:48 +0000 (13:28 -0700)]
PiP animation: Move window with resize when ending animation.
At the end of the animation (when going from larger to smaller),
we are left with a scaled surface, that we want to seamlessly
resize to an unscaled surface of the new size. Because we have scaled
the shadow region of the surface, the position of the content
will differ before and after the resize applies. We use new
SurfaceFlinger API to cause position updates to apply after
resize. Because we have to switch into SCALING_MODE_FREEZE,
we could end up prematurely cropping the window, so we
switch to using screen space crop for the pinned stack.
Bug:
28899837
Change-Id: I9b762a237413e4fa3d432e67d30c7125bfef484c
Doris Liu [Tue, 17 May 2016 23:50:31 +0000 (16:50 -0700)]
Handle hidden RT VectorDrawable animators
This CL changes the target of VD specific animators to VectorDrawable,
instead of RenderNode. The benefit of doing so is that animators can
now detect whether the animation is meaningful by checking whether
their VD target is in the display list. If not, that means the VD is
not drawing for the current frame, in which case we can be smarter
and more power efficient by removing the animator from the list and
posting a delayed onFinished listener callback.
By setting VD as the animation target, when an ImageView decides to
update its drawable from one AVD to something else, we'll be able
to detect that the previous AVD is no longer in the display list,
and stop providing animation pulse to the stale AVD, which is
something we couldn't do previously. This change also
handles the case where one AVD instance could be drawn in two
different views.
Bug:
27441375
Change-Id: Iaad1ed09cfd526276b95db0dd695275c28e074e8
Aurimas Liutikas [Thu, 9 Jun 2016 17:02:55 +0000 (17:02 +0000)]
Merge \\\"Correct the size of example bitmap for xxhdpi.\\\" into mnc-io-docs am:
396ed8d2cf am:
6e70538600
am:
e82ac10fa2
Change-Id: Ie1c0f2c4ff45420a4cb54f57ada28ee85db779fa
Aurimas Liutikas [Thu, 9 Jun 2016 17:02:52 +0000 (17:02 +0000)]
Merge \\\"Remove duplicate the from AppBar documentation.\\\" into mnc-io-docs am:
f9f7a29fe9 am:
9bd21c0fbb
am:
9ac187304b
Change-Id: I1213456097463faafd2467d15a2908d0501b5326
Aurimas Liutikas [Thu, 9 Jun 2016 17:02:50 +0000 (17:02 +0000)]
Merge \\\"Fix code example in testing-support-library.\\\" into mnc-io-docs am:
e172a4b692 am:
5b8233126d
am:
248eb25863
Change-Id: I2a1870a7633e98d33130dba8bd50b7196731f6b9
Aurimas Liutikas [Thu, 9 Jun 2016 17:02:48 +0000 (17:02 +0000)]
Merge \\\"Fix a link to CustomTabsCallback in support-library docs.\\\" into mnc-io-docs am:
2ff2814a4a am:
5d75a24896
am:
d8b2c49475
Change-Id: I31f4ed6fff39b0fe822a511638a33860c9437f16
Aurimas Liutikas [Thu, 9 Jun 2016 16:57:02 +0000 (16:57 +0000)]
Merge \\"Correct the size of example bitmap for xxhdpi.\\" into mnc-io-docs am:
396ed8d2cf
am:
6e70538600
Change-Id: I0714693f2f19107d056be72944343c9636a0ff7e
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:58 +0000 (16:56 +0000)]
Merge \\"Remove duplicate the from AppBar documentation.\\" into mnc-io-docs am:
f9f7a29fe9
am:
9bd21c0fbb
Change-Id: Ib9c0255b772b0fc47d46758abdace1cf6bc9b045
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:54 +0000 (16:56 +0000)]
Merge \\"Fix code example in testing-support-library.\\" into mnc-io-docs am:
e172a4b692
am:
5b8233126d
Change-Id: Iee54ea9150f67b2595df3919ee06d307778d6666
Aurimas Liutikas [Thu, 9 Jun 2016 16:56:50 +0000 (16:56 +0000)]
Merge \\"Fix a link to CustomTabsCallback in support-library docs.\\" into mnc-io-docs am:
2ff2814a4a
am:
5d75a24896
Change-Id: Iaa7fa74ba79eb4b6ea2bdc8274ab1498cb6b79f5
Bill Yi [Thu, 9 Jun 2016 16:50:24 +0000 (16:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Todd Kennedy [Thu, 9 Jun 2016 16:48:16 +0000 (16:48 +0000)]
Merge "make round icon usage configurable" into nyc-mr1-dev
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:15 +0000 (16:45 +0000)]
Merge \"Correct the size of example bitmap for xxhdpi.\" into mnc-io-docs
am:
396ed8d2cf
Change-Id: Idb10cf41ebddc99613fcac41e9b6367c6e6b9e46
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:13 +0000 (16:45 +0000)]
Merge \"Remove duplicate the from AppBar documentation.\" into mnc-io-docs
am:
f9f7a29fe9
Change-Id: I7c79f4df131bbb7f2f5189af901cd75ac240c194
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:12 +0000 (16:45 +0000)]
Merge \"Fix code example in testing-support-library.\" into mnc-io-docs
am:
e172a4b692
Change-Id: I47e39e2a19289d12d1d54000c974ef9c1c97839a
Aurimas Liutikas [Thu, 9 Jun 2016 16:45:10 +0000 (16:45 +0000)]
Merge \"Fix a link to CustomTabsCallback in support-library docs.\" into mnc-io-docs
am:
2ff2814a4a
Change-Id: Ic1b3b40336bc22503ac86aea96bd98b705adf96d
Aurimas Liutikas [Thu, 9 Jun 2016 16:42:16 +0000 (16:42 +0000)]
Merge "Correct the size of example bitmap for xxhdpi." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:41:54 +0000 (16:41 +0000)]
Merge "Remove duplicate the from AppBar documentation." into mnc-io-docs
Philip P. Moltmann [Thu, 9 Jun 2016 16:39:55 +0000 (09:39 -0700)]
Handling of Fuji Xerox in RecommendationService.
- Display name
- Fix exclusion of Fuji from Xerox plugin
Bug:
28908572
Change-Id: I00c235a4eb09a681717eb3be65d586246a069f4b
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:25 +0000 (16:39 +0000)]
Merge "Fix code example in testing-support-library." into mnc-io-docs
Aurimas Liutikas [Thu, 9 Jun 2016 16:39:14 +0000 (16:39 +0000)]
Merge "Fix a link to CustomTabsCallback in support-library docs." into mnc-io-docs
Jason Monk [Thu, 9 Jun 2016 15:35:06 +0000 (15:35 +0000)]
Merge \"QS: Fix crash when removing pages in RTL\" into nyc-dev
am:
9b5a780722
Change-Id: I7ce2129e38e385cac2f67c8b4eba00fee2bf35eb
Xiaohui Chen [Thu, 9 Jun 2016 15:35:03 +0000 (15:35 +0000)]
Merge \"QS Detail: Fix up open/close animations\" into nyc-dev
am:
ac2e291832
Change-Id: I0378c30d344504474434bb645df3af58e768ed28
Jason Monk [Thu, 9 Jun 2016 15:25:00 +0000 (15:25 +0000)]
Merge "QS: Fix crash when removing pages in RTL" into nyc-dev