OSDN Git Service
Android Build Merger (Role) [Mon, 22 Jul 2019 20:12:47 +0000 (20:12 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
7d966975ad -s ours am:
6e57d54d35 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Mon, 22 Jul 2019 20:12:26 +0000 (13:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
7d966975ad -s ours
am:
6e57d54d35 -s ours
am skip reason: subject contains skip directive
Change-Id: I7b25739458d86c2291f923e4c0521cfcaecd1744
Bill Yi [Mon, 22 Jul 2019 20:12:00 +0000 (13:12 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
7d966975ad -s ours
am:
57b150fedd -s ours
am skip reason: subject contains skip directive
Change-Id: Ibef3a3f53cd897709dd8053f54c1179481e8a91e
Bill Yi [Mon, 22 Jul 2019 19:53:25 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7d966975ad -s ours
am skip reason: subject contains skip directive
Change-Id: I494a50f37bc0ae4d4d7979756fc067f575057224
Bill Yi [Mon, 22 Jul 2019 19:51:28 +0000 (12:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
7d966975ad -s ours
am skip reason: subject contains skip directive
Change-Id: Ie9d71673049fc02897d6ce5c9c16b8e7cee8b0e6
Bill Yi [Mon, 22 Jul 2019 19:24:56 +0000 (12:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
04a6245af9 -s ours
am skip reason: subject contains skip directive
Change-Id: I59b9117b3767daeddfd91a10a490b46e4bb2b9d7
Bill Yi [Mon, 22 Jul 2019 17:59:39 +0000 (10:59 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac
Bill Yi [Mon, 22 Jul 2019 17:37:18 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If2b98e7c7fadad3c2fb18275ed458da76e9cc7ac
Bill Yi [Fri, 19 Jul 2019 21:04:20 +0000 (14:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
efc7ac061c -s ours
am skip reason: subject contains skip directive
Change-Id: Id1ff8188cc1638770dffc0d2f3eabbbd5660b73a
Bill Yi [Fri, 19 Jul 2019 17:23:51 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ce6d671fe6587af26ea31b711da0d4594433ee6
Antony Sargent [Fri, 19 Jul 2019 02:57:18 +0000 (19:57 -0700)]
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
am:
20ec6a4b6f
Change-Id: I72317d0d45103cbc4791e1f9d67e726d7426b758
TreeHugger Robot [Fri, 19 Jul 2019 02:26:19 +0000 (02:26 +0000)]
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
Android Build Merger (Role) [Thu, 18 Jul 2019 21:33:57 +0000 (21:33 +0000)]
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
Bill Yi [Thu, 18 Jul 2019 21:33:35 +0000 (14:33 -0700)]
[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
Bill Yi [Thu, 18 Jul 2019 21:33:33 +0000 (14:33 -0700)]
[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
Bill Yi [Thu, 18 Jul 2019 21:24:36 +0000 (14:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e73e59c562 -s ours
am skip reason: subject contains skip directive
Change-Id: I52627f2e7b30beb857a5e7c8ca955671ceefef28
Bill Yi [Thu, 18 Jul 2019 21:24:36 +0000 (14:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
56887f467c -s ours
am skip reason: subject contains skip directive
Change-Id: I0f83f2ea5a5f6fdd6659a9113b7561ea63ebf097
Bill Yi [Thu, 18 Jul 2019 21:24:35 +0000 (14:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e73e59c562 -s ours
am skip reason: subject contains skip directive
Change-Id: I888c9b99282dcccfe58db799c1c02ceed4b63747
Bill Yi [Thu, 18 Jul 2019 18:28:21 +0000 (11:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
Bill Yi [Thu, 18 Jul 2019 18:07:45 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id43eff8bedf9c1bd2d3d25a73a560705ab8da213
Kevin Chang [Thu, 18 Jul 2019 07:53:55 +0000 (00:53 -0700)]
Merge "Add footer preference into caption preferences" into qt-r1-dev
am:
5fc6db2cf7
Change-Id: I02eb493be2b958b766f06d85dde7aabcc1230a68
Kevin Chang [Thu, 18 Jul 2019 07:53:02 +0000 (00:53 -0700)]
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
am:
6bfc381173
Change-Id: Ic0b481b5306a91c58f1aeea4cb125874d6b77d2e
Kevin Chang [Thu, 18 Jul 2019 07:52:00 +0000 (00:52 -0700)]
Merge "UI change in caption preferences in Settings" into qt-r1-dev
am:
af447c17b8
Change-Id: I5b669681267875963d9b91471bdb63a57b1c84b0
Kevin Chang [Thu, 18 Jul 2019 06:59:47 +0000 (06:59 +0000)]
Merge "Add footer preference into caption preferences" into qt-r1-dev
Kevin Chang [Thu, 18 Jul 2019 06:59:45 +0000 (06:59 +0000)]
Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
Kevin Chang [Thu, 18 Jul 2019 06:59:41 +0000 (06:59 +0000)]
Merge "UI change in caption preferences in Settings" into qt-r1-dev
Kevin Chang [Mon, 1 Jul 2019 06:51:36 +0000 (14:51 +0800)]
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
8f4b8b9a744ff139bcc4ff1763c9fb5c8337280a)
Kevin Chang [Tue, 18 Jun 2019 07:18:23 +0000 (15:18 +0800)]
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
Kevin Chang [Thu, 23 May 2019 06:30:23 +0000 (14:30 +0800)]
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
fd1f1c0f82f046a1f250e96ce221aa29b4984c5a)
Antony Sargent [Tue, 16 Jul 2019 00:11:19 +0000 (17:11 -0700)]
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
Joshua Mccloskey [Mon, 15 Jul 2019 20:10:52 +0000 (13:10 -0700)]
Merge "Fixed Settings Crash" into qt-r1-dev
am:
800e8a485f
Change-Id: If6bba47ee6c16b035453c5f4a3fee38c0b1a0a1a
Joshua Mccloskey [Mon, 15 Jul 2019 19:40:23 +0000 (19:40 +0000)]
Merge "Fixed Settings Crash" into qt-r1-dev
Android Build Merger (Role) [Mon, 15 Jul 2019 08:28:50 +0000 (08:28 +0000)]
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
Bill Yi [Mon, 15 Jul 2019 08:28:32 +0000 (01:28 -0700)]
[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
Bill Yi [Mon, 15 Jul 2019 08:28:12 +0000 (01:28 -0700)]
[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
Bill Yi [Mon, 15 Jul 2019 08:21:17 +0000 (01:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8d229d7090 -s ours
am skip reason: subject contains skip directive
Change-Id: I4989ac93f690299f130945cc4b2ae4984974345f
Bill Yi [Mon, 15 Jul 2019 08:21:16 +0000 (01:21 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8d229d7090 -s ours
am skip reason: subject contains skip directive
Change-Id: Ied4eb2aed709ef90008edf7c49509522e96eb512
Bill Yi [Mon, 15 Jul 2019 05:26:37 +0000 (22:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9ecaff62cfd0370a1ff7e5f6eb36a871c8486dee
Bill Yi [Mon, 15 Jul 2019 04:40:54 +0000 (21:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
941e94d689 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib4ce2d83d5967669ab5ecf18eca8af89bc63b2b1
Bill Yi [Sun, 14 Jul 2019 05:19:58 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id33f437d9b802519be1544de7616b3a5b0528680
joshmccloskey [Fri, 12 Jul 2019 20:17:37 +0000 (13:17 -0700)]
Fixed Settings Crash
Fixes:
137319680
Test: Manual
Change-Id: I0e22bd561787b1a141bf2e3060b23fe70a6d96ce
Android Build Merger (Role) [Fri, 12 Jul 2019 04:11:01 +0000 (04:11 +0000)]
Merge "Merge "Fix erasing of eSIMs for some devices" into qt-dev am:
1f942d9857 am:
8c6b2bafb0" into qt-r1-dev-plus-aosp
Andrew Sapperstein [Fri, 12 Jul 2019 04:10:41 +0000 (21:10 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev am:
1f942d9857
am:
44f731c1c7
Change-Id: I34bb2383b9f14e624ab93caa0108d2a2510f4439
Andrew Sapperstein [Fri, 12 Jul 2019 04:10:39 +0000 (21:10 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev am:
1f942d9857
am:
8c6b2bafb0
Change-Id: I07c20368230159ea28af24c95087e74a3e830ab5
Andrew Sapperstein [Fri, 12 Jul 2019 03:51:33 +0000 (20:51 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
am:
1f942d9857
Change-Id: I04bc60ed040546a64ea157840b76d815169d32a3
Andrew Sapperstein [Fri, 12 Jul 2019 03:51:32 +0000 (20:51 -0700)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
am:
1f942d9857
Change-Id: I44e11b7a63c329883b01dc03f820e807c15953cf
Andrew Sapperstein [Fri, 12 Jul 2019 03:13:39 +0000 (03:13 +0000)]
Merge "Fix erasing of eSIMs for some devices" into qt-dev
joshmccloskey [Thu, 11 Jul 2019 21:56:10 +0000 (14:56 -0700)]
Ensure feature is supported and enabled.
am:
a96a84e256
Change-Id: I5a1870ed55326fb9e8a5616ffa279bccc42b04ff
joshmccloskey [Thu, 11 Jul 2019 20:08:02 +0000 (13:08 -0700)]
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
joshmccloskey [Thu, 11 Jul 2019 21:08:02 +0000 (14:08 -0700)]
Update FaceSlice to use correct pref & FaceManager
am:
365beaebdb
Change-Id: I3762f68d4f16ad529ad7a1cc56891812daad7016
Antony Sargent [Thu, 11 Jul 2019 18:04:09 +0000 (11:04 -0700)]
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
joshmccloskey [Tue, 9 Jul 2019 22:34:55 +0000 (15:34 -0700)]
Update FaceSlice to use correct pref & FaceManager
Fixes:
137137134
Test: Manual.
Change-Id: Idc707a7d2009975f81902867e4c37a8ee5775700
Android Build Merger (Role) [Thu, 11 Jul 2019 10:16:49 +0000 (10:16 +0000)]
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
Bill Yi [Thu, 11 Jul 2019 10:16:28 +0000 (03:16 -0700)]
[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
Bill Yi [Thu, 11 Jul 2019 10:16:27 +0000 (03:16 -0700)]
[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
Bill Yi [Thu, 11 Jul 2019 10:10:27 +0000 (03:10 -0700)]
[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
Bill Yi [Thu, 11 Jul 2019 10:10:27 +0000 (03:10 -0700)]
[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
TreeHugger Robot [Thu, 11 Jul 2019 09:54:20 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Android Build Merger (Role) [Thu, 11 Jul 2019 08:12:38 +0000 (08:12 +0000)]
Merge "Improve Settings launch performance am:
496d3f6f9c am:
edd86364f5" into qt-r1-dev-plus-aosp
tmfang [Thu, 11 Jul 2019 08:12:18 +0000 (01:12 -0700)]
Improve Settings launch performance am:
496d3f6f9c
am:
49d575b91c
Change-Id: I544556c17a56dd1e36efded7ae565fa7d97fa8ba
tmfang [Thu, 11 Jul 2019 08:12:16 +0000 (01:12 -0700)]
Improve Settings launch performance am:
496d3f6f9c
am:
edd86364f5
Change-Id: I1a90c8c49d6f226997e59b9af4518b93b7194e93
tmfang [Thu, 11 Jul 2019 07:54:14 +0000 (00:54 -0700)]
Improve Settings launch performance
am:
496d3f6f9c
Change-Id: I16eb11d8850cbd75dd3571d16fce5758e5280bfd
tmfang [Thu, 11 Jul 2019 07:54:14 +0000 (00:54 -0700)]
Improve Settings launch performance
am:
496d3f6f9c
Change-Id: I5256fa0c04af07108b76cf21e9558b03d499e883
Bill Yi [Thu, 11 Jul 2019 07:04:07 +0000 (00:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
fa674d85ae -s ours
am skip reason: subject contains skip directive
Change-Id: I60b58f9eb359488be6f3881f8e927131da2caf0e
tmfang [Wed, 3 Jul 2019 12:44:42 +0000 (20:44 +0800)]
Improve Settings launch performance
From traces analysis, we found getFreeBytes
was taking a long time to return.
getFreeBytes was used when storage controller
tried to get storage information.
In order to prevent this case, we put the action
which takes too much time in background thread.
Test: I can't reproduce it locally. From code view,
this is a reasonable root cause.
Fixes:
136268875
Change-Id: I78e42cde88553c003f198cffb5747b352055f59a
(cherry picked from commit
0c37f019f61f37b67e2297e99d96e8396d962f40)
Bill Yi [Thu, 11 Jul 2019 03:08:17 +0000 (20:08 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I67ba6e489c14dc511d485a4895c9e12fce1c3ee1
Bill Yi [Thu, 11 Jul 2019 02:31:11 +0000 (19:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I09ed37fffcf0bbcf61cdfa0b1f8cf22f5828d23b
Xin Li [Thu, 11 Jul 2019 02:14:53 +0000 (19:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am:
0c7e805902 -s ours am:
ba73db3e92 -s ours
am:
3bf8c80dd5
Change-Id: Icedb419472e0e1edcb4079f184d96df977fbd955
Xin Li [Thu, 11 Jul 2019 02:02:51 +0000 (19:02 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master" am:
0c7e805902 -s ours
am:
ba73db3e92 -s ours
am skip reason: subject contains skip directive
Change-Id: I8c1e220708b6ac50415a0c4f7b68784ab6fdf167
Xin Li [Thu, 11 Jul 2019 01:44:45 +0000 (18:44 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
am:
0c7e805902 -s ours
am skip reason: subject contains skip directive
Change-Id: I724db7670844b89aaae1e9bc856c16c95209b14e
Treehugger Robot [Thu, 11 Jul 2019 00:56:33 +0000 (00:56 +0000)]
Merge "DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master"
Joshua Mccloskey [Wed, 10 Jul 2019 02:46:38 +0000 (19:46 -0700)]
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
am:
0839185647
Change-Id: I5cc4c3393403bf8c299b415be81bc9b80fb93ca9
Joshua Mccloskey [Wed, 10 Jul 2019 02:29:45 +0000 (02:29 +0000)]
Merge changes I5e0a72a1,Iefcbf498 into qt-r1-dev
* changes:
Favor setup face in search settings.
Remove highlighting for work profile
Bill Yi [Wed, 10 Jul 2019 00:41:57 +0000 (17:41 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
13d6e13166 -s ours
am:
49175304a4 -s ours
am skip reason: subject contains skip directive
Change-Id: I6038bd4afde5db15b1406099507515f1b7cd3e01
Bill Yi [Wed, 10 Jul 2019 00:40:49 +0000 (17:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
13d6e13166 -s ours
am:
6edf1646c1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia4d811d19fe140b31ad1b09eb57602a4ae0dba4c
Bill Yi [Wed, 10 Jul 2019 00:17:49 +0000 (17:17 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
13d6e13166 -s ours
am skip reason: subject contains skip directive
Change-Id: I3d8655c2b647674d28d223f5deb9b6d21b42d106
Bill Yi [Wed, 10 Jul 2019 00:16:02 +0000 (17:16 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
13d6e13166 -s ours
am skip reason: subject contains skip directive
Change-Id: I9cadf1b43bc055fffa72a6bb96f929c5e5ed28dc
Bill Yi [Tue, 9 Jul 2019 23:58:40 +0000 (16:58 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
41a7f9de31 -s ours
am skip reason: subject contains skip directive
Change-Id: I041df99d86d0b293d9dadcd987a22596a34d6863
TreeHugger Robot [Tue, 9 Jul 2019 23:10:22 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
joshmccloskey [Tue, 9 Jul 2019 22:51:45 +0000 (15:51 -0700)]
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
am:
007a1aee1b
Change-Id: Ic5d286f40b36c2b745b9d1168e60234015184b6a
joshmccloskey [Tue, 9 Jul 2019 22:28:05 +0000 (15:28 -0700)]
Favor setup face in search settings.
Test: Manual.
Fixes:
137135217
Change-Id: I5e0a72a117e2af6d9262d07616cc539ee7a7e55e
Xin Li [Tue, 9 Jul 2019 22:31:44 +0000 (15:31 -0700)]
DO NOT MERGE - Skip pie-platform-release (PPRL.190705.004) in master
Bug:
136196576
Change-Id: I660faf68e8a703ac26d79313ead245949f587e59
TreeHugger Robot [Tue, 9 Jul 2019 22:24:00 +0000 (22:24 +0000)]
Merge "Diversity extra no longer gets overwritten." into qt-r1-dev
joshmccloskey [Tue, 9 Jul 2019 22:23:37 +0000 (15:23 -0700)]
Remove highlighting for work profile
Test: Manual.
Fixes:
137126517
Change-Id: Iefcbf498cc0805cd130981e522177a7c16b7adfc
Bill Yi [Tue, 9 Jul 2019 19:31:21 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I84335ed2cdca77f9f506c084b11c5bb3215dd05f
joshmccloskey [Tue, 9 Jul 2019 18:52:01 +0000 (11:52 -0700)]
Diversity extra no longer gets overwritten.
Test: Manual.
Fixes:
136963876
Change-Id: Ia62e7ac1ff942fa078a2fd5f1d7efc339132aaa3
Bill Yi [Tue, 9 Jul 2019 18:46:23 +0000 (11:46 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1c15e397059f357be547ce32fcdbae885bff5925
Curtis Belmonte [Tue, 9 Jul 2019 00:10:55 +0000 (17:10 -0700)]
Fix work account setup lock screen content for face auth
am:
5604585930
Change-Id: Id6044f31b68d7b36a40b165be639bc58cc0e8b33
android-build-team Robot [Mon, 8 Jul 2019 23:29:58 +0000 (23:29 +0000)]
Snap for
5622519 from
fd365ae91ebe924197c5f443c889928eb07bd02c to pi-platform-release
Change-Id: I4b218750d55b6dbb691814f72ed880fc5d1677fb
Curtis Belmonte [Mon, 8 Jul 2019 18:23:28 +0000 (11:23 -0700)]
Fix work account setup lock screen content for face auth
For devices which provide biometric authentication options, such as
fingerprint or face, we should be showing different content on the lock
setup screen during the corp account setup wizard. Namely, the title
should read "Choose screen lock", and the "Not now" option should be
changed to "Continue without [auth method]". However, we currently only
check for whether fingerprint authentication is available, leading to
incorrect text for devices with face authentication.
This CL fixes the issue by changing the introducing a private method to
check for any biometric authentication (currently just mForFingerprint ||
mForFace). It then uses this method in place of the existing
mForFingerprint checks in SetupChooseLockGeneric.
Test: On a device with fingerprint auth and one with face auth:
1. Set a work profile with TestDPC and add some password quality requirement
2. adb shell settings put global device_provisioned
3. adb shell am start -a android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD
4. Verify that the correct content is now shown (screenshot/xZPVtpa3j3Z)
5. Verify that setting lock with and without biometric auth still works
Fixes:
136556653
Change-Id: I46d3c964f05986aa97cc8ed77fe0ac125337ddd0
Android Build Merger (Role) [Sat, 6 Jul 2019 02:14:07 +0000 (02:14 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
292e7ad110 -s ours am:
ce4d5fbff9 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Sat, 6 Jul 2019 02:13:54 +0000 (19:13 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
292e7ad110 -s ours
am:
ce4d5fbff9 -s ours
am skip reason: subject contains skip directive
Change-Id: I45dae3a5c23a32b625a44025d4e47597e49d6789
Bill Yi [Sat, 6 Jul 2019 02:13:53 +0000 (19:13 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
292e7ad110 -s ours
am:
2759932e72 -s ours
am skip reason: subject contains skip directive
Change-Id: I716345ea2e5b8e8d899d320ff2b8317b8bccf971
Bill Yi [Sat, 6 Jul 2019 02:04:54 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
292e7ad110 -s ours
am skip reason: subject contains skip directive
Change-Id: I10718d202f97e6fb1d6c7855c50ae5e15d4e5278
Bill Yi [Sat, 6 Jul 2019 02:04:54 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
292e7ad110 -s ours
am skip reason: subject contains skip directive
Change-Id: I1957817bdae8c4294cc6cc144a4dafea472004a6
Bill Yi [Sat, 6 Jul 2019 02:04:54 +0000 (19:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
bad6060727 -s ours
am skip reason: subject contains skip directive
Change-Id: I6a587003900358aeddf32eac184668f483a381b1
Bill Yi [Fri, 5 Jul 2019 23:53:24 +0000 (16:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9933f3eb0721fab73ff7776324de6ce088469a67
Bill Yi [Fri, 5 Jul 2019 21:38:28 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9307e8b79d695e33e0b76b36de1fefc21a0b835e
Bill Yi [Thu, 4 Jul 2019 00:36:47 +0000 (17:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
a0fb9000bb -s ours
am:
b038d65f4c -s ours
am skip reason: subject contains skip directive
Change-Id: Id68bae980aaf0d4d3d041efd2b6cba17f1a1d09c
Mark Chien [Thu, 4 Jul 2019 00:19:49 +0000 (17:19 -0700)]
Merge "Fix entitlement failed when device is on CBRS" into qt-r1-dev
am:
8a44e4f274
Change-Id: Ifabc853b754fd6323e01246613656fe72961c253
OSDN Git Service
