Commit Graph

56925 Commits

Author SHA1 Message Date
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
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
govenliu
c3eab6a9d9 [Wi-Fi] Hide SoftKeyboard temporary when user tap the advanced button.
When tapping on the advanced button during configuring a network, some items in the expanded list are covered by IME keyboard, which may cause user to ignore them accidently.

To improve it, hide the IME temporary to let user can see most of them.

Bug: 78441374
Test: Use ShadowInputMethodManager to check if the keyboard is hide or not after tapping on the advance button.
Change-Id: I0677d96febc90c66d1cf6f98555bbb436a654660
2019-08-20 10:55:44 +08: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
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
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
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
Raff Tsai
648ada031d Fix Battery page animation
TextView summary1 has default height 2 line. If the content is longer
than 2 line, the TextView increases itself which causes the animation.
By increasing minLines to 3, it can avoid the animation. And remove
summary2 because it is only for debug purpose, the debug information
can be merged to summary1.

Fixes: 139554919
Test: visual, make RunSettingsRoboTests
Change-Id: I167ac87c9bd83035e00d4991961599e76f4f69e1
2019-08-19 16:47:53 +08:00
Jimmy Chen
d79363fec6 wifi: support SAE password identifier in wifi dialog
Bug: 138305265
Test: atest FrameworksWifiApiTests
Test: atest FrameworksWifiTests
Test: connect to a WPA3 SAE access point with different
      password/identifer combinations.

Change-Id: Idf1f82faaafa9c5f2212a0fa1dcc2eec53a9dbd5
2019-08-19 13:31:53 +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
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
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
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
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