Commit Graph

53917 Commits

Author SHA1 Message Date
Android Build Merger (Role)
aaae63aaa9 Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours am: 1f4b32a154 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-18 21:33:57 +00:00
Bill Yi
7355faeb99 [automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
am: 1f4b32a154 -s ours
am skip reason: subject contains skip directive

Change-Id: I000d7b47e58b2238e6969ae321aa09d170555d5d
2019-07-18 14:33:35 -07:00
Bill Yi
160a6efb72 [automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
am: ad2542c534 -s ours
am skip reason: subject contains skip directive

Change-Id: I5738457ce2d693b01b1368dc17987ee77de9a33d
2019-07-18 14:33:33 -07:00
Bill Yi
ad2542c534 [automerger skipped] Import translations. DO NOT MERGE
am: e73e59c562 -s ours
am skip reason: subject contains skip directive

Change-Id: I52627f2e7b30beb857a5e7c8ca955671ceefef28
2019-07-18 14:24:36 -07:00
Bill Yi
f36921c04b [automerger skipped] Import translations. DO NOT MERGE
am: 56887f467c -s ours
am skip reason: subject contains skip directive

Change-Id: I0f83f2ea5a5f6fdd6659a9113b7561ea63ebf097
2019-07-18 14:24:36 -07:00
Bill Yi
1f4b32a154 [automerger skipped] Import translations. DO NOT MERGE
am: e73e59c562 -s ours
am skip reason: subject contains skip directive

Change-Id: I888c9b99282dcccfe58db799c1c02ceed4b63747
2019-07-18 14:24:35 -07:00
Bill Yi
e73e59c562 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
2019-07-18 11:28:21 -07:00
Bill Yi
56887f467c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id43eff8bedf9c1bd2d3d25a73a560705ab8da213
2019-07-18 11:07:45 -07:00
Kevin Chang
08be6c4a84 Merge "Add footer preference into caption preferences" into qt-r1-dev
am: 5fc6db2cf7

Change-Id: I02eb493be2b958b766f06d85dde7aabcc1230a68
2019-07-18 00:53:55 -07:00
Kevin Chang
8c17c2f588 Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
am: 6bfc381173

Change-Id: Ic0b481b5306a91c58f1aeea4cb125874d6b77d2e
2019-07-18 00:53:02 -07:00
Kevin Chang
42f6f19216 Merge "UI change in caption preferences in Settings" into qt-r1-dev
am: af447c17b8

Change-Id: I5b669681267875963d9b91471bdb63a57b1c84b0
2019-07-18 00:52:00 -07:00
Kevin Chang
5fc6db2cf7 Merge "Add footer preference into caption preferences" into qt-r1-dev 2019-07-18 06:59:47 +00:00
Kevin Chang
6bfc381173 Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev 2019-07-18 06:59:45 +00:00
Kevin Chang
af447c17b8 Merge "UI change in caption preferences in Settings" into qt-r1-dev 2019-07-18 06:59:41 +00:00
Kevin Chang
5277da96c2 Add footer preference into caption preferences
Add footer preference into caption preferences to tell users
that the setting doesn't support all apps.

Reference link of screenshot:
https://drive.google.com/file/d/1VzpWa4M-4HjlfjDNNqrEIKwo3v0y_f51/view?usp=sharing

Bug: 135888603
Test: Visual
Change-Id: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
Merged-In: I95e0aa301eba7343fbc798cc406c0242f4f4eb7e
(cherry picked from commit 8f4b8b9a74)
2019-07-17 11:28:01 +00:00
Kevin Chang
04dea2b5c2 Add new reminder in "Magnify with shortcut" page
Add new reminder string in "Magnify with shortcut" page when
it's under gesture navigation mode.

Reference link of screenshot:
https://drive.google.com/file/d/1uo31FZebhXKcCR8QY_WrgEPiInzARmIl/view?usp=sharing

Bug: 134645913
Test: Visual
Change-Id: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
Merged-In: Ibbaa162d4acf0fdeed8c98b2aa1d83953880e6a6
2019-07-17 11:27:37 +00:00
Kevin Chang
ef9cd2ac95 UI change in caption preferences in Settings
Move the switch after the caption preview and change the oreder of the
settings inside in caption preferences in Accessibility settings.

Reference link for screenshot:
https://drive.google.com/file/d/1EQLpfQFnJTwU1F8vLAOSHPYqSXKWL_ap/view?usp=sharing

Bug: 130755332
Test: Visual
Change-Id: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
Merged-In: Icb4dabdef71be165a21d1bde474872ee0bb35bfa
(cherry picked from commit fd1f1c0f82)
2019-07-17 11:27:06 +00:00
Antony Sargent
6dd874305e Make MobileNetworkActivity support onNewIntent
The launchMode for MobileNetworkActivity specified in the android
manifest is "singleTask", which means that when an intent to it is
launched, if there is an existing instance we will reuse that instead of
creating a new one. But to handle this properly we need to know when it
happens by implementing onNewIntent, which we weren't doing.

Implementing this fixes a bug we noticed that if you have multiple SIMs
and recently visit the details page for SIM 1 but then click on a SIM
selection notification that should bring you to the details for SIM 2,
we'd just bring up the details page for SIM 1 again.

Fixes: 133447239
Test: make RunSettingsRoboTests
Change-Id: Ia9106b15ffde437f6dd6fd2da23336ec5b28f75e
2019-07-15 17:11:19 -07:00
Joshua Mccloskey
d5cac4a3f6 Merge "Fixed Settings Crash" into qt-r1-dev
am: 800e8a485f

Change-Id: If6bba47ee6c16b035453c5f4a3fee38c0b1a0a1a
2019-07-15 13:10:52 -07:00
Joshua Mccloskey
800e8a485f Merge "Fixed Settings Crash" into qt-r1-dev 2019-07-15 19:40:23 +00:00
Android Build Merger (Role)
4919b857e6 Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours am: 09be23ffaa -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-15 08:28:50 +00:00
Bill Yi
7d98d178e9 [automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
am: 09be23ffaa -s ours
am skip reason: subject contains skip directive

Change-Id: I9d171a15cab4e4ce14376567126ccc0fd4d30d86
2019-07-15 01:28:32 -07:00
Bill Yi
5a71e96c3a [automerger skipped] Import translations. DO NOT MERGE am: 8d229d7090 -s ours
am: 7903044b2b -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdcebac440af1d2a114637d9ddbc32661ef4f46a
2019-07-15 01:28:12 -07:00
Bill Yi
09be23ffaa [automerger skipped] Import translations. DO NOT MERGE
am: 8d229d7090 -s ours
am skip reason: subject contains skip directive

Change-Id: I4989ac93f690299f130945cc4b2ae4984974345f
2019-07-15 01:21:17 -07:00
Bill Yi
7903044b2b [automerger skipped] Import translations. DO NOT MERGE
am: 8d229d7090 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied4eb2aed709ef90008edf7c49509522e96eb512
2019-07-15 01:21:16 -07:00
Bill Yi
8d229d7090 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I9ecaff62cfd0370a1ff7e5f6eb36a871c8486dee
2019-07-14 22:26:37 -07:00
Bill Yi
6b16484afd [automerger skipped] Import translations. DO NOT MERGE
am: 941e94d689 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib4ce2d83d5967669ab5ecf18eca8af89bc63b2b1
2019-07-14 21:40:54 -07:00
Bill Yi
941e94d689 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id33f437d9b802519be1544de7616b3a5b0528680
2019-07-13 22:19:58 -07:00
joshmccloskey
6a3012f21d Fixed Settings Crash
Fixes: 137319680
Test: Manual
Change-Id: I0e22bd561787b1a141bf2e3060b23fe70a6d96ce
2019-07-12 15:49:24 -07:00
Android Build Merger (Role)
7d92e3d2a2 Merge "Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857 am: 8c6b2bafb0" into qt-r1-dev-plus-aosp 2019-07-12 04:11:01 +00:00
Andrew Sapperstein
b07cee3139 Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
am: 44f731c1c7

Change-Id: I34bb2383b9f14e624ab93caa0108d2a2510f4439
2019-07-11 21:10:41 -07:00
Andrew Sapperstein
07b41c6055 Merge "Fix erasing of eSIMs for some devices" into qt-dev am: 1f942d9857
am: 8c6b2bafb0

Change-Id: I07c20368230159ea28af24c95087e74a3e830ab5
2019-07-11 21:10:39 -07:00
Andrew Sapperstein
8c6b2bafb0 Merge "Fix erasing of eSIMs for some devices" into qt-dev
am: 1f942d9857

Change-Id: I04bc60ed040546a64ea157840b76d815169d32a3
2019-07-11 20:51:33 -07:00
Andrew Sapperstein
44f731c1c7 Merge "Fix erasing of eSIMs for some devices" into qt-dev
am: 1f942d9857

Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf
2019-07-11 20:51:32 -07:00
Andrew Sapperstein
1f942d9857 Merge "Fix erasing of eSIMs for some devices" into qt-dev 2019-07-12 03:13:39 +00:00
joshmccloskey
00c05fc246 Ensure feature is supported and enabled.
am: a96a84e256

Change-Id: I5a1870ed55326fb9e8a5616ffa279bccc42b04ff
2019-07-11 14:56:10 -07:00
joshmccloskey
a96a84e256 Ensure feature is supported and enabled.
Fixes: 137285390
Test: Verified that SecuritySettings no longer crashes.
Test: Verified that this PrefenceController no longer shows up
if the device does not support it.
Test: Verified that this PreferenceController no longer
shows up when the work profile is disabled.

Change-Id: I10f015e18491b203db6f942f07034d55f620cfe5
2019-07-11 21:31:31 +00:00
joshmccloskey
5dbcfc9d27 Update FaceSlice to use correct pref & FaceManager
am: 365beaebdb

Change-Id: I3762f68d4f16ad529ad7a1cc56891812daad7016
2019-07-11 14:08:02 -07:00
Antony Sargent
5f612a4b44 Fix erasing of eSIMs for some devices
Doing a factory data reset used to always erase eSIMs. Then a few months
ago we added a default-on checkbox to let users opt out of erasing the
eSIM during this process, but only had it show for some devices (ones
which support the "fastboot oem esim_erase" command) by adding a system
property named masterclear.allow_retain_esim_profiles_after_fdr.

When recently updating the strings shown in the factory data reset
screen and the confirmation dialog, we changed the code so that if that
the checkbox is hidden we'll pass false for the ERASE_ESIMS_EXTRA
parameter sent to the factory data reset confirmation dialog. This had
the unintended side effect of making devices that don't specify true for
masterclear.allow_retain_esim_profiles_after_fdr skip erasing the eSIM.

This CL fixes that by removing the "is the checkbox hidden" check, going
back to the previous behavior of just using the checkbox value, which is
on by default even if hidden.

Fixes: 135284765
Test: make RunSettingsRoboTests
Change-Id: Ia9f335920e4e3c4a90f0a6a49d1722a0c19ea83d
2019-07-11 20:23:58 +00:00
joshmccloskey
365beaebdb Update FaceSlice to use correct pref & FaceManager
Fixes: 137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
2019-07-11 16:28:21 +00:00
Android Build Merger (Role)
f6311a88da Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours am: 3e9da03d0c -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp 2019-07-11 10:16:49 +00:00
Bill Yi
4df6694c6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 3e9da03d0c -s ours
am skip reason: subject contains skip directive

Change-Id: I59f8af945535b6aae8ab1a286816fdff2b0addbf
2019-07-11 03:16:28 -07:00
Bill Yi
025db3d33e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341 -s ours
am: 1da3bf10bf -s ours
am skip reason: subject contains skip directive

Change-Id: I1550a0d712b5b8853292e5f05ffda2b4d4a90bff
2019-07-11 03:16:27 -07:00
Bill Yi
3e9da03d0c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 433e625341 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5c4e1030a1f9907e3274be1a14c49d30783d839
2019-07-11 03:10:27 -07:00
Bill Yi
1da3bf10bf [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 433e625341 -s ours
am skip reason: subject contains skip directive

Change-Id: I22d56ba044543ee2389402ca28ae5ecf49b4a9cc
2019-07-11 03:10:27 -07:00
TreeHugger Robot
433e625341 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-07-11 09:54:20 +00:00
Android Build Merger (Role)
c2b7196945 Merge "Improve Settings launch performance am: 496d3f6f9c am: edd86364f5" into qt-r1-dev-plus-aosp 2019-07-11 08:12:38 +00:00
tmfang
6ed2484766 Improve Settings launch performance am: 496d3f6f9c
am: 49d575b91c

Change-Id: I544556c17a56dd1e36efded7ae565fa7d97fa8ba
2019-07-11 01:12:18 -07:00
tmfang
c5e2ca58f8 Improve Settings launch performance am: 496d3f6f9c
am: edd86364f5

Change-Id: I1a90c8c49d6f226997e59b9af4518b93b7194e93
2019-07-11 01:12:16 -07:00
tmfang
49d575b91c Improve Settings launch performance
am: 496d3f6f9c

Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd
2019-07-11 00:54:14 -07:00