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

54899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Chyn
3fd14bd081 Merge "Remove attention controller" into qt-r1-dev am: 41aafab963 
am: 645480a4e4

Change-Id: Ie2f40eef47acd830247a3ed6f1a8d2e717520e4e
 2019-08-19 20:07:09 -07:00
Kevin Chyn
6dc15d7976 Merge "Remove attention controller" into qt-r1-dev am: 41aafab963 
am: 88936d4a46

Change-Id: I13b6d8579a5e1c00aa8ac23ae1f8deac05c057cb
 2019-08-19 20:06:32 -07:00
Kevin Chyn
88936d4a46 Merge "Remove attention controller" into qt-r1-dev 
am: 41aafab963

Change-Id: Ic5e2b13d6246fe7693a8f1c289d82d43d3fc6efd
 2019-08-19 19:57:37 -07:00
Kevin Chyn
645480a4e4 Merge "Remove attention controller" into qt-r1-dev 
am: 41aafab963

Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
 2019-08-19 19:57:37 -07:00
Kevin Chyn
7b8e594e5c Merge "Remove attention controller" into qt-r1-dev 
am: 41aafab963

Change-Id: Id77bc47085b72bbc04a9cee635fe288f3c8f7ef4
 2019-08-19 19:57:30 -07:00
android-build-team Robot
63a13925a5 Merge cherrypicks of [9231374, 9231389, 9231390, 9231391, 9231375, 9231286, 9231355, 9231376, 9231420, 9231462, 9231356, 9231421, 9231422, 9231402, 9231537, 9231557, 9231440, 9231441, 9231287, 9231288, 9231463, 9231464, 9231465, 9231423, 9231289, 9231392, 9230416, 9231466] into qt-c2f2-release 
Change-Id: I06a53fb0bfdb3588367768bd06aaaa8a6f94b83d
 2019-08-20 02:44:02 +00:00
Kevin Chyn
e3213d4b79 Remove delay from enroll start button 
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
(cherry picked from commit 058af41a42)
 2019-08-20 02:41:31 +00:00
TreeHugger Robot
41aafab963 Merge "Remove attention controller" into qt-r1-dev 2019-08-20 02:37:20 +00:00
Android Build Merger (Role)
b3774dfe29 Merge "Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca am: d1e331dbcd" into qt-qpr1-dev-plus-aosp 2019-08-19 22:23:17 +00:00
Kevin Chyn
c889474c9c Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca 
am: d1e331dbcd

Change-Id: I575c770f557f829d77382384b29253cfc6f90610
 2019-08-19 15:22:19 -07:00
Kevin Chyn
2c403efabf Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca 
am: 59538f62c1

Change-Id: Idb56289528bae12ef1f66d5f96b2461eb5fc20ab
 2019-08-19 15:21:56 -07:00
Kevin Chyn
ac55252e28 Merge "Remove delay from enroll start button" into qt-r1-dev 
am: ca2bbdfeca

Change-Id: I031e6034ac2cc1bcd7a6d6e36c4fc28b9014636b
 2019-08-19 15:11:17 -07:00
Kevin Chyn
d1e331dbcd Merge "Remove delay from enroll start button" into qt-r1-dev 
am: ca2bbdfeca

Change-Id: Ide066e65d76c70175ade9ebeaf94e471cb11c806
 2019-08-19 15:09:00 -07:00
Kevin Chyn
59538f62c1 Merge "Remove delay from enroll start button" into qt-r1-dev 
am: ca2bbdfeca

Change-Id: I59870f9318f9ac84107c437aaa660f3d28b861c5
 2019-08-19 15:08:48 -07:00
Kevin Chyn
ca2bbdfeca Merge "Remove delay from enroll start button" into qt-r1-dev 2019-08-19 21:50:22 +00:00
Bill Yi
3efb76b03b [automerger skipped] Import translations. DO NOT MERGE 
am: 9909286ace -s ours
am skip reason: subject contains skip directive

Change-Id: I0653a3670e314128324e2902fdc3c7381639ed23
 2019-08-19 13:28:44 -07:00
Bill Yi
9909286ace Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I0f506526563a88f386ec68d2a31b00b3e5e3b47e
 2019-08-19 10:42:35 -07:00
android-build-team Robot
25144933f8 Snap for 5811895 from 7892f729a5 to qt-c2f2-release 
Change-Id: I0540ce5f28f36beeca6c68c07277dac43a4fc8af
 2019-08-19 00:45:02 +00:00
Android Build Merger (Role)
1d13f5c8bb Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours am: 978cd2b768 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-17 16:55:37 +00:00
Bill Yi
49c7a74c59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours 
am: 5188a0560f -s ours
am skip reason: subject contains skip directive

Change-Id: I76c3bc3fd54c2cb51d44feef20f542a76dc9b00b
 2019-08-17 09:55:19 -07:00
Bill Yi
c94de34259 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours 
am: 978cd2b768 -s ours
am skip reason: subject contains skip directive

Change-Id: I0acc5b0bd1a1f29bb5acbfd6d17d3da7f4f84dcf
 2019-08-17 09:55:17 -07:00
Bill Yi
978cd2b768 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 7892f729a5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia2280686d74a66951529c333f5c7e6a05d989208
 2019-08-17 09:45:16 -07:00
Bill Yi
5188a0560f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 7892f729a5 -s ours
am skip reason: subject contains skip directive

Change-Id: I02568545b0452c41a81daf515960665dbf7516cc
 2019-08-17 09:45:15 -07:00
Bill Yi
735e8a680d [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev 
am: 7892f729a5 -s ours
am skip reason: subject contains skip directive

Change-Id: Id230b9e65dd2bb45e599c6064be37203eb4ac014
 2019-08-17 09:45:15 -07:00
TreeHugger Robot
7892f729a5 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-17 16:30:21 +00:00
Android Build Merger (Role)
22cbd5ca0d Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp 2019-08-17 14:28:18 +00:00
Arc Wang
a266ec8ffd Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d 
am: 0e53b6293d

Change-Id: I574c161e5cdde8f879031ff403082dddefe0dbb9
 2019-08-17 07:27:01 -07:00
Arc Wang
aece3458cf Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d 
am: 2394d0821b

Change-Id: I4e7873288289b705885cd2ea57879136d114694f
 2019-08-17 07:26:55 -07:00
Arc Wang
0e53b6293d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev 
am: 54dbed859d

Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
 2019-08-17 07:18:03 -07:00
Arc Wang
2394d0821b Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev 
am: 54dbed859d

Change-Id: I19214265a783f092bb183b3341aa1c2116f3188f
 2019-08-17 07:17:59 -07:00
Arc Wang
5101624819 Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev 
am: 54dbed859d

Change-Id: I7267b4fe82f6e5e6e6523463eb710049c68e66f9
 2019-08-17 07:17:59 -07:00
TreeHugger Robot
54dbed859d Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev 2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
 2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42 Remove delay from enroll start button 
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
 2019-08-17 04:52:30 +00:00
Kevin Chyn
f490c7cb7f Merge "Update attention string" into qt-r1-dev am: e218dc0517 
am: 5725d33471

Change-Id: Ic8302db945bdf128bb04eda2ba6105abe6083ce0
 2019-08-16 20:01:16 -07:00
Android Build Merger (Role)
0abf9968d7 Merge "Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: 5725d33471" into qt-qpr1-dev-plus-aosp 2019-08-17 02:52:20 +00:00
Kevin Chyn
0967e12b69 Merge "Update attention string" into qt-r1-dev am: e218dc0517 
am: ddd4fb660e

Change-Id: I015ca59b14f1ae5454a773244b772763ad87ff35
 2019-08-16 19:51:51 -07:00
Kevin Chyn
60c939da52 Merge "Update attention string" into qt-r1-dev am: e218dc0517 
am: 5725d33471

Change-Id: I16d624ddf3fd7014aaa9ff896eb4cacfd896df45
 2019-08-16 19:51:51 -07:00
Kevin Chyn
208b633c7e Merge "Update attention string" into qt-r1-dev 
am: e218dc0517

Change-Id: Ie03ff39347a98318bf44928124cdb0c4bae57f5c
 2019-08-16 19:51:18 -07:00
Kevin Chyn
ddd4fb660e Merge "Update attention string" into qt-r1-dev 
am: e218dc0517

Change-Id: Id6f6bb10ef8a9bcb96e03da291df3f054bda5f32
 2019-08-16 19:43:00 -07:00
Kevin Chyn
5725d33471 Merge "Update attention string" into qt-r1-dev 
am: e218dc0517

Change-Id: I0fd8c3a1ea66dde8eefc934cd3265cbb6fbafe0f
 2019-08-16 19:42:52 -07:00
Kevin Chyn
e218dc0517 Merge "Update attention string" into qt-r1-dev 2019-08-17 02:01:31 +00:00
Arc Wang
91200e610d [Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem 
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.

This fix check the setting of active subscription and shows the preference.

Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
      manual test:
          1. Insert feature supported SIM and check UI.
          2. Remove feature supported SIM and check UI.
          3. Turn airplane mode on and check 1. and 2..

Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
 2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab Remove attention controller 
Bug: 139484065

Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
 2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1 Update attention string 
Bug: 139484065

Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
 2019-08-16 16:34:09 -07:00
Xin Li
78d26fb0c9 [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours am: b03fdd4dcf -s ours am: e66eb255ee 
am: 0907055fcc

Change-Id: Icc83271d489e604763a2de9ac1a18fe40df12ea6
 2019-08-15 01:12:05 -07:00
Xin Li
0907055fcc [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours am: b03fdd4dcf -s ours 
am: e66eb255ee

Change-Id: I34d560cf4bdd6b47e0a45c070185ba3f4eaa1f52
 2019-08-15 00:50:19 -07:00
Xin Li
e66eb255ee [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 1e53efc4c4 -s ours 
am: b03fdd4dcf -s ours
am skip reason: subject contains skip directive

Change-Id: I8b48996bdb25fda1adb55fcb63a3956dddbb8710
 2019-08-15 00:40:41 -07:00
Xin Li
a3a692bd24 [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: c3ef16882d -s ours am: f8c25b6ac4 -s ours am: f62f61cbfb 
am: ea995aaaff

Change-Id: I6e4fa97cb38312c8ab059e1693ddcc549c8fb68f
 2019-08-15 00:36:07 -07:00
Xin Li
b03fdd4dcf [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" 
am: 1e53efc4c4 -s ours
am skip reason: subject contains skip directive

Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e
 2019-08-15 00:25:54 -07:00