TreeHugger Robot
d9989fc62b
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-08-26 19:04:13 +00:00
Jayachandran Chinnakkannu
0dc28d0187
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7
am: b5617b6f21
...
am: f51fdf64a9
Change-Id: Iebcaff0317b527481618ed076859ecb03cc879e3
2019-08-26 11:52:28 -07:00
Xin Li
64f11bf200
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9
-s ours am: 657ac4e451
...
am: 2b7dd17756
Change-Id: I3e80710150b862745a3469c762e4028a4fa23299
2019-08-26 11:39:51 -07:00
Jayachandran Chinnakkannu
f51fdf64a9
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7
...
am: b5617b6f21
Change-Id: Ia137a3f3454cff7af7c3aa7195eb89c049fadaf2
2019-08-26 11:39:22 -07:00
TreeHugger Robot
02b3cf16aa
Merge "Import translations. DO NOT MERGE"
2019-08-26 18:15:35 +00:00
Bill Yi
ce22e01572
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours
...
am: 272f241fd4
-s ours
am skip reason: subject contains skip directive
Change-Id: I087b9c5b1524db8692a51d6d648fbcc4391d6d21
2019-08-26 10:57:36 -07:00
Bill Yi
89f71578fc
[automerger skipped] Import translations. DO NOT MERGE
...
am: 18183ad552
-s ours
am skip reason: subject contains skip directive
Change-Id: Idfa1574adf65da278f9f428610e30c0c258d915b
2019-08-26 10:55:23 -07:00
Bill Yi
0a4c821751
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours
...
am: acd8a48b6c
-s ours
am skip reason: subject contains skip directive
Change-Id: Id08d6339706794b2ea849de8285f0882e1a31d75
2019-08-26 10:54:50 -07:00
Bill Yi
80589d367d
[automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc
-s ours
...
am: 272f241fd4
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieaabc566a4f74cc640f6f7bd5ddc4fc66ca45d69
2019-08-26 10:52:55 -07:00
Bill Yi
b671fd6e92
[automerger skipped] Import translations. DO NOT MERGE am: 9781a780e4
-s ours
...
am: 3f81ee5f55
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib65073f9a1161dba172d249004409041d8c604be
2019-08-26 10:52:20 -07:00
Bill Yi
1168870624
[automerger skipped] Import translations. DO NOT MERGE
...
am: 18183ad552
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaef7f84ffabe3b1238ed4c3f65330fbb9b43ed38
2019-08-26 10:52:18 -07:00
Bill Yi
272f241fd4
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a7b5e2abc
-s ours
am skip reason: subject contains skip directive
Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9
2019-08-26 10:48:23 -07:00
Bill Yi
acd8a48b6c
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a7b5e2abc
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie41ed82249c2c5296d1bb030e37518bcbf1bcb5b
2019-08-26 10:47:40 -07:00
Bill Yi
c6b2785d65
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9781a780e4
-s ours
am skip reason: subject contains skip directive
Change-Id: I702fcf7582392b0e0b6d20a19844702786a90d5e
2019-08-26 10:47:16 -07:00
Bill Yi
3f81ee5f55
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9781a780e4
-s ours
am skip reason: subject contains skip directive
Change-Id: Id9c07a0e7ae93ab863f31bacdd6447c9118af59a
2019-08-26 10:45:16 -07:00
Bill Yi
e3cbf6a8d1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If0c4f3a5f240a8da2bfd94c4496f4a86fabb02e9
2019-08-26 05:46:44 -07:00
Bill Yi
29e2efdad1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I8f245fc67033985824bbd6e410f0163c39d6c162
2019-08-26 05:32:34 -07:00
Bill Yi
9781a780e4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Icd19559f196f76e42d29fe3d9e77bf92d7376a07
2019-08-26 05:04:21 -07:00
Bill Yi
18183ad552
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I21b57a34501c5882af563b0026d52940cc70b3bc
2019-08-26 04:50:21 -07:00
Bill Yi
2a7b5e2abc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Iea44d6e2097aff936635e25e2cc2f241ef34f121
2019-08-26 04:36:33 -07:00
Bill Yi
15704495e5
Import translations. DO NOT MERGE
...
Change-Id: I2a97223626f86e90b9cb9706e06fe4dfec179218
Auto-generated-cl: translation import
2019-08-26 04:22:49 -07:00
Sunny Shao
7687e0b17d
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the UserSettings page.
Fixes: 140008560
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.users
Change-Id: If6da2bd2f6a72d8e61b8c8bca9e3179cfdee05e6
2019-08-26 17:08:31 +08:00
Arc Wang
1c5abf415a
[Wi-Fi] Change material design Wi-Fi signal icon for Wi-Fi Direct
...
Original icon is also a material design Wi-Fi signal icon but
it's for notification. This one is for devices.
Bug: 134408491
Bug: 139336138
Test: visual
Change-Id: Id14ddbbcede458e2a9f8645d94ecf80d22fe9ab2
2019-08-26 16:02:46 +08:00
Xin Li
cfb15a41ff
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bd8030e8b2
-s ours
...
am: aba2be1b76
Change-Id: I7c2e196f3226c93937b990e0a2ca0daf44ea8722
2019-08-24 02:03:02 -07:00
Xin Li
aba2be1b76
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
...
am: bd8030e8b2
-s ours
am skip reason: subject contains skip directive
Change-Id: Iee517157cc283eb8d9d92aef77ce396a8bb6f7a9
2019-08-24 01:17:05 -07:00
Xin Li
2b7dd17756
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9
-s ours
...
am: 657ac4e451
Change-Id: Iec169be2f57b78f76972516d013f637772a0be4a
2019-08-23 21:22:31 -07:00
Jayachandran Chinnakkannu
b5617b6f21
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: I561ecbcd376ac4be2003e291f5528130673460fd
2019-08-23 20:36:56 -07:00
Xin Li
657ac4e451
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
am: f92905cfe9
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic9c32eaa8b51660a9b2a7e95e6edf66700c40b96
2019-08-23 20:35:43 -07:00
Jayachandran Chinnakkannu
15a9d54958
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
...
am: 7afb9854a7
Change-Id: I2598b482b4630279d47685381ddac9c746fbe12d
2019-08-23 20:31:09 -07:00
TreeHugger Robot
2cce2150c6
Merge "Added extra to launchFingerprintSetitngs"
2019-08-24 00:42:30 +00:00
Jayachandran Chinnakkannu
7afb9854a7
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
2019-08-24 00:09:32 +00:00
joshmccloskey
df3c6c6b51
Added extra to launchFingerprintSetitngs
...
Enrolling a fingerprint on a provisioned profile would not
show up on the Pixel Imprint screen. The user would need to exit and re-enter
settings in order to see it.
Fixes: 139644416
Test: Verified that the fingerprint shows up after enrolling
with a provisioned profile.
Change-Id: Ic1fb79a90088c73c3aed9d855941ecd890fed793
2019-08-23 14:33:56 -07:00
Quang Luong
c1436e8ef2
Add initial WifiTracker2 into WifiSettings2
...
Added WifiTracker2 into WifiSettings2, and made WifiSettings2 listen to
wifi state change callbacks from WifiTracker2 to update the WifiEntry
list.
Test: atest WifiSettings2Test, build and visual verification
Bug: 70983952
Change-Id: Ieda699d05d350553a526f9536de58937c49c7280
2019-08-23 11:51:46 -07:00
TreeHugger Robot
8beb295704
Merge "Change deprecated slice APIs to new ones"
2019-08-23 13:13:30 +00:00
Xin Li
bd8030e8b2
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
...
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
2019-08-23 06:45:17 +00:00
Xin Li
f92905cfe9
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
...
Bug: 139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
2019-08-23 06:42:10 +00:00
Arc Wang
1730d19c26
[automerger skipped] Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev am: 318be48d07
...
am: ea15072a94
-s ours
am skip reason: change_id I9056622e6dadb04e5642ae1c50fb4d227a78d26d with SHA1 03f1ee1b50
is in history
Change-Id: Ifd8cc333e857018268d2edbaa668c17ace5bb597
2019-08-22 22:33:31 -07:00
Arc Wang
ea15072a94
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
...
am: 318be48d07
Change-Id: I6a33141d8e12a3a16d723b506c986eff941956c9
2019-08-22 22:23:57 -07:00
Arc Wang
4301d96b42
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
...
am: 318be48d07
Change-Id: I8e8a4ed08b3dd685f5c08b3503334bb736ef5601
2019-08-22 22:23:56 -07:00
TreeHugger Robot
318be48d07
Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev
2019-08-23 05:04:35 +00:00
Goven Liu
765a37f803
Merge "[Wi-Fi NetworkRequest] Don't need to have code to test theme"
2019-08-23 01:42:15 +00:00
TreeHugger Robot
65c54caea8
Merge "Add OWNER for deviceinfo/network/sim package."
2019-08-22 23:53:11 +00:00
Bonian Chen
128de7bdb6
[Settings] hide preferred network mode UI
...
Hide preferred network mode UI no matter home, roaming or no service
when KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL been enabled.
Bug: 137681413
Test: atest PreferredNetworkModePreferenceControllerTest
atest EnabledNetworkModePreferenceControllerTest
Manual with AT&T SIM card in out of servce and in service
Change-Id: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
2019-08-22 14:36:12 -07:00
Edgar Wang
99bc55da73
Add OWNER for deviceinfo/network/sim package.
...
Bug: 139881606
Test: None
Change-Id: If265c51360675d44bfce8d4790d1bf8d4207fc46
2019-08-23 03:06:20 +08:00
TreeHugger Robot
f0c69d3b5c
Merge "Import translations. DO NOT MERGE"
2019-08-22 17:27:04 +00:00
TreeHugger Robot
1faba0465a
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-08-22 17:11:06 +00:00
Bill Yi
a31269e645
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours am: 92c5a4fafd
-s ours
...
am: 5e5109e304
-s ours
am skip reason: subject contains skip directive
Change-Id: I25560f44d5294349daa56773a40d4b24b82993e7
2019-08-22 09:21:18 -07:00
Bill Yi
3149e81730
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours am: 32c8779c92
-s ours
...
am: fa115507c2
-s ours
am skip reason: subject contains skip directive
Change-Id: I75dc7ab08d89dd53293fbe4ed871508b8738d02a
2019-08-22 09:20:43 -07:00
Bill Yi
57bdf3420e
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: 1f8f4362c4
-s ours am: 7aaf659356
-s ours
...
am: 496b257e51
-s ours
am skip reason: subject contains skip directive
Change-Id: I4acb72fc86d1dbcf1ab0a9d40c51f1afadba240c
2019-08-22 09:18:57 -07:00
Bill Yi
5e5109e304
[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920
-s ours am: b227fad96a
-s ours
...
am: 92c5a4fafd
-s ours
am skip reason: subject contains skip directive
Change-Id: Id650db71b5de1ed86c95a02122870032118ff84b
2019-08-22 09:12:05 -07:00