PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,469 Commits 1 Branch 0 Tags
1bcc2ff789480eedfe48834d8860d79d3098eb7c
Commit Graph

54469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
e3ee5e32c3 Merge "New strings for "Automatically lock"" into qt-r1-dev am: 19eaefb17e 
am: 1d9a0ec5f4

Change-Id: I3acd5eb888cfe50c087db6757eee4affa76cb581
 2019-06-05 08:46:33 -07:00
Edgar Wang
1d9a0ec5f4 Merge "New strings for "Automatically lock"" into qt-r1-dev 
am: 19eaefb17e

Change-Id: I83d75e232242340a20d006ccfa2697ef4d6301a1
 2019-06-05 08:40:30 -07:00
TreeHugger Robot
19eaefb17e Merge "New strings for "Automatically lock"" into qt-r1-dev 2019-06-05 15:30:52 +00:00
TreeHugger Robot
205520bea1 Merge "Fix BatteryTipDialogFragmentTest" 2019-06-05 12:29:31 +00:00
Pasty Chang
2624615676 Merge "Fix overlapped text in lockscreen pattern setup" 2019-06-05 12:10:49 +00:00
tmfang
1392e6c979 Fix BatteryTipDialogFragmentTest 
Test case can't get application info. We add test app information
in packagemanager in setup().

Test: atest BatteryTipDialogFragmentTest
Fixes: 134451831
Change-Id: I687f5f3a52ba8af346dbd0d798e4eee34a583870
 2019-06-05 10:10:49 +00:00
Raff Tsai
df160a501d 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
 2019-06-05 02:48:08 -07:00
Raff Tsai
82e42390cc [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
 2019-06-05 02:47:30 -07:00
Raff Tsai
5df942b0e9 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
 2019-06-05 02:47:05 -07:00
Raff Tsai
243eaaf17b [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
 2019-06-05 02:46:34 -07:00
Raff Tsai
cd43d22537 [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
 2019-06-05 02:46:03 -07:00
Raff Tsai
fa6b52cf62 [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
 2019-06-05 02:45:12 -07:00
Raff Tsai
69a48ed41a [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
 2019-06-05 02:44:58 -07:00
Raff Tsai
279be6c878 [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
 2019-06-05 02:44:42 -07:00
Android Build Merger (Role)
7879a05148 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 2019-06-05 09:41:28 +00:00
Raff Tsai
adbec0222c [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
 2019-06-05 02:41:18 -07:00
Raff Tsai
4994dfff37 [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
 2019-06-05 02:41:11 -07:00
Android Build Merger (Role)
f376fc4ecc 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 2019-06-05 09:41:00 +00:00
Raff Tsai
db61c64436 [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
 2019-06-05 02:40:50 -07:00
Raff Tsai
433adc9043 [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
 2019-06-05 02:40:44 -07:00
Android Build Merger (Role)
e1e01667a7 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
 2019-06-05 09:40:35 +00:00
Raff Tsai
5e22a7d4dd [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
 2019-06-05 02:40:04 -07:00
Raff Tsai
f12bc63c3c [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
 2019-06-05 02:39:59 -07:00
Raff Tsai
f9f19a8608 [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
 2019-06-05 02:39:52 -07:00
Raff Tsai
e944a78e21 [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
 2019-06-05 02:39:49 -07:00
Raff Tsai
de3cc29552 [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
 2019-06-05 02:39:40 -07:00
Raff Tsai
012a9daccb [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
 2019-06-05 02:39:39 -07:00
Raff Tsai
c212052f69 [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
 2019-06-05 02:36:10 -07:00
Raff Tsai
b1e65ea2af [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
 2019-06-05 02:36:08 -07:00
Raff Tsai
592e5c1491 [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
 2019-06-05 02:35:45 -07:00
Raff Tsai
723fb8dc91 [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
 2019-06-05 02:35:44 -07:00
Raff Tsai
a9125587a4 [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
 2019-06-05 02:35:04 -07:00
Raff Tsai
7d3edc88a9 [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
 2019-06-05 02:35:02 -07:00
Raff Tsai
7a7a4f3019 [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
 2019-06-05 02:34:55 -07:00
Raff Tsai
152f4c8345 [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
 2019-06-05 02:34:53 -07:00
Raff Tsai
a33cd2c168 [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
 2019-06-05 02:34:38 -07:00
Raff Tsai
05b744c5eb [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
 2019-06-05 02:34:37 -07:00
Raff Tsai
acac31e75a [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
 2019-06-05 02:30:17 -07:00
Raff Tsai
290b4e507c [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
 2019-06-05 02:29:51 -07:00
Raff Tsai
ca593c204a [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
 2019-06-05 02:29:05 -07:00
Raff Tsai
f7cd796ea8 [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
 2019-06-05 02:28:55 -07:00
Raff Tsai
ab2ad075b3 [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
 2019-06-05 02:28:42 -07:00
Raff Tsai
64d4433a90 [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
 2019-06-05 02:25:23 -07:00
Raff Tsai
ba0122401d [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
 2019-06-05 02:24:54 -07:00
Raff Tsai
e7c298885b [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
 2019-06-05 02:22:55 -07:00
Raff Tsai
2d387349db [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
 2019-06-05 02:22:46 -07:00
Raff Tsai
971190b08a [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
 2019-06-05 02:22:36 -07:00
Edgar Wang
e1a000f94f New strings for "Automatically lock" 
Bug: 132106803
Test: manual
Change-Id: If6fe328ef6570cd96906435eb635576b324269c0
 2019-06-05 17:19:48 +08:00
Raff Tsai
3e1ae79428 [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
 2019-06-05 02:19:30 -07:00
Raff Tsai
5a326027db [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
 2019-06-05 02:19:03 -07:00