36922 Commits

Author SHA1 Message Date
TreeHugger Robot
44d0cda8ef Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp 2017-07-14 09:50:59 +00:00
Hugo Benichi
12df465997 CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.

This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.

Bug: 62332137
Test: manually tested with captive portal entwork.

(cherry pick from commit 22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into oc-dr1-dev-plus-aosp because of previous
cherry picks and incorrect Merged-In annotations)

Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
2017-07-14 14:54:58 +09:00
Doris Ling
db0ec7d60f Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
am: 9f675cee28

Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
2017-07-13 21:15:21 +00:00
TreeHugger Robot
9f675cee28 Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev 2017-07-13 20:59:39 +00:00
Nikolas Bravo
de93e6912f Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
am: 479d915db5

Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b
2017-07-13 20:05:55 +00:00
TreeHugger Robot
479d915db5 Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev 2017-07-13 19:59:40 +00:00
Lucas Dupin
b02198da14 Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
am: 6a6d63be45

Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd
2017-07-13 19:49:59 +00:00
Lucas Dupin
6a6d63be45 Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
* changes:
  Check mark color after successful auth
  Ripple colors should match sysui theme.
  Correct navbar colors after rebooting
2017-07-13 19:41:32 +00:00
TreeHugger Robot
e210bf7a40 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-13 18:53:12 +00:00
Evan Laird
8154057746 Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev
am: 31ff02ecd2

Change-Id: I86b352ed009cf2889974d724a4cf8daf41fb61d7
2017-07-13 18:45:23 +00:00
TreeHugger Robot
31ff02ecd2 Merge "Fix qs tile drawing in edit QS panel" into oc-dr1-dev 2017-07-13 18:39:39 +00:00
Nikolas Bravo
9752ce32ef ProfileSelectDialog no longer removes caller activity from
task.

In Settings, after calling ProfileSelectDialog and choosing a profile,
then going back would go 2 activities back. The issue is that
ProfileSelectDialog was calling finish() in the no-longer-used
SettingsDrawerActivity. This caused the any activity calling the
dialog to be removed from the task, and thus being impossible to
go back to. This call to the drawer is also a code smell.

Bug: 36237246
Fixes: 36237246
Test: NA
Change-Id: I6f309b220ffae1d86e6879ddf6a0305ad3dde3e8
(cherry picked from commit b975c0e44445f76d67e7576c1e8e08609b696408)
2017-07-13 17:59:44 +00:00
Selim Cinek
ce58e94a5b Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev
am: c8c121757e

Change-Id: I796e63264ddbba810a1def709594fa73977f50ca
2017-07-13 17:54:13 +00:00
Doris Ling
a9fbf3817a Update the max height/width attribute of the TwoTargetPreference icon.
Change the namespace for the icon image view to settings package.

Change-Id: Id1ffbc1742bedab93c9f03e9d464f532fe2c33af
Fix: 63666970
Test: Visual
(cherry picked from commit a990b5da04b4f5d475ff038f99d7dd908e931d63)
2017-07-13 17:41:24 +00:00
TreeHugger Robot
c8c121757e Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev 2017-07-13 17:40:44 +00:00
Lucas Dupin
de3597c769 Merge "In-app gradient color based on systemui theme." into oc-dr1-dev
am: 717dd58c52

Change-Id: I35c7baae2e373f4d8bea87d1afc175833de7f59e
2017-07-13 17:09:59 +00:00
Lucas Dupin
717dd58c52 Merge "In-app gradient color based on systemui theme." into oc-dr1-dev 2017-07-13 17:03:47 +00:00
Selim Cinek
d4a3ca8d76 Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev
am: ac77186d34

Change-Id: Ia5c6852cce42eb3fe600086c3140266a141bca03
2017-07-13 16:36:48 +00:00
Selim Cinek
ac77186d34 Merge "Fixed a bug where an incoming call wasn't launching" into oc-dr1-dev 2017-07-13 16:29:21 +00:00
TreeHugger Robot
482b2c3b12 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-13 15:31:41 +00:00
Selim Cinek
35490bb847 Fixed a bug where status icons were not animating
Initializing should be done to true

Test: manual, add animating notification, observe statusbar
Change-Id: I53c7667184b1e9e0d065816982236b9a7b919b6f
Fixes: 63533925
2017-07-13 17:27:20 +02:00
Selim Cinek
ebf423466c Fixed a bug where an incoming call wasn't launching
When the lockscreen isn't showing, but aod is, an incomming
call would not launch its fullscreen intent but show up in
AOD1. In addition was the display completely messed up and
overlapping other parts of the AOD screen.

Test: receive call while in AOD but not locked
Change-Id: Icc3e989167e72289ddcd0a62064526db9004cdc2
Fixes: 62402251
2017-07-13 15:46:10 +02:00
Bill Yi
aaba1d30a3 Import translations. DO NOT MERGE
Change-Id: I0d916ea4bce1d259de0703e12701b534f31178a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 06:42:58 -07:00
Adrian Roos
6d626acdbf Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev
am: 3fbd93056e

Change-Id: I8bc8e01a97711fdd30ff59aeb72d38e8acaa7c75
2017-07-13 12:10:21 +00:00
Adrian Roos
3fbd93056e Merge "AOD: Implement long press gesture to launch assist" into oc-dr1-dev 2017-07-13 12:01:52 +00:00
Bill Yi
d63a6fd0f6 Import translations. DO NOT MERGE
Change-Id: Id63562e9b590d6351469c5d884ebb9e5a24ba195
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 03:10:00 -07:00
Lucas Dupin
007baf37a2 Check mark color after successful auth
Bouncer check mark color should never change
during auth, always respecting the theme.

Change-Id: Ie4fd89a32addbc106242aa239d01cb30f3cab5b3
Fixes: 62887909
Test: Visual
2017-07-12 15:44:42 -07:00
Lucas Dupin
ce8466e3df Ripple colors should match sysui theme.
Change-Id: Ica428dbcb6b8832ef67c91fbf2424c178c222d0d
Fixes: 62887093
Test: visual
2017-07-12 14:34:13 -07:00
Evan Laird
929bd54c6a Fix qs tile drawing in edit QS panel
The problem here was reuse:

1. Tile has a SlashState -> gets SlashDrawable
2. Reused tile has no SlashState -> doesn't know how to gracefully
remove the slash and draw regularly, so it gets a slash anyway.

Unrelated, but also fixed: turn off slash animations in QS edit panel

Fixes: 63160044
Test: runtest -x
frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs/SlashImageViewTest.java

Change-Id: I6841bfafcef0588d1ca63b3326dfee1a856618f3
2017-07-12 16:43:59 -04:00
Lucas Dupin
f7b7bab3dc Correct navbar colors after rebooting
System UI visibility flags shouldn't be set based on overlay
states. Overlays may persist across reboots leading to
situations where the navbar might be white when the rest of
the UI is black.

Change-Id: Id3d1e935c1f02a76491a92e521565468602719d5
Fixes: 63138897
Test: reboot, swipe up, look at navbar
2017-07-12 12:09:54 -07:00
Geoffrey Pitsch
dfb3542879 Merge "Move @Ignore from class-level to test level." into oc-dr1-dev
am: bcc318f9cf

Change-Id: I88f83646fbefeaacacd60c24859f7bd228b0d097
2017-07-12 17:48:07 +00:00
Lucas Dupin
c77b71d7f0 In-app gradient color based on systemui theme.
When viewing your scrim on top of an app (wallpaper not visible),
the gradient color should be dark if your wallpaper is dark and
light if your wallpaper is light.

Change-Id: I5f3aea5bf9ec066b7caecd7cadfd2814e3758bd1
Fixes: 63121129
Bug: 63365056
Test: runtest -x tests/Internal/src/com/android/internal/colorextraction/types/TonalTest.java
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
2017-07-12 10:40:23 -07:00
TreeHugger Robot
bcc318f9cf Merge "Move @Ignore from class-level to test level." into oc-dr1-dev 2017-07-12 17:40:15 +00:00
Geoffrey Pitsch
ba918dbf0c Move @Ignore from class-level to test level.
Workaround for reporting error.

Test: runtest systemui
Bug: 63521982
Change-Id: I81e70605471469b0ffa630ff874427a621fc1135
2017-07-12 11:40:32 -04:00
Evan Laird
ca07589a0a Merge "Update keyguard mic icon to rounded" into oc-dr1-dev
am: ea0beea5dd

Change-Id: I25406b379b0cb7d554505ad72912b45d01880f33
2017-07-12 15:07:38 +00:00
Evan Laird
11aba31e55 Merge "Update animations in QS" into oc-dr1-dev
am: 497d73f35e

Change-Id: I64226ee9f79dc94e2009d27572b85b1668bff3d7
2017-07-12 15:05:23 +00:00
TreeHugger Robot
ea0beea5dd Merge "Update keyguard mic icon to rounded" into oc-dr1-dev 2017-07-12 14:58:20 +00:00
TreeHugger Robot
497d73f35e Merge "Update animations in QS" into oc-dr1-dev 2017-07-12 14:58:04 +00:00
Jorim Jaggi
fb8e9add4b Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
am: f33b1eda88

Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b
2017-07-12 14:07:21 +00:00
Adrian Roos
d0963a07d1 AOD: Implement long press gesture to launch assist
Bug: 37684244
Test: adb shell settings put secure doze_pulse_on_long_press 1; turn screen off, long press, verify assistant is launched
Change-Id: I87335d3c091bbb17022d79e599f46fb826039b7d
2017-07-12 15:25:50 +02:00
Jorim Jaggi
f33b1eda88 Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev 2017-07-12 12:57:33 +00:00
Hugo Benichi
5185c1ce92 Merge "Add first OWNERS files for core networking" am: 4066930a36 am: 531cae76fd
am: 59de81533d

Change-Id: Id149a16336fd5adfe8b247bb4b116db1ee357653
2017-07-12 04:07:18 +00:00
Hugo Benichi
59de81533d Merge "Add first OWNERS files for core networking" am: 4066930a36
am: 531cae76fd

Change-Id: I099ee71d8b9ed767af2f4556e4798a1263dab9c0
2017-07-12 04:01:15 +00:00
Hugo Benichi
531cae76fd Merge "Add first OWNERS files for core networking"
am: 4066930a36

Change-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112
2017-07-12 03:54:57 +00:00
Hugo Benichi
357b58cdab Add first OWNERS files for core networking
Covering
  core/java/android/net/
  core/java/com/android/server/net/
  packages/CaptivePortalLogin/
  services/core/java/com/android/server/
    ConnectivityService.java
    NsdServic.java
    NetworkManagementService.java
  services/core/java/com/android/server/connectivity/
  services/net/
  tests/net/

Android core networking files not covered:
  services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
  services/core/proto/ipconnectivity.proto (path unique to aosp)

Bug: 63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
2017-07-12 09:25:15 +09:00
Jason Monk
b10cf4d1d6 Merge "Final tweaks to power menu" into oc-dr1-dev
am: 0a2ada5416

Change-Id: I2f19770417a30863f99675820908623eb7a8cec0
2017-07-11 20:31:22 +00:00
TreeHugger Robot
0a2ada5416 Merge "Final tweaks to power menu" into oc-dr1-dev 2017-07-11 20:22:16 +00:00
Evan Laird
0c5c375c44 Update keyguard mic icon to rounded
Test: visual
Change-Id: I4032e9f496b9b70820448b6ff5794ec58623cd84
Fixes: 62386498
2017-07-11 16:04:59 -04:00
Evan Laird
99d4134dd0 Update animations in QS
- Hotspot transient
- Bluetooth transient
- Trusted -> error
- Error -> trusted
- Fingerprint -> error
- Error -> Fingerprint
- Expand/collapse caret (shows up in volume and QS footer)

Test: visual
Bug: 62386498
Fixes: 63236324
Fixes: 62387135
Change-Id: I283dd2d34cd75634911cc7190b49c65d6328bd2e
2017-07-11 15:24:46 -04:00
Lucas Dupin
51b9716332 Merge "Fix scrim opacity in the brightness mirror" into oc-dr1-dev
am: c393be76d9

Change-Id: I37af2f178220bc7cd0b6fbac51d6cf3f84193ab9
2017-07-11 17:36:07 +00:00