tim peng
04c75c04c0
Merge "One of the HA will not be Active after switching sound path to Phone/Speaker during active call"
2019-08-21 02:20:59 +00:00
Bill Yi
e743653fca
[automerger skipped] Import translations. DO NOT MERGE am: 1dea02439a -s ours
...
am: 10ca16aebb
2019-08-20 18:05:34 -07:00
Bill Yi
10ca16aebb
[automerger skipped] Import translations. DO NOT MERGE
...
am: 1dea02439a
2019-08-20 17:27:05 -07:00
Bill Yi
1dea02439a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I79a6c2c9db40e5198b2bbe60f23d4d2e40f5ab19
2019-08-20 15:26:43 -07:00
Bill Yi
02458fc185
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87 -s ours am: d9c4bdf4fb -s ours
...
am: 06a0c0fe24
2019-08-20 14:20:55 -07:00
Bill Yi
c56a9716de
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87 -s ours am: e2f660eb6a -s ours
...
am: a42954156b
2019-08-20 14:15:21 -07:00
Bill Yi
06a0c0fe24
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87 -s ours
...
am: d9c4bdf4fb
2019-08-20 13:50:49 -07:00
Bill Yi
a42954156b
[automerger skipped] Import translations. DO NOT MERGE am: ba8880dd87 -s ours
...
am: e2f660eb6a
2019-08-20 13:49:40 -07:00
Bill Yi
d9c4bdf4fb
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
2019-08-20 13:36:38 -07:00
Bill Yi
e2f660eb6a
[automerger skipped] Import translations. DO NOT MERGE
...
am: ba8880dd87
2019-08-20 13:36:35 -07:00
Bill Yi
ba8880dd87
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
2019-08-20 18:39:09 +00:00
timhypeng
e725d6f357
One of the HA will not be Active after switching sound path to Phone/Speaker during active call
...
- If first summary is unavailable, not to show second summary.
Bug: 132409181
Test: make -j42 RunSettingsRoboTests
Change-Id: I0d2e426b15dae8ed38e0a1b5a9219209e1a0026c
2019-08-20 08:44:46 +00:00
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
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
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
2019-08-19 20:07:09 -07:00
Kevin Chyn
6dc15d7976
Merge "Remove attention controller" into qt-r1-dev am: 41aafab963
...
am: 88936d4a46
2019-08-19 20:06:32 -07:00
Kevin Chyn
645480a4e4
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
2019-08-19 19:57:37 -07:00
Kevin Chyn
88936d4a46
Merge "Remove attention controller" into qt-r1-dev
...
am: 41aafab963
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: b3774dfe29058af41a42
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: c889474c9c058af41a42
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: 2c403efabf1ae8beab06
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
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
2019-08-19 15:21:56 -07:00
Kevin Chyn
d1e331dbcd
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
2019-08-19 15:09:00 -07:00
Kevin Chyn
59538f62c1
Merge "Remove delay from enroll start button" into qt-r1-dev
...
am: ca2bbdfeca
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
2019-08-19 13:48:55 -07:00
Bill Yi
3efb76b03b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9909286ace
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
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
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
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
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
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
2019-08-17 09:45:15 -07:00
