OSDN Git Service
Android Build Merger (Role) [Wed, 5 Jun 2019 09:40:35 +0000 (09:40 +0000)]
Merge changes from topic "am-
7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours am:
e7c298885b -s ours am:
ca593c204a -s ours am:
7d3edc88a9 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours am:
f7cd796ea8 -s ours am:
152f4c8345 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours am:
ab2ad075b3 -s ours am:
05b744c5eb -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Raff Tsai [Wed, 5 Jun 2019 09:40:04 +0000 (02:40 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours am:
e7c298885b -s ours am:
ca593c204a -s ours
am:
7d3edc88a9 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I6234197399f5ce1dec7f8636eaafb7488440b197
Raff Tsai [Wed, 5 Jun 2019 09:39:59 +0000 (02:39 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours am:
e7c298885b -s ours am:
ca593c204a -s ours
am:
a9125587a4 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ia9ac845dcc6673d0a366a5088ad9bb3a10695717
Raff Tsai [Wed, 5 Jun 2019 09:39:52 +0000 (02:39 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours am:
f7cd796ea8 -s ours
am:
152f4c8345 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Icf7175a078557c6b88e16310816a28e8ade8afa5
Raff Tsai [Wed, 5 Jun 2019 09:39:49 +0000 (02:39 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours am:
f7cd796ea8 -s ours
am:
7a7a4f3019 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I5b843ca857a4e6856b56edd34ad0b1c46290e6e9
Raff Tsai [Wed, 5 Jun 2019 09:39:40 +0000 (02:39 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours am:
ab2ad075b3 -s ours
am:
05b744c5eb -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I25038a31fadc86c57c34ec809c2716f4caca1bbb
Raff Tsai [Wed, 5 Jun 2019 09:39:39 +0000 (02:39 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours am:
ab2ad075b3 -s ours
am:
a33cd2c168 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Icec8d5826b0132d058bcbc114e2bda13cb9a98c7
Raff Tsai [Wed, 5 Jun 2019 09:35:04 +0000 (02:35 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours am:
e7c298885b -s ours
am:
ca593c204a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I1030cc07ec491766f65c59fc45d8ceb8bc08a011
Raff Tsai [Wed, 5 Jun 2019 09:35:02 +0000 (02:35 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours am:
e7c298885b -s ours
am:
ca593c204a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I4ef72ed7f78528edf72d003de251542d22515025
Raff Tsai [Wed, 5 Jun 2019 09:34:55 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours
am:
f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I3703a33f61f1d3ee56d6223f680548e06d8ba997
Raff Tsai [Wed, 5 Jun 2019 09:34:53 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours am:
2d387349db -s ours
am:
f7cd796ea8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I3cf51b30f82e33d55b49863d58fa27544a8ff0eb
Raff Tsai [Wed, 5 Jun 2019 09:34:38 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours
am:
ab2ad075b3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Iad7b242d3b85102d68ace5426ff9dd25cad04454
Raff Tsai [Wed, 5 Jun 2019 09:34:37 +0000 (02:34 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours am:
971190b08a -s ours
am:
ab2ad075b3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I04a28cd6ae30944bbf1c9208843fd5d8abf86beb
Raff Tsai [Wed, 5 Jun 2019 09:29:05 +0000 (02:29 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours am:
0b36c5e9ba -s ours
am:
e7c298885b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I4a6b3d7b7aaf30bf3abddf9b276e666462a9d831
Raff Tsai [Wed, 5 Jun 2019 09:28:55 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours am:
20b5a01f6c -s ours
am:
2d387349db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I27f9a530b3814c723726e43e8902651da3bfa937
Raff Tsai [Wed, 5 Jun 2019 09:28:42 +0000 (02:28 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours am:
d20d75c39b -s ours
am:
971190b08a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ic3814c5b17fe748c35e11034d75549104e7de429
Raff Tsai [Wed, 5 Jun 2019 09:22:55 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours am:
c808f15cbe -s ours
am:
0b36c5e9ba -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Id32040250480a5ad2e957eaeb4eea5b4dcc6633b
Raff Tsai [Wed, 5 Jun 2019 09:22:46 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours am:
530fa8b25b -s ours
am:
20b5a01f6c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I656e7e0fac7c63c55f82bfc01183e69adfe2164b
Raff Tsai [Wed, 5 Jun 2019 09:22:36 +0000 (02:22 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours am:
59348982d3 -s ours
am:
d20d75c39b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: If4596f7e943656ccb7bc06121fe77c5d6d76d627
Raff Tsai [Wed, 5 Jun 2019 09:17:52 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693 am:
65294e6ee5 -s ours
am:
c808f15cbe -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847
Raff Tsai [Wed, 5 Jun 2019 09:17:44 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09 am:
bfe5b37bc8 -s ours
am:
530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23
Raff Tsai [Wed, 5 Jun 2019 09:17:35 +0000 (02:17 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0 am:
6dbb3108a7 -s ours
am:
59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d
Raff Tsai [Wed, 5 Jun 2019 09:12:01 +0000 (02:12 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693
am:
65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd
Raff Tsai [Wed, 5 Jun 2019 09:11:52 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09
am:
bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae
Raff Tsai [Wed, 5 Jun 2019 09:11:36 +0000 (02:11 -0700)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0
am:
6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1
c968eacbbf is in history
Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:10 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96 skipped:
0b52ca4693
Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:07 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e skipped:
ed126b5d96
Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3
Android Build Merger (Role) [Wed, 5 Jun 2019 02:50:04 +0000 (02:50 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
50ec2c218e
Change-Id: I5ed98836a8659baedf50724ce1f65c76bcace5ef
Android Build Merger (Role) [Wed, 5 Jun 2019 02:48:34 +0000 (02:48 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
04208f16b0
Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:14 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631 skipped:
ceb1ed0a09
Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:12 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d skipped:
188904e631
Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:11 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8 skipped:
8f70c24f2d
Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:09 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e skipped:
e537ffece8
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
Android Build Merger (Role) [Wed, 5 Jun 2019 02:37:07 +0000 (02:37 +0000)]
[automerger skipped] Do not allow draw on top for App notification settings skipped:
5d9328571e
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
Bill Yi [Wed, 5 Jun 2019 02:12:23 +0000 (19:12 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
3d9c7cb356 -s ours
am:
e655774644 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia9f9883e4e516cb87dd8544098333660e948ed46
Alexey Kuzmin [Wed, 5 Jun 2019 02:07:44 +0000 (19:07 -0700)]
Move vibration preview invokation to the correct place am:
f8eb8c3c90
am:
ef530610fa
Change-Id: I1c4c21b5b1e5246f3625399bb2b911672224f550
Bill Yi [Wed, 5 Jun 2019 01:53:13 +0000 (18:53 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
3d9c7cb356 -s ours
am:
7ff72e6d75 -s ours
am skip reason: subject contains skip directive
Change-Id: Id1aa4180b46dc3b3028582945a98aa3fbb8f0dfd
Alexey Kuzmin [Wed, 5 Jun 2019 01:51:10 +0000 (18:51 -0700)]
Move vibration preview invokation to the correct place am:
f8eb8c3c90
am:
df51217157
Change-Id: I35c08d49566a58b6add49f807b48a4c6a2afb918
Kevin Chyn [Wed, 5 Jun 2019 01:48:33 +0000 (18:48 -0700)]
Merge changes from topic "face-settings-challenge" into qt-r1-dev
am:
b979a38c8d
Change-Id: I3fd5ba0467eec804d75a5ceb08c56700d7e07b64
Bill Yi [Wed, 5 Jun 2019 01:25:55 +0000 (18:25 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
3d9c7cb356 -s ours
am skip reason: subject contains skip directive
Change-Id: I87aca396c35ec9f0db74cb9079997a3995efbab5
Alexey Kuzmin [Wed, 5 Jun 2019 01:16:10 +0000 (18:16 -0700)]
Move vibration preview invokation to the correct place
am:
f8eb8c3c90
Change-Id: Idb50c3733fd1e127149bc3d48c1ac281638b6cd9
Bill Yi [Wed, 5 Jun 2019 01:09:12 +0000 (18:09 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
3d9c7cb356 -s ours
am skip reason: subject contains skip directive
Change-Id: Id4ebeff5c481ede8d583bd59e4eabd1d3a7dcbe1
Alexey Kuzmin [Wed, 5 Jun 2019 01:00:48 +0000 (18:00 -0700)]
Move vibration preview invokation to the correct place
am:
f8eb8c3c90
Change-Id: I252301516d7be6b5026e4fba5b5e9144889f6b1f
TreeHugger Robot [Wed, 5 Jun 2019 00:23:38 +0000 (00:23 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Kevin Chyn [Tue, 4 Jun 2019 23:52:13 +0000 (23:52 +0000)]
Merge changes from topic "face-settings-challenge" into qt-r1-dev
* changes:
Resolve challenge lifecycle race conditions
Revert "Add generateChallenge() in onResume()"
Kevin Chyn [Tue, 4 Jun 2019 20:29:40 +0000 (13:29 -0700)]
Resolve challenge lifecycle race conditions
1) FaceSettings now gets closed when it loses foreground. This prevents
A) Keyguard/LockSettingsService's resetLockout's revokeChallenge from
leaving FaceSettings with a stale HAT which prevents users from
enrolling or toggling elements that require the HAT.
B) generateChallenge has a timeout, which may already have been met
C) User may have forgotten FaceSettings was open and lost context. Thus
it makes no sense to show ConfirmLock* since the user may have no idea
why it's showing anymore.
2) FaceSettings now generatesChallenge in onResume. onCreate is too early
since again, FaceSettings can be launched via intent while on Keyguard.
Similarly, we must ensure that Settings's challenge is generated
late enough (e.g. when it actually gains foregroundness)
Fixes:
133440610
Fixes:
133498264
Test: Open face settings, confirm password, lock screen. After unlocking,
user needs to re-open face settings.
Test: Modify HAL/framework to show re-enroll notification
Tap re-enroll notificaton on keyguard
Delete and re-enroll in settings, successful
Test: FaceSettings enroll works accross orientation change
Test: Tapping enroll button doesn't cause challenge to be revoked
due to onStop()
Change-Id: I60f606314c458a61e9c1b4f4b66bc27bc44287da
Kevin Chyn [Tue, 4 Jun 2019 19:41:52 +0000 (19:41 +0000)]
Revert "Add generateChallenge() in onResume()"
This reverts commit
d59150eca6d7c0d0ea8a3fcba2a1add4beb36f05.
Bug:
133498264
Bug:
133440610
Reason for revert: Fixing in a different way
Change-Id: Ie444278a9e8b8aac259c31d311757ab8a39567f4
Alexey Kuzmin [Tue, 4 Jun 2019 14:59:32 +0000 (15:59 +0100)]
Move vibration preview invokation to the correct place
Bug:
133711461
Bug:
130332550
Test: Open Settings > Accessibility > Vibration. Switch between the
vibration settings several times. The preview should be played, and it
should be in line with the selected setting
Change-Id: I65fcd679c4c61afa4cce9cee652987d81572096c
Bill Yi [Tue, 4 Jun 2019 15:36:03 +0000 (08:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I11c95502fa223dc53994a1dde87cc2400106b815
Android Build Merger (Role) [Tue, 4 Jun 2019 14:44:48 +0000 (14:44 +0000)]
Merge "Merge "Cleanup background activity starts for release." into qt-dev am:
c53f5ecb3d am:
5b09f510e2" into qt-r1-dev-plus-aosp
Alan Stokes [Tue, 4 Jun 2019 14:43:00 +0000 (07:43 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev am:
c53f5ecb3d
am:
dd1545b098
Change-Id: Iffc9d8bfa0469af6895496c4be8a4c45535c71f5
Alan Stokes [Tue, 4 Jun 2019 14:42:53 +0000 (07:42 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev am:
c53f5ecb3d
am:
5b09f510e2
Change-Id: Ie9d15780a3e92c539b78960dc92b8be68ef8813d
Alan Stokes [Tue, 4 Jun 2019 14:38:04 +0000 (07:38 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev
am:
c53f5ecb3d
Change-Id: Icdfe52632085ea7add4ffa594fddb2d79b412e3b
Alan Stokes [Tue, 4 Jun 2019 14:38:00 +0000 (07:38 -0700)]
Merge "Cleanup background activity starts for release." into qt-dev
am:
c53f5ecb3d
Change-Id: I4a8c3e569bfc717802e45abfea0ad6b811c33c96
Alan Stokes [Tue, 4 Jun 2019 14:26:29 +0000 (14:26 +0000)]
Merge "Cleanup background activity starts for release." into qt-dev
Kevin Chang [Tue, 4 Jun 2019 01:51:57 +0000 (18:51 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am:
68aa4e4919
am:
267321cd81
Change-Id: Ibdf664068eb0f05b2c04b2399890904785e6e309
Antony Sargent [Tue, 4 Jun 2019 01:49:44 +0000 (18:49 -0700)]
Add a "data during calls" preference am:
aeb1da0db9
am:
bffd3757e0
Change-Id: Ib3e766fe79f8db50ddcf56aac60935d128b3f52a
Kevin Chang [Tue, 4 Jun 2019 01:48:20 +0000 (18:48 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am:
68aa4e4919
am:
d2fa1e6baa
Change-Id: Id64aadc20751d107c93b32a420d679aa2cc9a72b
Antony Sargent [Tue, 4 Jun 2019 01:47:56 +0000 (18:47 -0700)]
Add a "data during calls" preference am:
aeb1da0db9
am:
7f7f7cda18
Change-Id: Iaafabc24ace39911ab3198cd705311595832cb5d
Kevin Chang [Tue, 4 Jun 2019 01:42:10 +0000 (18:42 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am:
68aa4e4919
Change-Id: I7db65e3ef0ed83e91a666a479cdbe8020aee763c
Kevin Chang [Tue, 4 Jun 2019 01:41:08 +0000 (18:41 -0700)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
am:
68aa4e4919
Change-Id: I183707f6b18a8755eefb2cbcceaa7627b0228a9c
Antony Sargent [Tue, 4 Jun 2019 01:39:54 +0000 (18:39 -0700)]
Add a "data during calls" preference
am:
aeb1da0db9
Change-Id: I1b66985de2cc045953a52d647a3568e7a8d03f10
Antony Sargent [Tue, 4 Jun 2019 01:39:19 +0000 (18:39 -0700)]
Add a "data during calls" preference
am:
aeb1da0db9
Change-Id: Ib33d13995f1c1c51bc0b17f109854a5e484f5741
Kevin Chang [Tue, 4 Jun 2019 01:29:21 +0000 (01:29 +0000)]
Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev
Lucas Dupin [Mon, 3 Jun 2019 23:04:59 +0000 (16:04 -0700)]
Merge "Longer character limit" into qt-r1-dev
am:
a448cb9d07
Change-Id: I18b0e68a7a0a7842e07f3c4cf067906ec1dc4763
TreeHugger Robot [Mon, 3 Jun 2019 22:45:08 +0000 (22:45 +0000)]
Merge "Longer character limit" into qt-r1-dev
Antony Sargent [Mon, 13 May 2019 23:44:13 +0000 (16:44 -0700)]
Add a "data during calls" preference
This adds a switch which appears on the SIM details page for any SIMs
that aren't the default on for data. It lets the user opt-in to turning
on data on this SIM only in the case where there is an active call -
this is needed because in some cases the default data SIM may not be
able to be used when a call is active on another SIM.
Bug:
132114205
Test: make RunSettingsRoboTests
Change-Id: Ie44c56e0f486fd93aff411a0ba0e47d3695a4941
Lucas Dupin [Mon, 3 Jun 2019 16:34:25 +0000 (09:34 -0700)]
Longer character limit
Fixes:
134370077
Fixes:
134162233
Test: make
Change-Id: I3f697a093752faca37c4dc165857c97a6b1e410c
Lei Yu [Mon, 3 Jun 2019 17:25:29 +0000 (10:25 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev am:
c9fbd2ee50
am:
7f8a269a3a
Change-Id: I9aa9be5d62060870b967e81a3e1148375d2a7d35
Lei Yu [Mon, 3 Jun 2019 17:08:14 +0000 (10:08 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev am:
c9fbd2ee50
am:
057dc8466a
Change-Id: If66ff93e4f4caddd9ebe62f9409812d4ed480c9b
Lei Yu [Mon, 3 Jun 2019 17:06:14 +0000 (10:06 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev
am:
c9fbd2ee50
Change-Id: I237921af2781264fdbec688ddc06ca7c66961856
Lei Yu [Mon, 3 Jun 2019 17:03:30 +0000 (10:03 -0700)]
Merge "Use new API to build NetworkTemplate" into qt-dev
am:
c9fbd2ee50
Change-Id: I7737bc0fd3321f13edf2e9440ee870d059817dc3
Lei Yu [Mon, 3 Jun 2019 16:54:29 +0000 (16:54 +0000)]
Merge "Use new API to build NetworkTemplate" into qt-dev
Kevin Chang [Wed, 29 May 2019 10:21:28 +0000 (18:21 +0800)]
Update the string of both magnification settings and gesture navigation tutorial dialog
Referenced link for the details:
https://docs.google.com/document/d/1eB2wukextG5UFECTwde5zcmXXTQCvgnqJJjnd1Chu9Q
https://docs.google.com/document/d/14iwCag7FBD4e9bR03HjbC0D2s_u-Fpr3K8vl_XMjkD0
Bug:
133336814
Bug:
133650388
Test: Visual
Change-Id: I4893183b55f609bfee3d1dfe80aa02cce624e857
Bill Yi [Sun, 2 Jun 2019 07:36:26 +0000 (00:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
b53bebe6ec -s ours
am skip reason: subject contains skip directive
Change-Id: Ia34ac14e80f63c468a78e116bfcfe07c296c5411
TreeHugger Robot [Sun, 2 Jun 2019 07:27:07 +0000 (07:27 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Android Build Merger (Role) [Sat, 1 Jun 2019 18:41:21 +0000 (18:41 +0000)]
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
2407b65709 -s ours am:
5540373d4f -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Bill Yi [Sat, 1 Jun 2019 18:41:04 +0000 (11:41 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
2407b65709 -s ours
am:
5540373d4f -s ours
am skip reason: subject contains skip directive
Change-Id: If1b222dbfc8f93199a1fe15e42e5ac6673224ab2
Bill Yi [Sat, 1 Jun 2019 18:41:03 +0000 (11:41 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am:
2407b65709 -s ours
am:
59faf30c59 -s ours
am skip reason: subject contains skip directive
Change-Id: I62f652fbe6ee76b768d8bacdcd1b51b5213ab53e
Bill Yi [Sat, 1 Jun 2019 18:36:05 +0000 (11:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
2407b65709 -s ours
am skip reason: subject contains skip directive
Change-Id: Idd7efb56a6182a5374a0ce6cf5ea5114d98532ac
Bill Yi [Sat, 1 Jun 2019 18:36:05 +0000 (11:36 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am:
2407b65709 -s ours
am skip reason: subject contains skip directive
Change-Id: I9ea5834b80b4ad5a6cf17c58186010acc11e85b4
TreeHugger Robot [Sat, 1 Jun 2019 18:17:35 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sat, 1 Jun 2019 17:26:48 +0000 (10:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I9675532a8f4b1f551c8130e9243262a52cd8a3d2
Bill Yi [Sat, 1 Jun 2019 17:06:36 +0000 (10:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
Joel Galenson [Fri, 31 May 2019 22:04:56 +0000 (15:04 -0700)]
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
am:
4a9055a99c
Change-Id: I90215bb8b92b6a5288647891bf5042e5a5802486
TreeHugger Robot [Fri, 31 May 2019 21:54:29 +0000 (21:54 +0000)]
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
Mehdi Alizadeh [Fri, 31 May 2019 21:46:58 +0000 (14:46 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am:
cad67cdc0a
am:
9b378dd381
Change-Id: I7f2cb9c2ee20cfb32303c29e649dd327563db529
Mehdi Alizadeh [Fri, 31 May 2019 21:34:09 +0000 (14:34 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am:
cad67cdc0a
am:
c4be5512a7
Change-Id: I61477938f506b07ce01ad8d3b6214fb38df1936a
Mehdi Alizadeh [Fri, 31 May 2019 21:30:18 +0000 (14:30 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am:
cad67cdc0a
Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
Mehdi Alizadeh [Fri, 31 May 2019 21:26:04 +0000 (14:26 -0700)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
am:
cad67cdc0a
Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
Mehdi Alizadeh [Fri, 31 May 2019 21:08:08 +0000 (21:08 +0000)]
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
Mehdi Alizadeh [Wed, 15 May 2019 18:01:25 +0000 (11:01 -0700)]
Disables the Gesture nav option if 3P launcher is default
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.
Bug:
129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
Julia Reynolds [Fri, 31 May 2019 18:00:27 +0000 (11:00 -0700)]
Merge "Update notification settings animation" into qt-dev am:
1746ccca94
am:
2c47160eff
Change-Id: Iaa78037289c2f2d6fcf93030b00b5d350d0552ec
Lei Yu [Fri, 31 May 2019 17:59:46 +0000 (10:59 -0700)]
Merge "Fix issues in battery usage accounting" into qt-dev am:
2148c1a207
am:
677d5a5e01
Change-Id: I9f194a6e97a0f23cc4cd81ae328207c66cfd9831
Julia Reynolds [Fri, 31 May 2019 17:56:38 +0000 (10:56 -0700)]
Merge "Update notification settings animation" into qt-dev am:
1746ccca94
am:
c816aa26bd
Change-Id: I9fa208f11caffaa9e278d2ba22bee1d6ae3decae
Lei Yu [Fri, 31 May 2019 17:53:59 +0000 (10:53 -0700)]
Merge "Fix issues in battery usage accounting" into qt-dev am:
2148c1a207
am:
fad8cec592
Change-Id: I9b4a73685b8091760f375b58ad58d501046386d9
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings
Fixes:
119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit
fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
Raff Tsai [Fri, 8 Mar 2019 08:19:30 +0000 (16:19 +0800)]
Do not allow draw on top for App notification settings
Fixes:
119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit
fe86a2a51f0b8e01e5f595bd60edc594eef58aba)
Julia Reynolds [Fri, 31 May 2019 17:42:17 +0000 (10:42 -0700)]
Merge "Update notification settings animation" into qt-dev
am:
1746ccca94
Change-Id: If2fe2025fcdcecd6a432a76b4eac4545249b39dc
Lei Yu [Fri, 31 May 2019 17:41:54 +0000 (10:41 -0700)]
Merge "Fix issues in battery usage accounting" into qt-dev
am:
2148c1a207
Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b