OSDN Git Service
Adam Lesinski [Sat, 21 May 2016 00:13:33 +0000 (00:13 +0000)]
Merge "Performance improvements in AssetManager" into nyc-dev
am:
3765d34d36
* commit '
3765d34d364e76817e9dbea55819df86d858df10':
Performance improvements in AssetManager
Change-Id: Ie364041be0fb6757c2f87d5b8d570cb07452d112
Adam Lesinski [Sat, 21 May 2016 00:07:00 +0000 (00:07 +0000)]
Merge "Performance improvements in AssetManager" into nyc-dev
Robert Carr [Fri, 20 May 2016 23:01:02 +0000 (23:01 +0000)]
Merge "Correctly clear resizing drawable when nulling background." into nyc-dev
am:
a3ec065a43
* commit '
a3ec065a43069a19dc42f023a40d54a3178f1b44':
Correctly clear resizing drawable when nulling background.
Change-Id: Ifb02cc95efc8b164ab8ee63fa9d83bae3172da23
Brad Ebinger [Fri, 20 May 2016 23:00:59 +0000 (23:00 +0000)]
Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev
am:
ecab20d852
* commit '
ecab20d852826286e4d9d8c095ef61cebbb0ab4e':
Add check for Vibration RingerMode in VibratorService
Change-Id: If1c4c9969b16cd751f802e62ec6960762e4fbafa
TreeHugger Robot [Fri, 20 May 2016 22:56:46 +0000 (22:56 +0000)]
Merge "Correctly clear resizing drawable when nulling background." into nyc-dev
Brad Ebinger [Fri, 20 May 2016 22:53:26 +0000 (22:53 +0000)]
Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev
Android Build Merger (Role) [Fri, 20 May 2016 22:17:30 +0000 (22:17 +0000)]
Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am:
cbfef08990" into nyc-mr1-dev
Meng Wang [Fri, 20 May 2016 22:17:10 +0000 (22:17 +0000)]
Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev
Adrian Roos [Fri, 20 May 2016 22:17:08 +0000 (22:17 +0000)]
Merge "Fix cut off actions in messaging style" into nyc-dev
am:
cbfef08990
* commit '
cbfef08990e4d44c723da71f7f7271a72fb10f17':
Fix cut off actions in messaging style
Change-Id: Ie4ba804300222128034d157199a7be3b14facf3e
Adrian Roos [Fri, 20 May 2016 22:08:35 +0000 (22:08 +0000)]
Merge "Fix cut off actions in messaging style" into nyc-dev
Adam Lesinski [Fri, 20 May 2016 01:25:28 +0000 (18:25 -0700)]
Performance improvements in AssetManager
Change the implementation of getLocales() to iterate the set of
configurations using a templated method, instead of using the result
of getConfigurations().
Also remove the check for AndroidManifest.xml when adding an asset path.
This is unneccessary.
Bug:
28625993
Change-Id: I16de5da598d0c371421d1dc8eee054dce9baf53a
Jae Seo [Fri, 20 May 2016 21:03:00 +0000 (21:03 +0000)]
Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
am:
44fbbfd248
* commit '
44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a':
MediaBrowserService: Add more explanation on getBrowserRootHints()
Change-Id: Id16ebed81d2865553e3ded626cf9b27dffba8dce
Jae Seo [Fri, 20 May 2016 20:53:01 +0000 (20:53 +0000)]
Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
Brad Ebinger [Fri, 13 May 2016 01:05:17 +0000 (18:05 -0700)]
Add check for Vibration RingerMode in VibratorService
Add a check for whether or not the Phone is in the Vibrate RingerMode
when deciding whether or not to vibrate for an incoming call.
Bug:
28569078
Change-Id: Ib2e6243fd0b18c5426b5572c0806d67111a80a57
Meng Wang [Thu, 5 May 2016 16:36:47 +0000 (09:36 -0700)]
Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Also:
Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS
Bug:
28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
Jason Monk [Fri, 20 May 2016 19:52:57 +0000 (19:52 +0000)]
Merge "QS: Fix RTL animation" into nyc-dev
am:
d1df86dbb8
* commit '
d1df86dbb8a86c607d7fc1e0a89c7a10fe9899fa':
QS: Fix RTL animation
Change-Id: I4e7592dc1363984d40050e75aea4b605d0fb6b39
Seigo Nonaka [Fri, 20 May 2016 19:52:54 +0000 (19:52 +0000)]
Merge "Clear locales without changing layout direction." into nyc-dev
am:
6686711ba2
* commit '
6686711ba289740a20dc15133aed4a2b5bac5d44':
Clear locales without changing layout direction.
Change-Id: I5c7714d3ef54fc7caf6580837d48a1b79e56a892
Jason Monk [Fri, 20 May 2016 19:42:39 +0000 (19:42 +0000)]
Merge "QS: Fix RTL animation" into nyc-dev
Roozbeh Pournader [Fri, 20 May 2016 19:42:30 +0000 (19:42 +0000)]
Merge "Clear locales without changing layout direction." into nyc-dev
Vincent Palatin [Fri, 20 May 2016 18:44:41 +0000 (18:44 +0000)]
Merge "Fix notifications for USB PD enabled devices" into nyc-dev
am:
73722c4b0c
* commit '
73722c4b0cdd3aea12f67b3822244dc3b4aa4387':
Fix notifications for USB PD enabled devices
Change-Id: I9944f705b6a2de59216c2f81613a53546c5f1b50
Jason Monk [Fri, 20 May 2016 18:44:16 +0000 (14:44 -0400)]
QS: Fix RTL animation
Change-Id: I9de6e0891fa98ec2212abe28fa942779aa224056
Fixes:
28674500
TreeHugger Robot [Fri, 20 May 2016 18:32:09 +0000 (18:32 +0000)]
Merge "Fix notifications for USB PD enabled devices" into nyc-dev
Seigo Nonaka [Fri, 13 May 2016 06:11:37 +0000 (15:11 +0900)]
Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.
Bug:
28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
Siyamed Sinir [Fri, 20 May 2016 17:53:44 +0000 (17:53 +0000)]
Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am:
df9dee869c
* commit '
df9dee869c9efa18619b28691c88415b4f115df7':
setTransformationMethod should reset mTextDir
Change-Id: I17d4dc951f840dcfc1e76ed6e9d6b02150495bf9
Siyamed Sinir [Fri, 20 May 2016 17:46:26 +0000 (17:46 +0000)]
Merge "setTransformationMethod should reset mTextDir" into nyc-dev
Paul Stewart [Fri, 20 May 2016 17:45:20 +0000 (17:45 +0000)]
Merge "Don\'t remove existing EAP configurations" into nyc-dev
am:
c7ad1ac712
* commit '
c7ad1ac712f09c5bc116c66a54a860000b53fa38':
Don't remove existing EAP configurations
Change-Id: I743d4b0291b7d0c864d30cb04acd7811428419d0
Paul Stewart [Fri, 20 May 2016 17:39:43 +0000 (17:39 +0000)]
Merge "Don't remove existing EAP configurations" into nyc-dev
Adam Lesinski [Fri, 20 May 2016 17:27:23 +0000 (17:27 +0000)]
Merge "Fix parsing of kernel wakelocks" into nyc-dev
am:
6f0d399214
* commit '
6f0d3992149aa782450667ed750fe0c3cf8ee334':
Fix parsing of kernel wakelocks
Change-Id: I8627d87ce84e9c03407a8e5be353aa44635a7712
Wale Ogunwale [Fri, 20 May 2016 17:24:06 +0000 (17:24 +0000)]
Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev
am:
a781232656
* commit '
a78123265658380b3968773a5f575b0ba1b4620e':
Put launch adjacent activity in a new task if the activity does exist
Change-Id: I128ecd96abb81d2ae6a055bace315a8e69a17ac9
Adam Lesinski [Fri, 20 May 2016 17:23:07 +0000 (17:23 +0000)]
Merge "Fix parsing of kernel wakelocks" into nyc-dev
TreeHugger Robot [Fri, 20 May 2016 17:15:58 +0000 (17:15 +0000)]
Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev
Christopher Tate [Fri, 20 May 2016 17:11:10 +0000 (17:11 +0000)]
Merge "Back up / restore the \'mono audio\' setting" into nyc-dev
am:
a3aaa5ee25
* commit '
a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
Back up / restore the 'mono audio' setting
Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b
Chris Tate [Fri, 20 May 2016 17:05:37 +0000 (17:05 +0000)]
Merge "Back up / restore the 'mono audio' setting" into nyc-dev
Jason Monk [Fri, 20 May 2016 17:00:33 +0000 (17:00 +0000)]
Merge "Nav bar: fix tablet density change issues" into nyc-dev
am:
6c2bc3db95
* commit '
6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
Nav bar: fix tablet density change issues
Change-Id: I8119bffab2e66535b3eec7f0ce2c5ef990bebfea
Winson [Fri, 20 May 2016 16:53:01 +0000 (16:53 +0000)]
Only broadcast screenshot error to the current user.
am:
538c22630b
* commit '
538c22630b3ffd3c9efd544552d5a7fb3ae876a8':
Only broadcast screenshot error to the current user.
Change-Id: I6eb8e2212bb837d25644d0e79abaef9c8a61f9a5
TreeHugger Robot [Fri, 20 May 2016 16:52:19 +0000 (16:52 +0000)]
Merge "Nav bar: fix tablet density change issues" into nyc-dev
Winson [Thu, 19 May 2016 17:06:18 +0000 (10:06 -0700)]
Only broadcast screenshot error to the current user.
Bug:
28807226
Change-Id: I428ecc5572d7522580cdf38bded2fff9cf07abc2
Sanket Padawe [Fri, 20 May 2016 16:47:02 +0000 (16:47 +0000)]
Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev
Chris Wren [Fri, 20 May 2016 16:11:34 +0000 (16:11 +0000)]
Merge "rate limit notification enqueues" into nyc-dev
am:
585ff8bd12
* commit '
585ff8bd126ffac98164a87d24a9add5c23f9597':
rate limit notification enqueues
Change-Id: I48a05345b210a68e507e648402a2ff19da44b7fc
TreeHugger Robot [Fri, 20 May 2016 16:04:48 +0000 (16:04 +0000)]
Merge "rate limit notification enqueues" into nyc-dev
Tony Mak [Fri, 20 May 2016 16:01:00 +0000 (16:01 +0000)]
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
am:
53b5df43b4
* commit '
53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
Change-Id: I24a866a5947a20127f3b79e2e75ba0cf534b450c
Wale Ogunwale [Fri, 20 May 2016 15:50:15 +0000 (08:50 -0700)]
Put launch adjacent activity in a new task if the activity does exist
For the launch adjacent case we only want to put the activity in
an existing task if the activity already exists in the history.
Bug:
28828326
Change-Id: I1a6fdd6779cb20f8c0d9b7d94635b21718f4ac1b
Tony Mak [Thu, 19 May 2016 12:40:38 +0000 (13:40 +0100)]
Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
TODO: After updating all places that use the SDK, remove/hide the old API
Bug:
28842878
Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
Paul Stewart [Fri, 20 May 2016 15:14:30 +0000 (08:14 -0700)]
Don't remove existing EAP configurations
When merging backed-up configurations with the current supplicant
configuration, we read both configurations into a instance of
WifiNetworkSettings. No EAP configurations should be restored as
per b/
25725016, however existing EAP configurations that already
reside in wpa_supplicant.conf (presumably configured in SUW)
should not be removed in the process.
This CL adds a parameter to the "readNetworks" method to allow it
to select whether or not EAP configurations should be read in. It
is used to allow the "restoreWifiSupplicant" method to copy in EAP
configurations from the existing wpa_supplicant.conf, but not out
of the backup data.
BUG:
28873992
Change-Id: I8b3e0c1a6629b3f1ca5055b1b2190e6b3ca4c033
Jason Monk [Fri, 20 May 2016 15:21:59 +0000 (11:21 -0400)]
Nav bar: fix tablet density change issues
- Re-inflate the contents of the NavigationBarInflaterView
- Call up to parent to notify the contents has been reinflated
- Fix how default tunable is handled, so that the resource is
reloaded on density change
Change-Id: If25f68d01eedd3319b0c270e1cf80ac382eea637
Fixes:
27227522
Chris Wren [Tue, 17 May 2016 21:11:29 +0000 (17:11 -0400)]
rate limit notification enqueues
This is distinct from and in addition to the limit on the number of
distinct notifications. This includes many updates to a single
notification.
Bug:
28693065
Change-Id: I5ec0911716cace91d3ad85435a5c6123b290b3a2
Jason Monk [Fri, 20 May 2016 13:47:57 +0000 (13:47 +0000)]
Merge "QS Edit: Better handling if drags" into nyc-dev
am:
b8fe7e8bff
* commit '
b8fe7e8bffea93ceb30a0d827f2ac573472507dd':
QS Edit: Better handling if drags
Change-Id: Id24e45b73846ef9d52feea537382f01eb2872ad4
Jason Monk [Fri, 20 May 2016 13:42:56 +0000 (13:42 +0000)]
Merge "QS Edit: Better handling if drags" into nyc-dev
Neil Fuller [Fri, 20 May 2016 13:00:29 +0000 (13:00 +0000)]
Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
am:
761f70d5a6
* commit '
761f70d5a6b926780db3bba95ee1e01b4d8d95be':
Add support for ICU data pinning in the Zygote
Change-Id: If693e8cbb737186fdf0a3169d024bef08c8ceb6a
Neil Fuller [Fri, 20 May 2016 12:53:46 +0000 (12:53 +0000)]
Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
Alan Leung [Fri, 20 May 2016 06:14:58 +0000 (06:14 +0000)]
Merge "Enable boost-locked-region-priority" into nyc-dev
am:
430894d1bb
* commit '
430894d1bbac3ceb94dc2f57334858178fa53e97':
Enable boost-locked-region-priority
Change-Id: I26257eae8b8d0dfdf604c2e8e7350ff415d8433f
Alan Leung [Fri, 20 May 2016 06:09:13 +0000 (06:09 +0000)]
Merge "Enable boost-locked-region-priority" into nyc-dev
Siyamed Sinir [Fri, 20 May 2016 01:26:09 +0000 (18:26 -0700)]
setTransformationMethod should reset mTextDir
When transformation method is set via API, text direction heuristics has
to be reset since for PasswordTransformationMethod it is set to LTR. Not
resetting it causes inconsistencies with the remaining of the TextView.
Bug:
28562779
Change-Id: I225e35e39bde60d4296852ff17b107d5b7b99f8a
Ta-wei Yen [Fri, 20 May 2016 01:07:52 +0000 (01:07 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev
am:
4f2a1d0913
* commit '
4f2a1d09133f133ac23b99485713a5ea5b7ea43c':
Hide VoicemailContract.setQuota()
Change-Id: Ifc1365650a981130a376ef253e96331595475510
Ta-wei Yen [Fri, 20 May 2016 01:06:03 +0000 (01:06 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev
am:
0f712b164f
* commit '
0f712b164fa24efdf5c5c2b20d939c3e7affbfe3':
Rename visual voicemail sync intent value
Change-Id: I3c842deef20bcc0258affa2ca7d2241502ec49f6
Ta-wei Yen [Fri, 20 May 2016 01:00:29 +0000 (01:00 +0000)]
Merge "Hide VoicemailContract.setQuota()" into nyc-dev
Ta-wei Yen [Fri, 20 May 2016 01:00:02 +0000 (01:00 +0000)]
Merge "Rename visual voicemail sync intent value" into nyc-dev
Hemal Patel [Fri, 20 May 2016 00:30:39 +0000 (00:30 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6 am:
a18a3d3211
am:
99a9b165e8
* commit '
99a9b165e8ad31aa9e3609c7f3d1d4e02a1072cd':
Docs: Fixed a wrong file name
Change-Id: I475a41513ac45ace7bf2387e4a72ef8fd5cd7e15
Hemal Patel [Fri, 20 May 2016 00:25:49 +0000 (00:25 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs am:
06a9fbcdd6
am:
a18a3d3211
* commit '
a18a3d32118872907e0979856f5906752360b058':
Docs: Fixed a wrong file name
Change-Id: I93ac53610c9c1b0aad68e525eed3d8703bfde613
Adam Lesinski [Wed, 18 May 2016 01:31:02 +0000 (18:31 -0700)]
Fix parsing of kernel wakelocks
We handled stale wakelocks (wakelocks that disappear from /d/wakeup_sources)
differently in previous version of Android. They would be set stale, but still be
updated with their previous counts (they would never disappear).
The method setStale has been replaced with endSample(), which is semantically different.
Once a SamplingTimer has endSample() called, it expects any future calls to update() to
be a new sample, meaning the entire amount passed to update() is included in the kernel
wakelock's total. Since stale wakelocks were never removed from the list, this would
increase by large amounts when nothing had actually changed.
This was exacerbated by the fact that there was a bug where the last wakelock in
/d/wakeup_sources was never parsed, so if the order ever changed, this "stale" wakelock
would suddenly re-appear and the entire amount reported would be charged to the wakelock,
instead of just the difference since the last update.
All this was exposed when we added support to handle wakelocks that would disappear and
reappear with smaller values, meaning the kernel had pruned them from its accounting and
reset them.
Bug:
28601080
Change-Id: Ic96027f7d580dac5e20aa73d67e5cedac4ccabeb
Cheryl Potter [Fri, 20 May 2016 00:19:40 +0000 (00:19 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702 am:
0793d19267
am:
212fe6c071
* commit '
212fe6c0714bb79d70d3ea424eea8211ee1421f5':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: I57929cc1788085e2a61aa45e093d21eb2f2f4806
Hemal Patel [Fri, 20 May 2016 00:19:35 +0000 (00:19 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs
am:
06a9fbcdd6
* commit '
06a9fbcdd68a3d48697e6e88c04fcdb6040673c5':
Docs: Fixed a wrong file name
Change-Id: I7f672848dfc1f77a2559494c34de6d5cc70df130
Scott Main [Fri, 20 May 2016 00:19:34 +0000 (00:19 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc am:
ccf143ea10
am:
eaad66b697
* commit '
eaad66b697b3605c1b5b75bb203ea308dee2589c':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I14dde8c5eebec9ce9d9a416cd071393d53e59b8a
Hemal Patel [Fri, 20 May 2016 00:15:08 +0000 (00:15 +0000)]
Merge "Docs: Fixed a wrong file name" into mnc-io-docs
Cheryl Potter [Fri, 20 May 2016 00:14:07 +0000 (00:14 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118 am:
f2fa5cd702
am:
0793d19267
* commit '
0793d1926729cdfd6cd023e89e45b21c63c1d91d':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: I183e31bdf55e6e691785430d65d4cf2934a2f7ef
smain@google.com [Fri, 20 May 2016 00:14:02 +0000 (00:14 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44 am:
9ad92619dc
am:
ccf143ea10
* commit '
ccf143ea106de35de35d4829ade55ba78b7a3fee':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I42306e09cb173642840ee29130bb80e9da347a81
Cheryl Potter [Fri, 20 May 2016 00:11:13 +0000 (00:11 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs am:
d382293118
am:
f2fa5cd702
* commit '
f2fa5cd7022d450d4e0faa4c81db5207d1ec00d3':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: Iacbf1fca2c1d3189a39122e893ece5fcf033246a
Cheryl Potter [Fri, 20 May 2016 00:08:47 +0000 (00:08 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs
am:
d382293118
* commit '
d382293118dad1337726986c1f2465d2ec25171b':
docs: Fix card descriptions in Android Monitor Overview page b/
2885829
Change-Id: Ieadb04df863e4f50db2b1b6168cc31f6501fa242
Scott Main [Fri, 20 May 2016 00:08:46 +0000 (00:08 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs am:
486f792d44
am:
9ad92619dc
* commit '
9ad92619dc455a42c40e5b102e2fdf65c2787549':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: I52fc62f8f233682a6707a4c1e5ef67f42844551b
smain@google.com [Fri, 20 May 2016 00:05:01 +0000 (00:05 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs
am:
486f792d44
* commit '
486f792d4448819c47c7e18dfd4ccb40133df528':
fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246
Change-Id: Iffb768397f425b34c1e297d40c9b1077d1e7ad5d
Cheryl Potter [Fri, 20 May 2016 00:03:06 +0000 (00:03 +0000)]
Merge "docs: Fix card descriptions in Android Monitor Overview page b/
2885829" into mnc-mr-docs
Christopher Tate [Thu, 19 May 2016 23:55:49 +0000 (16:55 -0700)]
Back up / restore the 'mono audio' setting
Bug
28437565
Change-Id: I6028886eb1aa424edabca65ad9d11d984b82d198
Cheryl Potter [Thu, 19 May 2016 23:55:49 +0000 (16:55 -0700)]
docs: Fix card descriptions in Android Monitor Overview page
b/
2885829
Change-Id: I2c36d9889f685ea6f18859f5859d876da55ba034
Scott Main [Thu, 19 May 2016 23:54:19 +0000 (23:54 +0000)]
Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug:
28801246" into mnc-mr-docs
smain@google.com [Thu, 19 May 2016 23:53:56 +0000 (23:53 +0000)]
update links to studio docs am:
73cf8224cb am:
f7304c8cc8
am:
69428b4a0a
* commit '
69428b4a0ad9b3bed3c31bbf3dff4d61548af77a':
update links to studio docs
Change-Id: I6ebfa3b240ffe0b3b9a64e4c065410d98e73ccaa
smain@google.com [Thu, 19 May 2016 23:47:54 +0000 (23:47 +0000)]
update links to studio docs am:
73cf8224cb
am:
f7304c8cc8
* commit '
f7304c8cc8aa947558be355fd0c547f418e44931':
update links to studio docs
Change-Id: I9886a9618513c63f02add34b12761f8d35afb1da
smain@google.com [Thu, 19 May 2016 23:43:17 +0000 (23:43 +0000)]
update links to studio docs
am:
73cf8224cb
* commit '
73cf8224cbd97918d6407aac79a97c6ef70b9a30':
update links to studio docs
Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78
smain@google.com [Thu, 19 May 2016 23:30:43 +0000 (16:30 -0700)]
update links to studio docs
Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c
Dirk Dougherty [Thu, 19 May 2016 23:25:42 +0000 (23:25 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc am:
8053c79246
am:
f339170837
* commit '
f3391708373758acac5d4c8daf3abe9ca2a38b97':
Remove outdated google services links.
Change-Id: I89b08725b84a2618f5a2af0cf216f02b39ee53ad
Dirk Dougherty [Thu, 19 May 2016 23:19:12 +0000 (23:19 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9 am:
5fb577e6bc
am:
8053c79246
* commit '
8053c79246f14a78158b6476169299999299d6d8':
Remove outdated google services links.
Change-Id: I4c85952e4962381261e42d3ecf1c3408a57ab55e
Dirk Dougherty [Thu, 19 May 2016 23:13:57 +0000 (23:13 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs am:
dc40b80ae9
am:
5fb577e6bc
* commit '
5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
Remove outdated google services links.
Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
Dirk Dougherty [Thu, 19 May 2016 23:07:10 +0000 (23:07 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs
am:
dc40b80ae9
* commit '
dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
Remove outdated google services links.
Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
John Reck [Thu, 19 May 2016 23:06:25 +0000 (23:06 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c am:
08a4808197 am:
7298186769 -s ours
am:
02b5805ba3
* commit '
02b5805ba3f5567ef6eea5931f120fd261cd4a54':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Id1ae8b8ead92837ef43e9e40aeac8696fe8a6e76
Dirk Dougherty [Thu, 19 May 2016 23:01:53 +0000 (23:01 +0000)]
Merge "Remove outdated google services links." into mnc-mr-docs
Dirk Dougherty [Thu, 19 May 2016 22:57:40 +0000 (15:57 -0700)]
Remove outdated google services links.
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
John Reck [Thu, 19 May 2016 22:59:26 +0000 (22:59 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c am:
08a4808197
am:
7298186769 -s ours
* commit '
7298186769395978045ed2d35252cdf7f644d85b':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I93f337a4e85a4e20e91fbbf7bd7aeb48bd0df735
Bert McMeen [Thu, 19 May 2016 22:57:08 +0000 (22:57 +0000)]
docs: Update to column widths for Complications table am:
76372f02fe am:
4cdad3212e
am:
8386df9ea1
* commit '
8386df9ea1a2e8bb9bdeb0da1d556b0cff0daf41':
docs: Update to column widths for Complications table
Change-Id: I9a282a4b7f4b75ea6b51939afc516960bb690161
John Reck [Thu, 19 May 2016 22:54:05 +0000 (22:54 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8 am:
0f59d9b80c
am:
08a4808197
* commit '
08a480819763dd632fd8006a0ea57b8220ee121a':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ia434422652e624aa5afc871857e7d8dac168912e
John Reck [Thu, 19 May 2016 22:50:55 +0000 (22:50 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours am:
a7895725f8
am:
0f59d9b80c
* commit '
0f59d9b80c9f5daa321b683525ba8732add007c2':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6
Bert McMeen [Thu, 19 May 2016 22:50:53 +0000 (22:50 +0000)]
docs: Update to column widths for Complications table am:
76372f02fe
am:
4cdad3212e
* commit '
4cdad3212e67fabbfe4ba68f7b214be5ff5c10af':
docs: Update to column widths for Complications table
Change-Id: I22f82c2ca729b9d679fc077dbc9b54c85a70d6fc
John Reck [Thu, 19 May 2016 22:47:05 +0000 (22:47 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2 am:
8238207ce6 -s ours
am:
a7895725f8
* commit '
a7895725f8858465a404cbe4f6d5091e39423529':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63
Abhijith Shastry [Thu, 19 May 2016 22:46:55 +0000 (22:46 +0000)]
Merge "Update BlockedNumberContract javadocs." into nyc-dev
am:
07abc7f813
* commit '
07abc7f8139e012f8a92d74448db357446ab4664':
Update BlockedNumberContract javadocs.
Change-Id: I88cd7749894dc531fb793e800528af7a686076f5
Bert McMeen [Thu, 19 May 2016 22:44:13 +0000 (22:44 +0000)]
docs: Update to column widths for Complications table
am:
76372f02fe
* commit '
76372f02fe149aefccea502bf1ac0dca2693e84b':
docs: Update to column widths for Complications table
Change-Id: I67578fd73f26af6ef2187e4e9823fb71e89f990e
John Reck [Thu, 19 May 2016 22:43:14 +0000 (22:43 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d am:
1da8c9baa2
am:
8238207ce6 -s ours
* commit '
8238207ce6268422bcdb50d44f03e6a220081294':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58
Abhijith Shastry [Thu, 19 May 2016 22:43:11 +0000 (22:43 +0000)]
Merge "Update BlockedNumberContract javadocs." into nyc-dev
John Reck [Thu, 19 May 2016 22:37:04 +0000 (22:37 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d
am:
1da8c9baa2
* commit '
1da8c9baa2d2da49e14224d34995337c4709b1ad':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381
John Reck [Thu, 19 May 2016 22:32:47 +0000 (22:32 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours
am:
1fae3b370d
* commit '
1fae3b370dfd9536da166ef561df630cdff02b83':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3
John Reck [Thu, 19 May 2016 22:28:23 +0000 (22:28 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours
am:
bfa719f448 -s ours
* commit '
bfa719f448ab4d90368a3cdc556e515253528e17':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed
Miao Wang [Thu, 19 May 2016 22:24:36 +0000 (22:24 +0000)]
Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev
am:
75445fd6a0
* commit '
75445fd6a043a892bb7d7f18c1d62c5f72337413':
[RenderScript] Fix ScriptIntrinsicBlur documentation.
Change-Id: I052720b2df509ad33ab107e8aae3b38e2499e72c
Miao Wang [Thu, 19 May 2016 22:24:31 +0000 (22:24 +0000)]
Merge "Update documentation about copyTo and copyFrom." into nyc-dev
am:
1a523b7502
* commit '
1a523b7502135a5cc0a94ea380263638b0ffdab1':
Update documentation about copyTo and copyFrom.
Change-Id: I7dab75f163e4dc3826cf864fbe61546fae6a3f7a