PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,227 Commits 1 Branch 0 Tags
785c024cad477763d63d7e6373da2b7dceedbf01
Commit Graph

55227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
785c024cad Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" 2019-08-20 08:37:07 +00:00
Goven Liu
67a24cb98d Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" 2019-08-20 07:00:50 +00:00
Kevin Chyn
484cfe8a27 Merge "Merge "Remove attention controller" into qt-r1-dev am: 41aafab963 am: 645480a4e4" into qt-qpr1-dev-plus-aosp 
am: 451965fab8

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

Change-Id: If992a629986d1873f3908668dd2c05aeff3f1aa3
 2019-08-19 20:15:09 -07:00
Android Build Merger (Role)
451965fab8 Merge "Merge "Remove attention controller" into qt-r1-dev am: 41aafab963 am: 645480a4e4" into qt-qpr1-dev-plus-aosp 2019-08-20 03:07:43 +00:00
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
645480a4e4 Merge "Remove attention controller" into qt-r1-dev 
am: 41aafab963

Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
 2019-08-19 19:57:37 -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
TreeHugger Robot
41aafab963 Merge "Remove attention controller" into qt-r1-dev 2019-08-20 02:37:20 +00:00
govenliu
dbf920cfff [Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog 
We should set the same theme which applied in Settings APP to the NetworkRequestDialog

Bug: 139294487
Test: check if the right theme is applied when launching this activity.
Change-Id: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
 2019-08-20 10:26:14 +08:00
Arc Wang
03f1ee1b50 [Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator 
WifiTracker#getAccessPoints() only contains a hidden SSID Wi-Fi
network if it's a saved Wi-Fi network. We can't check if a hidden
SSID Wi-Fi network is reachable inadvance. That is the difference
after a user scanned a QR code of hidden SSID Wi-Fi network.

Bug: 135892509
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppUtilsTest
      manual test:
      Click the Share button of a connected hidden SSID Wi-Fi network
      and save the QR code image. Use Wi-Fi QR code scanner in Wi-Fi
      Settings to scan the saved QR code image.

Change-Id: I9056622e6dadb04e5642ae1c50fb4d227a78d26d
 2019-08-20 09:54:17 +08:00
TreeHugger Robot
1040f2146a Merge "Remove ic_menu_refresh_holo_dark" 2019-08-20 01:11:51 +00:00
Kevin Chyn
8f52a0eb6a [automerger skipped] Merge "Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca am: d1e331dbcd" into qt-qpr1-dev-plus-aosp 
am: b3774dfe29 -s ours
am skip reason: change_id I365308c2a00c122b80f70c904d11bb4a5d6cf404 with SHA1 058af41a42 is in history

Change-Id: Ia1e8264a22574683bdfe45c35a398badb4f3a5e8
 2019-08-19 16:14:43 -07:00
Kevin Chyn
222b17d4c5 [automerger skipped] Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca am: d1e331dbcd 
am: c889474c9c -s ours
am skip reason: change_id I365308c2a00c122b80f70c904d11bb4a5d6cf404 with SHA1 058af41a42 is in history

Change-Id: Iff6b53ad8b61618e62cc24717bec3b7c6207fde6
 2019-08-19 15:55:52 -07:00
Kevin Chyn
7570ccf620 [automerger skipped] Merge "Remove delay from enroll start button" into qt-r1-dev am: ca2bbdfeca am: 59538f62c1 
am: 2c403efabf -s ours
am skip reason: change_id I365308c2a00c122b80f70c904d11bb4a5d6cf404 with SHA1 1ae8beab06 is in history

Change-Id: Ice37b65cf67b091bfc17a76c874c0bd38cdfe646
 2019-08-19 15:48:14 -07: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
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
5ffe9e168d [automerger skipped] Import translations. DO NOT MERGE am: 9909286ace -s ours 
am: 3efb76b03b -s ours
am skip reason: subject contains skip directive

Change-Id: I4ce930518f07d80aab035d25bf66094c90c035a2
 2019-08-19 13:48:55 -07: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
TreeHugger Robot
8d59885bc2 Merge "Use FooterPreference in xml explicitly" 2019-08-19 14:00:45 +00:00
TreeHugger Robot
795fe6a3ce Merge "Use FooterPreference in xml explicitly" 2019-08-19 13:58:49 +00:00
Raff Tsai
fcaca1ac75 Remove ic_menu_refresh_holo_dark 
Menu overflow item icon is removed for 1p apps. We don't need to
set it.

Bug: 139336138
Test: visual
Change-Id: I91216d0363211c5e9aee074810746999ae49b097
 2019-08-19 18:15:49 +08:00
Sunny Shao
d04c885ff9 Use FooterPreference in xml explicitly 
Removed the FooterPreferenceMixin from the RestrictedAppDetails page.

Fixes: 139641334
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I6a4e56725d88353bde361de1dfff4a2a449c842c
 2019-08-19 11:50:06 +08:00
TreeHugger Robot
31c7ac1017 Merge "Fix flaky test error" 2019-08-19 02:44:56 +00:00
Kevin Chyn
7af4e5a77c Merge "Remove delay from enroll start button" 2019-08-17 18:42:04 +00:00
Bill Yi
b801b6605d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours am: 978cd2b768 -s ours 
am: 1d13f5c8bb -s ours
am skip reason: subject contains skip directive

Change-Id: Ie295d2b7759f41a84e2a9cc8718a1d405519a556
 2019-08-17 10:06:03 -07:00
Bill Yi
23939bfcc1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours am: 5188a0560f -s ours 
am: 49c7a74c59 -s ours
am skip reason: subject contains skip directive

Change-Id: I0d14911d22dbd7f9dd9447c05fc5012253cc7c57
 2019-08-17 10:05:19 -07: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
TreeHugger Robot
7892f729a5 Merge "Import translations. DO NOT MERGE" into qt-r1-dev 2019-08-17 16:30:21 +00:00
Arc Wang
69d3c16b0e [automerger skipped] 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 
am: 22cbd5ca0d -s ours
am skip reason: change_id I72b6db415429181395a02f163889bb1b9c0f070f with SHA1 91200e610d is in history

Change-Id: Ic0e8518e114df09523d8975c5d9cda4706919598
 2019-08-17 07:43:42 -07:00
Arc Wang
3c01d14d7e [automerger skipped] Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 0e53b6293d 
am: a266ec8ffd -s ours
am skip reason: change_id I72b6db415429181395a02f163889bb1b9c0f070f with SHA1 fe9a794eaf is in history

Change-Id: I8589c116bb499cc9740bcb832a954ea776e1b070
 2019-08-17 07:37:29 -07: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
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
1ae8beab06 Remove delay from enroll start button 
Fixes: 139554930

Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
 2019-08-17 04:51:23 +00:00