Commit Graph

252839 Commits

Author SHA1 Message Date
Chong Zhang
80c031cbd4 Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev
am: 19628b251d

Change-Id: Iac98c996ba13b59319a12b089be234366a8e7213
2016-08-26 23:28:22 +00:00
Chong Zhang
9f92bc2602 DO NOT MERGE -- Only use saved surface if started by launcher or moved to front
am: 813be138ae

Change-Id: Id64071882a0b90212b92234a4d0bdc67f2ee5e1a
2016-08-26 23:28:17 +00:00
Chong Zhang
19628b251d Merge "DO NOT MERGE -- Only use saved surface if started by launcher or moved to front" into nyc-dr1-dev 2016-08-26 23:22:10 +00:00
Andrii Kulian
620040db3f DO NOT MERGE -- Correctly finish activity in non-focused stack
When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.

Bug: 29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
(cherry picked from commit 7318d63ba6)
2016-08-26 23:07:28 +00:00
Adam Powell
06f9eb8b62 Fixes for ImageView drawable visibility dispatch
Some apps rely on their drawables not getting not-visible hints via
setVisible when the window visibility changes. This manifests as
additional animations, such as crossfading from placeholders when the
window becomes visible again.

Apps should be able to handle this case in the future now that we have
more detailed reporting via onVisibilityAggregated, but to keep
existing apps working as-is, ImageView now operates in a compatibility
mode for targetSdkVersion < N and will only dispatch visibility
signals based on the same triggers used in M. New apps get the more
detailed signals.

Fix a bug where window visibility dispatch via onVisibilityAggregated
would double-dispatch "not visible" when the window is transitioning
from GONE => INVISIBLE or INVISIBLE => GONE.

Make the growing set of compatibility check fields in ImageView
static, matching the pattern from View.

Bug 30216207

Change-Id: I88875260bf6aaa23687c7d51353de8d633383531
2016-08-26 22:59:39 +00:00
Amith Yamasani
0903ec5017 Add logging to CursorWindow JNI code to track #31046363
Log the error messages when trying to mmap the remote
cursor's ashmem file descriptor.

Bug: 31046363
Change-Id: I52839d1246f84a0a2d7b1e850933fcdf6056b884
2016-08-26 15:53:29 -07:00
Todd Kennedy
742f4de6cf Enable web action apps based on system setting
am: efc1c4d501

Change-Id: I2c8c12aebddecb920d1924c4a04f96acdcd3cc02
2016-08-26 22:46:44 +00:00
Chong Zhang
813be138ae DO NOT MERGE -- Only use saved surface if started by launcher or moved to front
Restrict saved surface to launcher start (ACTION_MAIN&CATEGORY_
LAUNCHER), or there is no intent at all (eg. task being brought to
front). If the intent is something else, likely the app is going
to show some specific page or view, instead of what's left last time.

This solves problems like the launcher shortcuts on DeckClock,
each of them is a different intent and will show one specific
view regardless of last states. Another example is Chrome tab
opened directly by action VIEW to open some URL.

(Note that this doesn't solve the problem with Chrome homescreen
shortcuts, it will still start with saved surface (if Chrome
is already open). This is because the shortcut is a trampoline
activity that starts the real chrome tab activity, but when
the trampoline is started, the whole task is already brought
to front, and ChromeTab could become visible with the task
before we actually start it.)

bug: 31055479
bug: 27747315

Change-Id: Id3e61c61ef516b0edc1f174320f02661222f226b
(cherry picked from commit ad24f96def)
2016-08-26 15:41:58 -07:00
Makoto Onuki
93d94ebac2 Update CP2 javadoc
Bug 30895732
Bug 30063194
Bug 30254247

Change-Id: I6af160daf06a52bd96db8f1dd1aa0c3bf3646fa1
2016-08-26 15:20:26 -07:00
Vineeta Srivastava
6af315af94 whitelist sms code for TMO-DE and TMO-MK.
For Germany (T-D) 73240 and 3011 is added to whitelist
For Macedonia (TMMK) 129005 and 122 added to whitelist

Bug: 30908153
Change-Id: I892a172994de62d90df313e9f7aaa17356092448
2016-08-26 21:17:08 +00:00
Todd Kennedy
efc1c4d501 Enable web action apps based on system setting
Bug: 28140107
Change-Id: I4cff49165be6432404b9a616ca35bee249daab2a
2016-08-26 14:03:37 -07:00
Andrew Solovay
6f29c2091c docs: Fixing formatting problem
Fixing problem (mismatched <div> tags) that caused the page text to be
obscured. See first comment for doc stage location.

bug: 31046432
Change-Id: I82227fd29764755885458c1c011db534325fcde3
2016-08-26 13:35:03 -07:00
Tyler Gunn
ffe4d64182 Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev
am: 020212c7df

Change-Id: I4f8f1b6fb133e2d4b0cbde1da872565aecffc86f
2016-08-26 20:33:58 +00:00
Tyler Gunn
6c619a2abb Add device config to determine when "allow hold" carrier config is used.
am: d81c426e1d

Change-Id: Idd16d4b9977fa0773b788931ed77f8f0f3d8e8dd
2016-08-26 20:33:09 +00:00
Todd Kennedy
2265267555 Merge "Implement new ephemeral resolver design" into nyc-mr1-dev
am: 80855e154e

Change-Id: Ib3d489768ec906a3078d1b14b850121917daf38c
2016-08-26 20:32:48 +00:00
Todd Kennedy
6485f6eddf Implement new ephemeral resolver design
am: fea1b776e9

Change-Id: Ied8a583de6247a5d826805dfbb5e8edbecdcdb27
2016-08-26 20:32:45 +00:00
Tyler Gunn
020212c7df Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev 2016-08-26 20:28:36 +00:00
TreeHugger Robot
80855e154e Merge "Implement new ephemeral resolver design" into nyc-mr1-dev 2016-08-26 20:28:04 +00:00
Tyler Gunn
d81c426e1d Add device config to determine when "allow hold" carrier config is used.
The "allow hold" carrier config option was added to meet new carrier
requirements.  However we do not wish to enforce this option on older
devices.

Bug: 30449352
Change-Id: I4bf6dab0a200bdd2511c67b8134c6c0dc4b7e5a8
2016-08-26 20:19:31 +00:00
Jorim Jaggi
9bdfbd7c82 Play sound on ACTION_DOWN for navigation keys
am: 05bce15da9

Change-Id: I99ee8746b710c131dcd781a1623aa3b5edbbc84d
2016-08-26 19:46:36 +00:00
Jorim Jaggi
05bce15da9 Play sound on ACTION_DOWN for navigation keys
Change-Id: I83a39aa9ba2519952cb723d72c66203881c9b3b5
Fixes: 30837708
2016-08-26 19:39:28 +00:00
FEI WU
798e2ba605 Use png for switch in SwitchPreference on watch
Replaced vector based Switch icon with png based one. This switch will
only be used in SwitchPreference on watch.

Change-Id: I626ae05a83502c9a39f1c3b5eb6dfd48d33bc368
2016-08-26 11:48:46 -07:00
Brian Duddie
3a41c5b654 Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev
am: 73f511e471

Change-Id: Ie8a7f62675bf60436d1262098d0a550692d70b02
2016-08-26 18:27:53 +00:00
Greg Kaiser
6f155aa4bf ContextHubManager: Document InstanceInfo bug
am: 3be73d3950

Change-Id: I8a1418086d7e9c4f60205234394dd1cc8d1215df
2016-08-26 18:27:50 +00:00
Brian Duddie
73f511e471 Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev 2016-08-26 18:20:19 +00:00
Paul Stewart
1377955965 Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev
am: 855210170c

Change-Id: I686a984b32b8a8bfe6d221e5cf543b2137199a1b
2016-08-26 17:56:05 +00:00
Paul Stewart
b09557b3cf Document correct context for obtaining WifiManager
am: 0e164b199e

Change-Id: I22ca3647430252345bb7b14e5da693fb9c616789
2016-08-26 17:56:03 +00:00
TreeHugger Robot
855210170c Merge "Document correct context for obtaining WifiManager" into nyc-mr1-dev 2016-08-26 17:50:21 +00:00
Todd Kennedy
5320ee42c6 throw if >1 verifier found
still allows for no verifier to be defined.

Change-Id: I0b2208edf20c2680b0aaedb6c5efaa42ac1f952d
Fixes: 31086284
2016-08-26 10:44:59 -07:00
Allen Hair
baac84303c Merge "Configure code coverage filters." into nyc-mr1-dev
am: 6bf296f6dc

Change-Id: I35e24a68a87939defbeb14863baa3cff05a21b06
2016-08-26 17:33:38 +00:00
Allen Hair
15b70213a4 Configure code coverage filters.
am: 02fd609460

Change-Id: Iae831e68c195abcfa52528ac8609fbbee0be03df
2016-08-26 17:33:35 +00:00
Allen Hair
6bf296f6dc Merge "Configure code coverage filters." into nyc-mr1-dev 2016-08-26 17:28:52 +00:00
Fyodor Kupolov
429a0197bf Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev
am: 4be496d2d0

Change-Id: Ibe8cf242b664e9adc53aa6987b7ce25249d2af8f
2016-08-26 16:59:28 +00:00
Fyodor Kupolov
658b8e7e4b Fix AccountManagerServiceTest
am: d954357860

Change-Id: Iefa213fafbfb9893af659b5300d662e365667e85
2016-08-26 16:59:27 +00:00
Fyodor Kupolov
4be496d2d0 Merge "Fix AccountManagerServiceTest" into nyc-mr1-dev 2016-08-26 16:52:07 +00:00
Dirk Dougherty
c49ce72fd8 Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818 am: 61f52fca96
am: be1a09ef47

Change-Id: Ia7c4bbeb19e20c34fb380721186645e4d4057e20
2016-08-26 16:37:32 +00:00
Dirk Dougherty
5e34cccda6 Fetch ga script over https to avoid mixed content. am: b5760c1fe7 am: 324054e7d4
am: 26901d3715

Change-Id: I2b30eebe6b5c2353556f89e115c10eaabb5f8f13
2016-08-26 16:37:29 +00:00
Dirk Dougherty
be1a09ef47 Merge "Fetch ga script over https to avoid mixed content." into nyc-dev am: c2b9d55818
am: 61f52fca96

Change-Id: I2b3b941677aa5568c26cfb17161cc72b09f3fafe
2016-08-26 16:31:29 +00:00
Dirk Dougherty
26901d3715 Fetch ga script over https to avoid mixed content. am: b5760c1fe7
am: 324054e7d4

Change-Id: I245edf657d289265027eee94b9e40395da8ffa9e
2016-08-26 16:31:26 +00:00
Paul Stewart
0e164b199e Document correct context for obtaining WifiManager
Added comments to both WifiManager WIFI_SERVICE.

Bug: 25015174
Change-Id: Ibd1e21d860ef2b7cc432b3da76671d22c02ef7cb
2016-08-26 09:27:04 -07:00
Dirk Dougherty
61f52fca96 Merge "Fetch ga script over https to avoid mixed content." into nyc-dev
am: c2b9d55818

Change-Id: I921f581b8d418cc43d3ad50feaec8ddf233af945
2016-08-26 16:25:46 +00:00
Dirk Dougherty
324054e7d4 Fetch ga script over https to avoid mixed content.
am: b5760c1fe7

Change-Id: I9cd19eac7a89c2ab5b5f1fd11a98bcdc7b7850ab
2016-08-26 16:25:43 +00:00
Dirk Dougherty
c2b9d55818 Merge "Fetch ga script over https to avoid mixed content." into nyc-dev 2016-08-26 16:22:08 +00:00
Brian Duddie
34230195ab Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev
am: 6bf3424ccf

Change-Id: I8f4c4c76f458420eb76b260a0b356c25e440a45b
2016-08-26 16:19:54 +00:00
Andrew Rossignol
e2478c4cb6 ContextHub: Avoid reference leaks
am: c35104535c

Change-Id: I751f7710a65809be15509fa199be27b643b7a13b
2016-08-26 16:19:52 +00:00
Brian Duddie
6bf3424ccf Merge "ContextHub: Avoid reference leaks" into nyc-mr1-dev 2016-08-26 16:15:59 +00:00
Jason Monk
b481f7ce7d Merge "Backup system QS tiles" into nyc-dr1-dev am: f498d0d384
am: 68d7519060

Change-Id: I28c4304b0579bc74b21ab2634e261410b98d85b1
2016-08-26 13:29:48 +00:00
Jason Monk
8ed8f1e6a1 Backup system QS tiles am: baade7573f
am: 9813cb61dd

Change-Id: Ia0ba996f6b0a889ba7469a2272a6fe0c235b15d5
2016-08-26 13:29:46 +00:00
Jason Monk
68d7519060 Merge "Backup system QS tiles" into nyc-dr1-dev
am: f498d0d384

Change-Id: I3df026ae22d4579c40e2c6532311ad69a3ceb0b7
2016-08-26 13:24:17 +00:00
Jason Monk
9813cb61dd Backup system QS tiles
am: baade7573f

Change-Id: Ie601a706cbdcfdb1e836117d02fec914b4acbab1
2016-08-26 13:24:14 +00:00