OSDN Git Service

android-x86/packages-apps-Settings.git
5 years agoMerge "Remove developer option to disable device ID access restrictions" into qt...
Michael Groover [Wed, 12 Jun 2019 21:33:33 +0000 (14:33 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev am: ad85d6b942
am: 628d311d0c

Change-Id: I1679817363e1f9e7d5541c8bd575194d24605edd

5 years agoCall finish() when enrollment loses focus
Kevin Chyn [Wed, 12 Jun 2019 21:30:30 +0000 (14:30 -0700)]
Call finish() when enrollment loses focus
am: e9d50cd91b

Change-Id: Ic48cdf5e244689481b8b53af5b55b4b316dc5c56

5 years agoMerge "Remove developer option to disable device ID access restrictions" into qt-dev
Michael Groover [Wed, 12 Jun 2019 21:20:33 +0000 (14:20 -0700)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev
am: ad85d6b942

Change-Id: Ie49e2845fe5c3389b9a44803e293789971ecb485

5 years agoMerge "Remove developer option to disable device ID access restrictions" into qt-dev
Michael Groover [Wed, 12 Jun 2019 20:31:16 +0000 (20:31 +0000)]
Merge "Remove developer option to disable device ID access restrictions" into qt-dev

5 years agoCall finish() when enrollment loses focus
Kevin Chyn [Wed, 12 Jun 2019 03:40:30 +0000 (20:40 -0700)]
Call finish() when enrollment loses focus

Bug: 134971919

Test: Entering keyguard on any enrollment screen finishes enrollment now
Test: Going back/forward works

Change-Id: I2c80a5586c10fa3feb780a5eadfe203abed52dea

5 years agoMerge "Increased toggling area" into qt-r1-dev
joshmccloskey [Wed, 12 Jun 2019 05:51:01 +0000 (22:51 -0700)]
Merge "Increased toggling area" into qt-r1-dev
am: a854373bee

Change-Id: I628397789acf5a7b879a52f3d12cc9786d0869e2

5 years agoMerge "Increased toggling area" into qt-r1-dev
TreeHugger Robot [Wed, 12 Jun 2019 05:40:53 +0000 (05:40 +0000)]
Merge "Increased toggling area" into qt-r1-dev

5 years agoIncreased toggling area
joshmccloskey [Sat, 8 Jun 2019 00:23:44 +0000 (17:23 -0700)]
Increased toggling area

Test: Tapping the whole area will now toggle the switch. Note that
it is no longer possible to individually select the title and subtitle during
talkback, but you can select them as a group.
Test: Verified that without talkback the user must actually press
switch.
Fixes: 130398575

Change-Id: I369637f23e41ac6dc4333293b95a5ccae259ee1f

5 years agoMerge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
Fan Zhang [Tue, 11 Jun 2019 21:44:43 +0000 (14:44 -0700)]
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
am: a621f8a374

Change-Id: Iaafcb9bcc773ecf48fe2e4d57ab8b8ee6223654e

5 years agoMerge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
Fan Zhang [Tue, 11 Jun 2019 21:42:45 +0000 (14:42 -0700)]
Merge "Update mainline module versions string." into qt-dev am: 2aa94b97c7
am: 2c9bd6707d

Change-Id: Id9bb6359eaf6ddd60237c929522418ea291412d5

5 years agoMerge "Update mainline module versions string." into qt-dev
Fan Zhang [Tue, 11 Jun 2019 21:38:42 +0000 (14:38 -0700)]
Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I3ac299e4e8b591a54ebb082d57e4dd408152029c

5 years agoMerge "Update mainline module versions string." into qt-dev
Fan Zhang [Tue, 11 Jun 2019 21:38:42 +0000 (14:38 -0700)]
Merge "Update mainline module versions string." into qt-dev
am: 2aa94b97c7

Change-Id: I0004f9860c2c8f16be3612c165b3e2a40031819c

5 years agoMerge "Update mainline module versions string." into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 21:20:12 +0000 (21:20 +0000)]
Merge "Update mainline module versions string." into qt-dev

5 years agoMerge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e...
Android Build Merger (Role) [Tue, 11 Jun 2019 20:20:05 +0000 (20:20 +0000)]
Merge "Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e am: af8fa25cfd" into qt-r1-dev-plus-aosp

5 years agoMerge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
Antony Sargent [Tue, 11 Jun 2019 20:19:53 +0000 (13:19 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: 5d186f5346

Change-Id: Ib92cedd28e291ba8e606f21883a7d69e73251a5c

5 years agoMerge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
Antony Sargent [Tue, 11 Jun 2019 20:19:51 +0000 (13:19 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev am: 5836158f2e
am: af8fa25cfd

Change-Id: I51513b2df9aa1d5f22cdb118abe4935f0193e6ec

5 years agoMerge "Remove on/off toggle for physical SIMs" into qt-dev
Antony Sargent [Tue, 11 Jun 2019 20:13:52 +0000 (13:13 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: Idfe1855b09448feea3036185f092b3f56b10f18e

5 years agoMerge "Remove on/off toggle for physical SIMs" into qt-dev
Antony Sargent [Tue, 11 Jun 2019 20:12:52 +0000 (13:12 -0700)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev
am: 5836158f2e

Change-Id: I3cfdbf15953adff2133ec4e59195c0403701c13e

5 years agoMerge "Remove on/off toggle for physical SIMs" into qt-dev
TreeHugger Robot [Tue, 11 Jun 2019 20:06:54 +0000 (20:06 +0000)]
Merge "Remove on/off toggle for physical SIMs" into qt-dev

5 years agoMerge "Show a 'permission missing' message in Screen Attention settings." into qt...
Yi Jiang [Tue, 11 Jun 2019 19:28:15 +0000 (12:28 -0700)]
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev
am: 9fb76d02bb

Change-Id: I4131b9f13778ccb1c05ff60a94ebfc49a02319cf

5 years agoMerge "Show a 'permission missing' message in Screen Attention settings." into qt...
TreeHugger Robot [Tue, 11 Jun 2019 19:13:45 +0000 (19:13 +0000)]
Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev

5 years agoFix overlapping problem on notification screen am: 564fcb90ab
tmfang [Tue, 11 Jun 2019 17:55:08 +0000 (10:55 -0700)]
Fix overlapping problem on notification screen am: 564fcb90ab
am: a5715f7d9c

Change-Id: I06f96d7f366ec3efa9b656c5dbe5d349435e9f60

5 years agoFix overlapping problem on notification screen am: 564fcb90ab
tmfang [Tue, 11 Jun 2019 17:52:47 +0000 (10:52 -0700)]
Fix overlapping problem on notification screen am: 564fcb90ab
am: 1c474bf789

Change-Id: I39a2ee35350be2439cab8f3718ecc68fc99c4c82

5 years agoFix overlapping problem on notification screen
tmfang [Tue, 11 Jun 2019 17:46:32 +0000 (10:46 -0700)]
Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I4843fe2b835b5487695ccb522848127028042d4c

5 years agoFix overlapping problem on notification screen
tmfang [Tue, 11 Jun 2019 17:45:44 +0000 (10:45 -0700)]
Fix overlapping problem on notification screen
am: 564fcb90ab

Change-Id: I22700badde84ab5a723b41d59fbd72a9f751452e

5 years agoFix overlapping problem on notification screen
tmfang [Tue, 11 Jun 2019 05:56:56 +0000 (13:56 +0800)]
Fix overlapping problem on notification screen

If we didn't set view and lifecycle for EntityHeaderController,
it only sets "z-order" as 0 for action bar.

So, user sees overlapped problem while user is scrolling view.

For now, we set view and lifecycle as parameter for EntityHeaderController,
then EntityHeaderController can change "z-order" while scrolling view.

Test: visual, robotest
Fixes: 132819126
Change-Id: Ieb01b26e4d6ca4d82f72371620938665de8149a0

5 years agoUpdate mainline module versions string.
Fan Zhang [Mon, 10 Jun 2019 21:40:32 +0000 (14:40 -0700)]
Update mainline module versions string.

We are putting this particular Google string into AOSP because:
1. This feature is part of platform mainline and has a hard dependency
   to Google Play.
2. Settings code has no way to target gms devices, or mainline devices.
   It's either AOSP or OEM. And this change is beyond OEM.

Fixes: 134101529
Test: manual
Change-Id: Ic4e7a7539230db0390bb9230931132e5500a1eb4

5 years agoMerge "Hide color mode in search during A11y" into qt-r1-dev
Anthony Han [Tue, 11 Jun 2019 00:32:17 +0000 (17:32 -0700)]
Merge "Hide color mode in search during A11y" into qt-r1-dev
am: 9eaf5de974

Change-Id: I91808e8c6fd981a1fc794d2584214036c8cb895c

5 years agoShow a 'permission missing' message in Screen Attention settings.
Yi Jiang [Wed, 5 Jun 2019 20:20:42 +0000 (13:20 -0700)]
Show a 'permission missing' message in Screen Attention settings.

Bug: 129284701
Test: Manually verified.
Test: atest AdaptiveSleepSettingsTest

Change-Id: I6375929d59479a0aeb7e4aec184bd36e7f3ab33b

5 years agoMerge "Hide color mode in search during A11y" into qt-r1-dev
TreeHugger Robot [Mon, 10 Jun 2019 23:21:06 +0000 (23:21 +0000)]
Merge "Hide color mode in search during A11y" into qt-r1-dev

5 years agoRemove on/off toggle for physical SIMs
Antony Sargent [Mon, 10 Jun 2019 21:41:08 +0000 (14:41 -0700)]
Remove on/off toggle for physical SIMs

Our original design for mobile network subscription management included
having an on/off toggle for both eSIMs and physical SIMs. However, it
turns out that our current telephony stack has some problems with
disabling physical SIMs, so for now we're removing the on/off
toggle. Because of this, we've added a footer to the SIM details page
for physical SIMS letting users know that to disable them you need to
remove them from the device.

Even though we're removing the on/off toggle for pSIMs, there are still
a few edge cases where you could end up with a disabled one (eg having
two SIMs in single-SIM mode where the eSIM is active and then you erased
the eSIM). In order to have a way to re-enable the pSIM in these cases,
this CL changes the relevant pref's summary to "Tap to activate <name>"
and makes the tap action begin the re-enabling. This can affect either
the Mobile network pref on the Network & internet main page (if this
disabled pSIM is the only SIM), or an entry in the Mobile networks list
page (if there are still multiple SIMs present).

Finally, this also fixes a problem where we weren't showing the on/off
toggle for eSIMs if you only had one SIM total; we actually always want
to show it for eSIMs.

Bug: 132921553
Test: make RunSettingsRoboTests
Change-Id: Id0750ebd5bed46dc2450b65b53cc81847ef09b82

5 years agoMerge "[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into...
Android Build Merger (Role) [Mon, 10 Jun 2019 01:17:55 +0000 (01:17 +0000)]
Merge "[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 am: d09d7b078d -s ours am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history" into qt-r1-dev-plus-aosp

5 years ago[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev...
Kevin Chang [Mon, 10 Jun 2019 01:17:43 +0000 (18:17 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1
am: d09d7b078d -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I4b9ccc7684b7eec7afd628e18d3853c227e185fd

5 years ago[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev...
Kevin Chang [Mon, 10 Jun 2019 01:17:42 +0000 (18:17 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev am: 102d43b5c1 -s ours
am: b2d8610c99 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I53bd835bc715360953f385234f84cc2363e04375

5 years agoMerge "Add tutorial dialog for gesture navigation" into qt-dev
Kevin Chang [Mon, 10 Jun 2019 01:12:44 +0000 (18:12 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev
am: 102d43b5c1

Change-Id: I12f498a313f5920940d49553f0c11c5619a7a4eb

5 years ago[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev
Kevin Chang [Mon, 10 Jun 2019 01:12:42 +0000 (18:12 -0700)]
[automerger skipped] Merge "Add tutorial dialog for gesture navigation" into qt-dev
am: 102d43b5c1 -s ours
am skip reason: change_id I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd with SHA1 0e1f39fad8 is in history

Change-Id: I2539e4f01579937bfc201f1c0b3dfd55a0c79e56

5 years agoMerge "Add tutorial dialog for gesture navigation" into qt-dev
Kevin Chang [Mon, 10 Jun 2019 00:57:14 +0000 (00:57 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Sun, 9 Jun 2019 02:37:18 +0000 (19:37 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: af6b60c523 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd860e9f22ab1117549f848c08ca998b63e51469

5 years agoMerge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Sun, 9 Jun 2019 02:29:19 +0000 (02:29 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev

5 years agoMerge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev...
Android Build Merger (Role) [Sun, 9 Jun 2019 00:47:23 +0000 (00:47 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours am: d4ac3ef39a -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567fa...
Bill Yi [Sun, 9 Jun 2019 00:47:07 +0000 (17:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours
am: d4ac3ef39a -s ours
am skip reason: subject contains skip directive

Change-Id: I34df32a7ca6f22128da89514139383bac56cd965

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567fa...
Bill Yi [Sun, 9 Jun 2019 00:47:06 +0000 (17:47 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: b567faffaa -s ours
am: 49cc947902 -s ours
am skip reason: subject contains skip directive

Change-Id: Icdc5d52a5b7a1d1e4bfa7f622364e6501bb298ea

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: b567faffaa -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5627d075ca460287a52b3b1d2a17c1fb61fa969

5 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sun, 9 Jun 2019 00:42:07 +0000 (17:42 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: b567faffaa -s ours
am skip reason: subject contains skip directive

Change-Id: If9388b9fa0837bee7929f3aa1227e6e3391215ba

5 years agoMerge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Sun, 9 Jun 2019 00:31:00 +0000 (00:31 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 8 Jun 2019 19:26:23 +0000 (12:26 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7b9956f00ad7c2e77e75dddb64a3ee70cc72fa78

5 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 8 Jun 2019 19:01:55 +0000 (12:01 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If595c532cf6a8e9724c74c96b29356ab1bdb65b0

5 years agoMerge "Merge "Disconnect if the user cancels the no/partial connectivity dialog"...
Android Build Merger (Role) [Sat, 8 Jun 2019 06:56:45 +0000 (06:56 +0000)]
Merge "Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21 am: 090cd1d05e" into qt-r1-dev-plus-aosp

5 years agoMerge "Disconnect if the user cancels the no/partial connectivity dialog" into qt...
Lorenzo Colitti [Sat, 8 Jun 2019 06:56:32 +0000 (23:56 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
am: 090cd1d05e

Change-Id: I93cb100fcbda15dfd0eba3dff2be301bc26948f3

5 years agoMerge "Disconnect if the user cancels the no/partial connectivity dialog" into qt...
Lorenzo Colitti [Sat, 8 Jun 2019 06:56:31 +0000 (23:56 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev am: 2bcfecdb21
am: 4bee989ec1

Change-Id: Iaaf336ee2d88654bc46fc3caaf5595f651c8f9ba

5 years agoMerge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am: 2bcfecdb21

Change-Id: I556ca5d18af9ea673216d63bef71ee9ca66d66ad

5 years agoMerge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
Lorenzo Colitti [Sat, 8 Jun 2019 06:51:32 +0000 (23:51 -0700)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
am: 2bcfecdb21

Change-Id: I1108a0f097e7f6b1fc47f2551f18e6316688a8f9

5 years agoMerge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev
TreeHugger Robot [Sat, 8 Jun 2019 06:41:11 +0000 (06:41 +0000)]
Merge "Disconnect if the user cancels the no/partial connectivity dialog" into qt-dev

5 years agoOnly launch fingerprint settings after enrollment if it's from the summary controller...
Kevin Chyn [Sat, 8 Jun 2019 04:12:07 +0000 (21:12 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
am: 4c4bad8e67

Change-Id: I0a3eda6c744c699af850a48e19180967558113b4

5 years agoOnly launch fingerprint settings after enrollment if it's from the summary controller...
Kevin Chyn [Sat, 8 Jun 2019 04:11:43 +0000 (21:11 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller am: eeecb3e24d
am: ee6cc56b68

Change-Id: Id0d8da3ec154b635a89799e106e2c8183aa1cba4

5 years agoOnly launch fingerprint settings after enrollment if it's from the summary controller
Kevin Chyn [Sat, 8 Jun 2019 04:07:07 +0000 (21:07 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am: eeecb3e24d

Change-Id: I4d38ec9a0ffa4dbcffee9b5b7e31c20fd5bd3c7b

5 years agoOnly launch fingerprint settings after enrollment if it's from the summary controller
Kevin Chyn [Sat, 8 Jun 2019 04:06:08 +0000 (21:06 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller
am: eeecb3e24d

Change-Id: I16becf1de78463e9379291f6273c963e850d4687

5 years agoMerge "Do not stay on education page if user has enrolled max templates" into qt...
Kevin Chyn [Fri, 7 Jun 2019 23:04:05 +0000 (16:04 -0700)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev
am: 7b5d1016f4

Change-Id: Idfc11df50ece3e3553fe6e45715716305c1b06e7

5 years agoMerge "Do not stay on education page if user has enrolled max templates" into qt...
Kevin Chyn [Fri, 7 Jun 2019 22:44:49 +0000 (22:44 +0000)]
Merge "Do not stay on education page if user has enrolled max templates" into qt-r1-dev

5 years agoOnly launch fingerprint settings after enrollment if it's from the summary controller
Kevin Chyn [Fri, 7 Jun 2019 22:13:29 +0000 (15:13 -0700)]
Only launch fingerprint settings after enrollment if it's from the summary controller

Fixes: 133822544

Test: No more multiple instances of fingerprint settings after enrolling
      from within the settings page

Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL does not
      send the user to fingerprint settings after completing enrollment

Change-Id: I003dc142b01ed6ffae83299ab4b69f4896eb93e3

5 years agoDo not stay on education page if user has enrolled max templates
Kevin Chyn [Fri, 7 Jun 2019 19:41:05 +0000 (12:41 -0700)]
Do not stay on education page if user has enrolled max templates

Fixes: 134769754

Test: Enroll max templates, go back, intro screen is seen instead
Change-Id: I4a5f8d71abff88688f7c77860bb44caa95d17d61

5 years agoMerge "Updating colors for dark theme" into qt-r1-dev
Joshua Mccloskey [Fri, 7 Jun 2019 19:28:31 +0000 (12:28 -0700)]
Merge "Updating colors for dark theme" into qt-r1-dev
am: 6d24819758

Change-Id: Icde71ef65279e29bf64c0005e29e9db004550054

5 years agoMerge "Updating colors for dark theme" into qt-r1-dev
Joshua Mccloskey [Fri, 7 Jun 2019 19:15:11 +0000 (19:15 +0000)]
Merge "Updating colors for dark theme" into qt-r1-dev

5 years agoDisconnect if the user cancels the no/partial connectivity dialog
Lorenzo Colitti [Fri, 7 Jun 2019 06:18:21 +0000 (15:18 +0900)]
Disconnect if the user cancels the no/partial connectivity dialog

If the user exits the no Internet or partial connectivity dialog
without taking any action, there is no longer any way to use the
network. So, disconnect the network.

Bug: 130766237
Test: clicking outside dialog disconnects network
Test: orientation changes do not disconnect network
Change-Id: I80c2c98c994dc01e53b32f40332b3f1bd03b6012

5 years agoMerge "Fix NFC state switched off every time user entered connection preferences...
Android Build Merger (Role) [Fri, 7 Jun 2019 06:34:22 +0000 (06:34 +0000)]
Merge "Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1 am: dc29b325a1" into qt-r1-dev-plus-aosp

5 years agoFix NFC state switched off every time user entered connection preferences page am...
George Chang [Fri, 7 Jun 2019 06:34:09 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1
am: dc29b325a1

Change-Id: I8a8ce7b773a0c5fa6ead761f288263fe7133ac1c

5 years agoFix NFC state switched off every time user entered connection preferences page am...
George Chang [Fri, 7 Jun 2019 06:34:07 +0000 (23:34 -0700)]
Fix NFC state switched off every time user entered connection preferences page am: e4c2e427a1
am: dc6a11a82a

Change-Id: Iccc2bcf6c1bec2b2ff9b3aa096ff1fb8c155f03b

5 years agoFix NFC state switched off every time user entered connection preferences page
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am: e4c2e427a1

Change-Id: If4545377b7c6196027b89514a91a2b7068f1202b

5 years agoFix NFC state switched off every time user entered connection preferences page
George Chang [Fri, 7 Jun 2019 06:29:07 +0000 (23:29 -0700)]
Fix NFC state switched off every time user entered connection preferences page
am: e4c2e427a1

Change-Id: I52186dbe7b550fd6ab2ae0bccdba80ac1e779b1f

5 years agoFix NFC state switched off every time user entered connection preferences page
George Chang [Thu, 30 May 2019 10:23:18 +0000 (18:23 +0800)]
Fix NFC state switched off every time user entered connection preferences page

NfcAirplaneModeObserver added a scenario that
switched NFC off every time  a user entered connection
preferences page if airplane mode was on.
Even when a user manually switched on NFC, the observer would still
turn NFC off when re-entering connection preferences page.

GSAM TS.27 certification requires NFC state to be consistent
under AirplaneMode before and after reboot the device.
NfcAirplaneModeObserver breaks the requirement
because it would always switch NFC off under airplane mode
when a user checked the NFC state in settings page.

Fix it by removing NfcAirplaneModeObserver.
Keep the NFC state consistent.

Bug:128384879
Test: make RunSettingsRoboTests / Check Nfc on/off Status
Merged-In: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20
Change-Id: If4c8e47c2509b09e8bc1a464e1ab329b945e3d20

5 years agoUpdating colors for dark theme
joshmccloskey [Thu, 6 Jun 2019 23:13:59 +0000 (16:13 -0700)]
Updating colors for dark theme

Bug: 133277663
Test: Verified colors are correct for dark & light themes.
Change-Id: If1aa5f22286d15918cfec3cd4a6436760bf304b2

5 years agoMerge "Fix screen attention contextual card" into qt-r1-dev
Yi Jiang [Thu, 6 Jun 2019 20:23:32 +0000 (13:23 -0700)]
Merge "Fix screen attention contextual card" into qt-r1-dev
am: 03c47e7687

Change-Id: Ic7a425c3662d834da23629d9fd98dc5fc39e4ccc

5 years agoMerge "Fix screen attention contextual card" into qt-r1-dev
Yi Jiang [Thu, 6 Jun 2019 20:06:21 +0000 (20:06 +0000)]
Merge "Fix screen attention contextual card" into qt-r1-dev

5 years agoMerge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb51
Julia Reynolds [Thu, 6 Jun 2019 19:10:00 +0000 (12:10 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb51
am: df0fdaef74

Change-Id: Ibed0e690dab29c78a58f694b3edc9bf9cf67cf2d

5 years agoMerge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb51
Julia Reynolds [Thu, 6 Jun 2019 19:03:55 +0000 (12:03 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev am: f58cd0fb51
am: 520a48070f

Change-Id: I66b0830dc86ee78e97541be0e4ab412eeb2457e5

5 years agoMerge "Silent notifs appear on lockscreen by default" into qt-dev
Julia Reynolds [Thu, 6 Jun 2019 19:00:54 +0000 (12:00 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am: f58cd0fb51

Change-Id: I39f53bcf9665291fb3961e7358aec09e60a310e7

5 years agoMerge "Silent notifs appear on lockscreen by default" into qt-dev
Julia Reynolds [Thu, 6 Jun 2019 18:55:54 +0000 (11:55 -0700)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev
am: f58cd0fb51

Change-Id: I446708aba61c268375257280341a1ff5b33aa81d

5 years agoUpdates System Navigation strings am: 14a1b19735
Mehdi Alizadeh [Thu, 6 Jun 2019 18:36:59 +0000 (11:36 -0700)]
Updates System Navigation strings am: 14a1b19735
am: 14d77491cf

Change-Id: Ifcfaaf9d57b8ee2c19c4a5a891240522457495af

5 years agoMerge "Silent notifs appear on lockscreen by default" into qt-dev
TreeHugger Robot [Thu, 6 Jun 2019 18:36:57 +0000 (18:36 +0000)]
Merge "Silent notifs appear on lockscreen by default" into qt-dev

5 years agoUpdates System Navigation strings am: 14a1b19735
Mehdi Alizadeh [Thu, 6 Jun 2019 18:31:42 +0000 (11:31 -0700)]
Updates System Navigation strings am: 14a1b19735
am: cde53dc119

Change-Id: Id431c8e6b12611b00af1b3e34ad7b66deddc49fa

5 years agoUpdates System Navigation strings
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am: 14a1b19735

Change-Id: Ifd443b394ce19ceb0c0fe94abbaaa31d9158c475

5 years agoUpdates System Navigation strings
Mehdi Alizadeh [Thu, 6 Jun 2019 18:28:39 +0000 (11:28 -0700)]
Updates System Navigation strings
am: 14a1b19735

Change-Id: I86d6eab41c4c5d04d4311ce7699f55546f29cebf

5 years agoUpdates System Navigation strings
Mehdi Alizadeh [Wed, 5 Jun 2019 22:34:50 +0000 (15:34 -0700)]
Updates System Navigation strings

Bug: 134517326
Test: Verified manually
Change-Id: I777cfdc3a760040fdea745c5247152c5ff0d6218

5 years agoSilent notifs appear on lockscreen by default
Julia Reynolds [Thu, 6 Jun 2019 15:18:24 +0000 (11:18 -0400)]
Silent notifs appear on lockscreen by default

Test: atest
Bug: 134613164
Change-Id: I1ee39a1302010a2a29ba6d0060f19565e41859a2

5 years agoMerge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
Kevin Chang [Thu, 6 Jun 2019 09:17:06 +0000 (02:17 -0700)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
am: 52482edb2b

Change-Id: Ifecf327f3cd13efe708e99c697afd44b13e24f74

5 years agoMerge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp
Kevin Chang [Thu, 6 Jun 2019 09:04:42 +0000 (09:04 +0000)]
Merge "Add tutorial dialog for gesture navigation" into qt-dev-plus-aosp

5 years agoAdd tutorial dialog for gesture navigation
Kevin Chang [Fri, 31 May 2019 07:14:47 +0000 (15:14 +0800)]
Add tutorial dialog for gesture navigation

Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture

Fixes: 133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd
Merged-In: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd

5 years agoAdd tutorial dialog for gesture navigation
Kevin Chang [Fri, 31 May 2019 07:14:47 +0000 (15:14 +0800)]
Add tutorial dialog for gesture navigation

Add new tutorial dialog for gesture navigation in order to teach
users how to use the gesture

Fixes: 133650388
Test: Manual
Change-Id: I7cc6a950af49044b27cf7ca41e3bcf67ef40b5fd

5 years agoMerge "UE showed wrong title and message when enabling data roaming." into qt-dev...
Andy Chou [Thu, 6 Jun 2019 03:29:10 +0000 (20:29 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764
am: 768691520b

Change-Id: Ic357a10b7eec9dd65562138af37be35e1d4b0c01

5 years agoMerge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535
Antony Sargent [Thu, 6 Jun 2019 03:28:05 +0000 (20:28 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535
am: 2082b0e969

Change-Id: I2e61bb379571c03b900734ad5da03b33e2ddbc90

5 years agoMerge "UE showed wrong title and message when enabling data roaming." into qt-dev...
Andy Chou [Thu, 6 Jun 2019 03:27:25 +0000 (20:27 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev am: a9e8c50764
am: 8c0d669d6e

Change-Id: I5ff88b4ba6ff4a642834a3453438489ae2804dc2

5 years agoMerge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535
Antony Sargent [Thu, 6 Jun 2019 03:27:01 +0000 (20:27 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev am: 68a26e5535
am: 5cdf1955f4

Change-Id: I88335b8bb5cf4ac4bc4d279679d36dbd2194346f

5 years agoMerge "UE showed wrong title and message when enabling data roaming." into qt-dev
Andy Chou [Thu, 6 Jun 2019 02:51:46 +0000 (19:51 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am: a9e8c50764

Change-Id: I7e32848cd240b43e93533f5575202b1122620dee

5 years agoMerge "Strings for pSIM on/off toggle removal" into qt-dev
Antony Sargent [Thu, 6 Jun 2019 02:51:13 +0000 (19:51 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am: 68a26e5535

Change-Id: I1ab73ba3e6e666a42590030d9dd6903f257b070a

5 years agoMerge "UE showed wrong title and message when enabling data roaming." into qt-dev
Andy Chou [Thu, 6 Jun 2019 02:49:12 +0000 (19:49 -0700)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev
am: a9e8c50764

Change-Id: I8d6b2b025fd039202eca5f6c8eefea1acb8f0e91

5 years agoMerge "Strings for pSIM on/off toggle removal" into qt-dev
Antony Sargent [Thu, 6 Jun 2019 02:47:52 +0000 (19:47 -0700)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev
am: 68a26e5535

Change-Id: I4d43b9a27284cf126c21ae7ab9089d2d79c0dc25

5 years agoMerge "UE showed wrong title and message when enabling data roaming." into qt-dev
Andy Chou [Thu, 6 Jun 2019 00:35:16 +0000 (00:35 +0000)]
Merge "UE showed wrong title and message when enabling data roaming." into qt-dev

5 years agoMerge "Strings for pSIM on/off toggle removal" into qt-dev
Antony Sargent [Thu, 6 Jun 2019 00:19:16 +0000 (00:19 +0000)]
Merge "Strings for pSIM on/off toggle removal" into qt-dev

5 years agoMerge "use different description strings for screen attention settings and contextual...
Yi Jiang [Thu, 6 Jun 2019 00:10:30 +0000 (17:10 -0700)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev
am: d81e2c36f6

Change-Id: I34f211f8234fe883c1a646bd27f5d73ca0067463

5 years agoMerge "use different description strings for screen attention settings and contextual...
Yi Jiang [Wed, 5 Jun 2019 23:35:51 +0000 (23:35 +0000)]
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev