git.osdn.net Git - android-x86/packages-apps-Settings.git/log

OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:48:08 +0000 (02:48 -0700)]

Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours am: acac31e75a -s ours am: b1e65ea2af -s ours
am: 7879a05148 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I8ef28c25fbdd3879a7d56f4f1e1486758446f223

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:47:30 +0000 (02:47 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours am: acac31e75a -s ours am: c212052f69 -s ours
am: 4994dfff37 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2362b0023cb47997d68361bbd95059a2fec0a8ac

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:47:05 +0000 (02:47 -0700)]

Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours am: 290b4e507c -s ours am: 723fb8dc91 -s ours
am: f376fc4ecc -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2c9d46d7f1a73e825283797ecd8aeccfee8834f1

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:46:34 +0000 (02:46 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours am: 290b4e507c -s ours am: 592e5c1491 -s ours
am: 433adc9043 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I5697c7185cca74e551b21783af668344ba3e4e72

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:46:03 +0000 (02:46 -0700)]

[automerger skipped] Merge changes from topic "am-7e9372ebcbec48df8185598aa79c5433" into qt-r1-dev-plus-aosp
am: e1e01667a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I3328670fc4b4f89dcbaf0c2639713dde041e807b

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:45:12 +0000 (02:45 -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: f12bc63c3c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ife2bf0bf4c0175303fe86b38b5c968f865637bac

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:44:58 +0000 (02:44 -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: e944a78e21 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: I957f4e60b93eb0d23c7aead82978f164a2264923

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:44:42 +0000 (02:44 -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: 012a9daccb -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history

Change-Id: Ibe0fba561ca4a86334dce41691993b9b3cadaab8

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 09:41:28 +0000 (09:41 +0000)]

Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours am: acac31e75a -s ours am: b1e65ea2af -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:41:18 +0000 (02:41 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours am: acac31e75a -s ours
am: b1e65ea2af -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I52161c8578ef4d869b460450291d6bc3ee083431

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:41:11 +0000 (02:41 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours am: acac31e75a -s ours
am: c212052f69 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2e5316c8cb6737a74798cc9e6cfe0710d87e45e1

commit | commitdiff | tree

Android Build Merger (Role) [Wed, 5 Jun 2019 09:41:00 +0000 (09:41 +0000)]

Merge "[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours am: 290b4e507c -s ours am: 723fb8dc91 -s ours am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history" into qt-r1-dev-plus-aosp

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:40:50 +0000 (02:40 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours am: 290b4e507c -s ours
am: 723fb8dc91 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I94ab6df5819dd01b44ff349a44a34c4f16df02cc

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:40:44 +0000 (02:40 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours am: 290b4e507c -s ours
am: 592e5c1491 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I7884c8f36514759eddf36eb14e862970c7cd4c9f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:36:10 +0000 (02:36 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours
am: acac31e75a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I2df0ab2ef87024ca20b4a05941505b581c27d8d7

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:36:08 +0000 (02:36 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours am: 64d4433a90 -s ours
am: acac31e75a -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ib8f332a5ac80342106e25b07e5f40fb740fca033

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:35:45 +0000 (02:35 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours
am: 290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I7339c87760c9aac2c435178b03b62a936f498662

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:35:44 +0000 (02:35 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours am: ba0122401d -s ours
am: 290b4e507c -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I591d8c07e4e21109315a9b7b600b52ba7000c3cc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:30:17 +0000 (02:30 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours am: 3e1ae79428 -s ours
am: 64d4433a90 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I0588eac0a4abcb1003b09e5fab92894a8ddfc8f9

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:29:51 +0000 (02:29 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours am: 5a326027db -s ours
am: ba0122401d -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ib7ded3d2c08e14e39922ad0f1dd1fb2dd3e27ab9

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:25:23 +0000 (02:25 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours am: 14302b3ac6 -s ours
am: 3e1ae79428 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ia0dc8b4e6b5795fb03c30867d77460389bb49155

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:24:54 +0000 (02:24 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours am: 80fea5de92 -s ours
am: 5a326027db -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I923b0a55fd8458fa30295fa1f9ca7a31f13d2734

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:19:30 +0000 (02:19 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 09e255676b -s ours
am: 14302b3ac6 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic1ddb22a97d9058d5e40b8fddfb3f6f4ef40e150

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:19:03 +0000 (02:19 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev am: 8c612b1334 -s ours
am: 80fea5de92 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: Ic06c39295c0b1e82701cf1747606afff1e27fd68

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:13:22 +0000 (02:13 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407

commit | commitdiff | tree

Raff Tsai [Wed, 5 Jun 2019 09:12:49 +0000 (02:12 -0700)]

[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
am: 8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history

Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Jun 2019 09:02:31 +0000 (09:02 +0000)]

Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
  Do not allow draw on top for App notification settings

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Jun 2019 09:02:31 +0000 (09:02 +0000)]

Merge changes from topic "security_fix_settings" into oc-dev

* changes:
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
  [automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
  Do not allow draw on top for App notification settings

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Bill Yi [Wed, 5 Jun 2019 02:48:45 +0000 (19:48 -0700)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3d9c7cb356 -s ours am: e655774644 -s ours
am: c1780aeb59 -s ours
am skip reason: subject contains skip directive

Change-Id: I8fb75c0bd710b9172f162ccc8bc2e4b6fd6c5302

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexey Kuzmin [Wed, 5 Jun 2019 02:48:23 +0000 (19:48 -0700)]

Move vibration preview invokation to the correct place am: f8eb8c3c90 am: ef530610fa
am: bfc327ad9d

Change-Id: Ie6d19156593ff6590bb749a82f814e49c9f2c767

commit | commitdiff | tree

Bill Yi [Wed, 5 Jun 2019 02:47:17 +0000 (19:47 -0700)]

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3d9c7cb356 -s ours am: 7ff72e6d75 -s ours
am: d7c96d4ff4 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifc1d5ac36cc7ffd7528e323c7598bb6d4ff1f788

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexey Kuzmin [Wed, 5 Jun 2019 02:33:32 +0000 (19:33 -0700)]

Move vibration preview invokation to the correct place am: f8eb8c3c90 am: df51217157
am: e8200af63a

Change-Id: Ie3d6485881cf48dfd75383985c5de4afad9b69f1

commit | commitdiff | tree

Kevin Chyn [Wed, 5 Jun 2019 02:28:14 +0000 (19:28 -0700)]

Merge changes from topic "face-settings-challenge" into qt-r1-dev am: b979a38c8d
am: 2ec0c38e1f

Change-Id: Ia41cdafdb189e71273f4a251b2953cf49b1b2fac

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Wed, 5 Jun 2019 00:23:38 +0000 (00:23 +0000)]

Merge "Import translations. DO NOT MERGE" into qt-dev

commit | commitdiff | tree

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()"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Stokes [Tue, 4 Jun 2019 14:57:36 +0000 (07:57 -0700)]

Merge "Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: 5b09f510e2" into qt-r1-dev-plus-aosp
am: 23ce464bef

Change-Id: I27f6d1770d6209c5649014b969798853b6462412

commit | commitdiff | tree

Alan Stokes [Tue, 4 Jun 2019 14:53:23 +0000 (07:53 -0700)]

Merge "Cleanup background activity starts for release." into qt-dev am: c53f5ecb3d am: dd1545b098
am: c912a02f50

Change-Id: I620a9a71c4495d1c4fd8db458ae0f3c8dd296f41

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alan Stokes [Tue, 4 Jun 2019 14:26:29 +0000 (14:26 +0000)]

Merge "Cleanup background activity starts for release." into qt-dev

commit | commitdiff | tree

tmfang [Tue, 4 Jun 2019 09:33:51 +0000 (17:33 +0800)]

Ignore failure test case

Test: atest BatteryTipDialogFragmentTest
Bug: 134451831
Change-Id: I5649cbcf0d585514651c5b6befcca271e85a3cb3

commit | commitdiff | tree

Kevin Chang [Tue, 4 Jun 2019 02:02:25 +0000 (19:02 -0700)]

Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: 267321cd81
am: d20fa646fc

Change-Id: I2ba78f260e539bee65f3e2a9aae42229f8573dc4

commit | commitdiff | tree

Antony Sargent [Tue, 4 Jun 2019 02:01:53 +0000 (19:01 -0700)]

Add a "data during calls" preference am: aeb1da0db9 am: bffd3757e0
am: 39a842b84a

Change-Id: I84c6a980b652d28276b2e1af9e46a7663d05931d

commit | commitdiff | tree

Kevin Chang [Tue, 4 Jun 2019 02:01:29 +0000 (19:01 -0700)]

Merge "Update the string of both magnification settings and gesture navigation tutorial dialog" into qt-dev am: 68aa4e4919 am: d2fa1e6baa
am: 487a0c2a57

Change-Id: I0647c73de02299d00531be23aee066a3a078f992

commit | commitdiff | tree

Antony Sargent [Tue, 4 Jun 2019 02:00:57 +0000 (19:00 -0700)]

Add a "data during calls" preference am: aeb1da0db9 am: 7f7f7cda18
am: 7a48cb470b

Change-Id: I8f9e97915fa3063d0a2f865ed749201fb404f5bc

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

packages/apps/Settings

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.