243664 Commits

Author SHA1 Message Date
Brad Ebinger
ecab20d852 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev 2016-05-20 22:53:27 +00:00
Adrian Roos
cbfef08990 Merge "Fix cut off actions in messaging style" into nyc-dev 2016-05-20 22:08:37 +00:00
Jae Seo
44fbbfd248 Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev 2016-05-20 20:53:03 +00:00
Brad Ebinger
2d1c3b3a6c 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
2016-05-20 20:31:53 +00:00
Jason Monk
d1df86dbb8 Merge "QS: Fix RTL animation" into nyc-dev 2016-05-20 19:42:40 +00:00
Roozbeh Pournader
6686711ba2 Merge "Clear locales without changing layout direction." into nyc-dev 2016-05-20 19:42:31 +00:00
Jason Monk
61d118d650 QS: Fix RTL animation
Change-Id: I9de6e0891fa98ec2212abe28fa942779aa224056
Fixes: 28674500
2016-05-20 14:44:16 -04:00
TreeHugger Robot
73722c4b0c Merge "Fix notifications for USB PD enabled devices" into nyc-dev 2016-05-20 18:32:10 +00:00
Seigo Nonaka
bd5cac67b8 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
2016-05-20 17:59:35 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Paul Stewart
c7ad1ac712 Merge "Don't remove existing EAP configurations" into nyc-dev 2016-05-20 17:39:44 +00:00
Adam Lesinski
6f0d399214 Merge "Fix parsing of kernel wakelocks" into nyc-dev 2016-05-20 17:23:08 +00:00
TreeHugger Robot
a781232656 Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 2016-05-20 17:15:59 +00:00
Chris Tate
a3aaa5ee25 Merge "Back up / restore the 'mono audio' setting" into nyc-dev 2016-05-20 17:05:39 +00:00
TreeHugger Robot
6c2bc3db95 Merge "Nav bar: fix tablet density change issues" into nyc-dev 2016-05-20 16:52:20 +00:00
Winson
538c22630b Only broadcast screenshot error to the current user.
Bug: 28807226
Change-Id: I428ecc5572d7522580cdf38bded2fff9cf07abc2
2016-05-20 16:47:16 +00:00
TreeHugger Robot
585ff8bd12 Merge "rate limit notification enqueues" into nyc-dev 2016-05-20 16:04:50 +00:00
Wale Ogunwale
13dbfff19e 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
2016-05-20 08:50:15 -07:00
Tony Mak
53b5df43b4 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
2016-05-20 15:39:38 +00:00
Paul Stewart
45e6fec2cf 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
2016-05-20 08:22:53 -07:00
Jason Monk
9a6552d71f 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
2016-05-20 11:21:59 -04:00
Chris Wren
c8673a88fe 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
2016-05-20 10:40:26 -04:00
Jason Monk
b8fe7e8bff Merge "QS Edit: Better handling if drags" into nyc-dev 2016-05-20 13:42:57 +00:00
Neil Fuller
761f70d5a6 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev 2016-05-20 12:53:48 +00:00
Alan Leung
430894d1bb Merge "Enable boost-locked-region-priority" into nyc-dev 2016-05-20 06:09:14 +00:00
Siyamed Sinir
d55be2b9d5 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
2016-05-19 18:30:38 -07:00
Ta-wei Yen
4f2a1d0913 Merge "Hide VoicemailContract.setQuota()" into nyc-dev 2016-05-20 01:00:30 +00:00
Ta-wei Yen
0f712b164f Merge "Rename visual voicemail sync intent value" into nyc-dev 2016-05-20 01:00:04 +00:00
Hemal Patel
99a9b165e8 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
2016-05-20 00:25:49 +00:00
Adam Lesinski
d84ad30ee6 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
2016-05-19 17:21:10 -07:00
Hemal Patel
a18a3d3211 Merge "Docs: Fixed a wrong file name" into mnc-io-docs
am: 06a9fbcdd6

* commit '06a9fbcdd68a3d48697e6e88c04fcdb6040673c5':
  Docs: Fixed a wrong file name

Change-Id: I7f672848dfc1f77a2559494c34de6d5cc70df130
2016-05-20 00:19:35 +00:00
Hemal Patel
06a9fbcdd6 Merge "Docs: Fixed a wrong file name" into mnc-io-docs 2016-05-20 00:15:09 +00:00
Cheryl Potter
212fe6c071 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
2016-05-20 00:14:07 +00:00
smain@google.com
eaad66b697 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
2016-05-20 00:14:02 +00:00
Cheryl Potter
0793d19267 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
2016-05-20 00:11:13 +00:00
Cheryl Potter
f2fa5cd702 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
2016-05-20 00:08:47 +00:00
Scott Main
ccf143ea10 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
2016-05-20 00:08:46 +00:00
smain@google.com
9ad92619dc 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
2016-05-20 00:05:01 +00:00
Cheryl Potter
d382293118 Merge "docs: Fix card descriptions in Android Monitor Overview page b/2885829" into mnc-mr-docs 2016-05-20 00:03:07 +00:00
Christopher Tate
ea2d6e8e89 Back up / restore the 'mono audio' setting
Bug 28437565

Change-Id: I6028886eb1aa424edabca65ad9d11d984b82d198
2016-05-19 16:55:49 -07:00
Cheryl Potter
72686af4f6 docs: Fix card descriptions in Android Monitor Overview page
b/2885829

Change-Id: I2c36d9889f685ea6f18859f5859d876da55ba034
2016-05-19 16:55:49 -07:00
Scott Main
486f792d44 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 2016-05-19 23:54:20 +00:00
smain@google.com
69428b4a0a update links to studio docs am: 73cf8224cb
am: f7304c8cc8

* commit 'f7304c8cc8aa947558be355fd0c547f418e44931':
  update links to studio docs

Change-Id: I9886a9618513c63f02add34b12761f8d35afb1da
2016-05-19 23:47:54 +00:00
smain@google.com
f7304c8cc8 update links to studio docs
am: 73cf8224cb

* commit '73cf8224cbd97918d6407aac79a97c6ef70b9a30':
  update links to studio docs

Change-Id: I79a52f27e9107b63c377e8783d129b93c2013c78
2016-05-19 23:43:17 +00:00
smain@google.com
73cf8224cb update links to studio docs
Change-Id: Ie4eccfcb19e690fff935e3a6064332d2e5a3323c
2016-05-19 16:30:43 -07:00
Dirk Dougherty
f339170837 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
2016-05-19 23:19:12 +00:00
Dirk Dougherty
8053c79246 Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9
am: 5fb577e6bc

* commit '5fb577e6bc96cf38cc2395abe54ecb65a4e06936':
  Remove outdated google services links.

Change-Id: I439141d79ed51128e66533656095b3f70ff7a88b
2016-05-19 23:13:57 +00:00
Dirk Dougherty
5fb577e6bc Merge "Remove outdated google services links." into mnc-mr-docs
am: dc40b80ae9

* commit 'dc40b80ae930ac80fd7067e7e9ecc78454e847c5':
  Remove outdated google services links.

Change-Id: I534cae19e16547cac3f34436f38f86ababcbeaca
2016-05-19 23:07:10 +00:00
Dirk Dougherty
dc40b80ae9 Merge "Remove outdated google services links." into mnc-mr-docs 2016-05-19 23:01:54 +00:00
Dirk Dougherty
8b35261e90 Remove outdated google services links.
Change-Id: Ie30c18940c2fd7fbbbfa737145cda36b8a2fc26e
2016-05-19 16:00:56 -07:00