PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,661 Commits 1 Branch 0 Tags
86112b0e726a8c6cf4ade376ceb72dacb3a5562b
Commit Graph

73661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanting Yang
570f8e54f7 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf am: bd27683632 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I0cebc3bef3647df08ab11e4d0886654bc300c265
 2020-06-19 08:16:46 +00:00
Yanting Yang
95a27be9b2 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I5898459457a73270e973304c2cb3a8c0a1c80527
 2020-06-19 08:00:27 +00:00
Yanting Yang
bd27683632 Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev am: ec606d6cdf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908540

Change-Id: I021a1ef7170000c297e83a806d3272456011da2c
 2020-06-19 08:00:14 +00:00
Yanting Yang
ec606d6cdf Merge "According to the enrolled status to show/hide face unlock results" into rvc-dev 2020-06-19 07:42:03 +00:00
Mark Chien
79b9dfbe21 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e am: cd0ffda87d am: 4efacef2f5 am: 4fb4c26893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I69f50aea890b26c53fc3de5787b320f352a178eb
 2020-06-19 07:06:46 +00:00
Automerger Merge Worker
39eee47258 Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d" into rvc-qpr-dev-plus-aosp am: 291a2249ad am: fa84ff9da3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I84a9b0545f04302ca3c983109e6487e8b27731e4
 2020-06-19 07:06:36 +00:00
Mark Chien
3bda51caa2 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: 89eb0d1e41 am: dd328aea20 am: 4174c994c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I8b81079faca74dd81c87f286d9c833a43d921a4c
 2020-06-19 07:06:23 +00:00
Mark Chien
85b8ce2126 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62 am: 211a604243 am: cf18d506fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Ib65bab5f5dd140d8ddd3739dcce5c58d14f20235
 2020-06-19 07:06:16 +00:00
Automerger Merge Worker
cf3e140ee6 Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp am: 26016b54c5 -s ours am: d9de06b059 -s ours am: cdf13b6a0a -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Id0c46d3f12030f5955338ca6a980e02fc44e8923
 2020-06-19 07:05:24 +00:00
TreeHugger Robot
11c9fd4a9f Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 53d99db577 am: 79c3dc7f09 am: f81473ef1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I8478c362408c387c1426587f06a6ee474c16d3c4
 2020-06-19 07:03:41 +00:00
Automerger Merge Worker
b43c3529ea Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp am: 510920bab8 am: 871c15dcce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I142ab3d4aebc6f1bb863dc9efc35a748fefc30f3
 2020-06-19 07:03:26 +00:00
PETER LIANG
1f53c79936 [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 18e02caa18 -s ours am: 76e422608e -s ours am: d4964caaaa -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ibbe3970126d11cc3b15817c9b73c1761ee375e46
 2020-06-19 07:02:57 +00:00
PETER LIANG
60ec25053e [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 31b09df257 am: 15ca8b0e0c -s ours am: 9c85809b45 -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 34a873884d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I95015986cc0a1a55c6e226ea0fa349e4339401d9
 2020-06-19 07:02:44 +00:00
Mark Chien
4fb4c26893 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e am: cd0ffda87d am: 4efacef2f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Ic4f909cae0afefa8cad013d9213af353b3d1d71b
 2020-06-19 06:47:53 +00:00
Automerger Merge Worker
fa84ff9da3 Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d" into rvc-qpr-dev-plus-aosp am: 291a2249ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Ia82508709eebff12a99a06bec8e9402bca281610
 2020-06-19 06:47:26 +00:00
Mark Chien
4174c994c0 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: 89eb0d1e41 am: dd328aea20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I4fb330614bf47eb8e193b63bc8b574a0e2a0f98a
 2020-06-19 06:47:09 +00:00
Mark Chien
cf18d506fe Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62 am: 211a604243 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I8ca3430f4bf89107b8a5b4a92f1bbd96023bf78d
 2020-06-19 06:46:58 +00:00
Automerger Merge Worker
cdf13b6a0a Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp am: 26016b54c5 -s ours am: d9de06b059 -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ia36c4282327ce285be7342687d15d019821ae70a
 2020-06-19 06:46:24 +00:00
TreeHugger Robot
f81473ef1c Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 53d99db577 am: 79c3dc7f09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Ie4d6d00975e52e7aab2482917e3108b14546815f
 2020-06-19 06:45:02 +00:00
Automerger Merge Worker
871c15dcce Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp am: 510920bab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I78d46ffd65eb69b12f0ae3a01aff47454803145c
 2020-06-19 06:44:11 +00:00
PETER LIANG
d4964caaaa [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 18e02caa18 -s ours am: 76e422608e -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ic7c5966050e2f11cfc69e6a48a208fdf2e440fe7
 2020-06-19 06:43:10 +00:00
PETER LIANG
9c85809b45 [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 31b09df257 am: 15ca8b0e0c -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 34a873884d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I05b8c4ef7c05ca26aa19451ec9b4f14ed866fc3b
 2020-06-19 06:42:25 +00:00
Mark Chien
4efacef2f5 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e am: cd0ffda87d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I4cb2fb3e8a8c14f64a3bf55ad22fc9eecd0c95a1
 2020-06-19 06:20:02 +00:00
Automerger Merge Worker
291a2249ad Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d" into rvc-qpr-dev-plus-aosp 2020-06-19 06:19:59 +00:00
Mark Chien
dd328aea20 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: 89eb0d1e41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Idea3de3667db6930bf87cea80a8de34277244d0e
 2020-06-19 06:19:49 +00:00
TreeHugger Robot
136854528e Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 am: af7ac88c6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I426210dea47d05cb0603e3f92f2f8c7e8ac0607f
 2020-06-19 06:19:47 +00:00
Mark Chien
211a604243 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I4feb2c65b0d18bbcee4fb3c276364c99b0b2ecb8
 2020-06-19 06:19:38 +00:00
Automerger Merge Worker
d9de06b059 Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp am: 26016b54c5 -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I3ddbe3ba18855570428c3b0e6cbafb69be0eaa05
 2020-06-19 06:19:12 +00:00
TreeHugger Robot
79c3dc7f09 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 53d99db577 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I844fd32fddb45756aa8ba7326cd6ff584b7902d4
 2020-06-19 06:18:58 +00:00
Automerger Merge Worker
510920bab8 Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp 2020-06-19 06:18:56 +00:00
PETER LIANG
76e422608e [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 18e02caa18 -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I7ed78016be291926e5c1f8647d9fe0d4842138ae
 2020-06-19 06:18:46 +00:00
TreeHugger Robot
43e9340dfb Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I86b2dd6ed85175a1c9e2bbcc1b7ce525eccd419a
 2020-06-19 06:18:41 +00:00
PETER LIANG
15ca8b0e0c Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 am: 31b09df257 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: If2a9375b5a305f001e3fcfe5b47629086b22e887
 2020-06-19 06:18:32 +00:00
Mark Chien
cd0ffda87d Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: c3a501c02e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I0041d5af77b37b6ef1435453230371c752dea9f9
 2020-06-19 06:00:40 +00:00
TreeHugger Robot
af7ac88c6d Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: 25a8c13254 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I6204226d9bd72d3173f5b2af981cf4b276c48dff
 2020-06-19 06:00:31 +00:00
Mark Chien
89eb0d1e41 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I07100cdc9f4d2ef5b0b3ead0ad74c6f718d88be4
 2020-06-19 06:00:23 +00:00
Mark Chien
e35a89ef62 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Ib91bb507b01b4b0e9994cb9edbadf21bc57e4886
 2020-06-19 06:00:23 +00:00
Automerger Merge Worker
26016b54c5 Merge "[automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours" into rvc-d1-dev-plus-aosp 2020-06-19 06:00:23 +00:00
PETER LIANG
0284214e0c [automerger skipped] Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: 479c1cb24a -s ours 
am skip reason: Change-Id Id2d548778d1275709448f4c009a8469216950d8c with SHA-1 22ed240aab is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: If83b964e060e3c4a7af87b6f1c2eb614d2301158
 2020-06-19 06:00:17 +00:00
TreeHugger Robot
53d99db577 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I5a715f26585a7af1c142aac930f1e196e5ebcb10
 2020-06-19 06:00:10 +00:00
TreeHugger Robot
6c0d2225c0 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Ib006da6de06a17c7e30055f71b2c403dba8afe22
 2020-06-19 06:00:08 +00:00
PETER LIANG
18e02caa18 Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ie227f2a09632c63d60d72e25d2fe118732274a1b
 2020-06-19 05:59:59 +00:00
PETER LIANG
31b09df257 Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 am: c0ccd1eac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I0d867616b7b83cb9b5f1eb4f2c5aaab5e10461bb
 2020-06-19 05:59:59 +00:00
Mark Chien
c3a501c02e Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I89a1b4747662611dc2a103ab6835afff0e05086b
 2020-06-19 05:45:18 +00:00
Mark Chien
5f643bb4db Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I63a125c5291f71811e2c010d946c0440c1eca29c
 2020-06-19 05:45:00 +00:00
TreeHugger Robot
25a8c13254 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I3da9493dff22054dd6250a17d8ea6ed7a5226457
 2020-06-19 05:44:59 +00:00
TreeHugger Robot
a68b7cc6bf Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Idc85a865b5579bc08dbb4b0e6b92726bb2e6cf08
 2020-06-19 05:44:52 +00:00
PETER LIANG
479c1cb24a Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: Ia7a45d3e919c7910b4c26d7d460a88d7917b5648
 2020-06-19 05:44:47 +00:00
PETER LIANG
c0ccd1eac1 Merge "Fix the dark theme obscures the center marker of audio balance slider." into rvc-dev am: 5d19a1f0d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900664

Change-Id: I9762f3d94e93f8e634ee3954770ed29a4fc5f411
 2020-06-19 05:44:15 +00:00
Mark Chien
45a953b56c Merge "Remove unused resource from TetherServiceTest" into rvc-dev 2020-06-19 05:43:36 +00:00