TreeHugger Robot
9f9acf6ff3
Merge "[Wi-Fi DPP] Refine code"
2019-07-23 01:51:01 +00:00
Mehdi Alizadeh
7833c334d7
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev am: 66b0cabf26
...
am: 418f942c0e
Change-Id: I49e82fc0b16b920d2743dbbe61693e1a2302dfe7
2019-07-22 17:16:07 -07:00
Mehdi Alizadeh
418f942c0e
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
...
am: 66b0cabf26
Change-Id: I6ea0fe769b52345b8f148547d7950af9203c9926
2019-07-22 16:52:52 -07:00
Mehdi Alizadeh
66b0cabf26
Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
2019-07-22 23:17:48 +00:00
Bill Yi
5975ec43fa
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours am: 6e57d54d35
-s ours
...
am: be17e5a4e6
-s ours
am skip reason: subject contains skip directive
Change-Id: I3843be3bef455eea6e50f73aac2a968ccc9779fa
2019-07-22 13:48:25 -07:00
Bill Yi
92a66b615b
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours am: 57b150fedd
-s ours
...
am: 6ef4683a15
-s ours
am skip reason: subject contains skip directive
Change-Id: Idd65ba41c8efc7bfa84a10c0ba2c8104da965e84
2019-07-22 13:45:07 -07:00
Android Build Merger (Role)
be17e5a4e6
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours am: 6e57d54d35
-s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-22 20:12:47 +00:00
Bill Yi
2f8b8b3f52
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours
...
am: 6e57d54d35
-s ours
am skip reason: subject contains skip directive
Change-Id: I7b25739458d86c2291f923e4c0521cfcaecd1744
2019-07-22 13:12:26 -07:00
Bill Yi
6ef4683a15
[automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad
-s ours
...
am: 57b150fedd
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibef3a3f53cd897709dd8053f54c1179481e8a91e
2019-07-22 13:12:00 -07:00
TreeHugger Robot
397741ea63
Merge "Reject SUITE_B_192 network creation for non EAP-TLS"
2019-07-22 20:06:39 +00:00
Bill Yi
6e57d54d35
[automerger skipped] Import translations. DO NOT MERGE
...
am: 7d966975ad
-s ours
am skip reason: subject contains skip directive
Change-Id: I494a50f37bc0ae4d4d7979756fc067f575057224
2019-07-22 12:53:25 -07:00
Bill Yi
57b150fedd
[automerger skipped] Import translations. DO NOT MERGE
...
am: 7d966975ad
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie9d71673049fc02897d6ce5c9c16b8e7cee8b0e6
2019-07-22 12:51:28 -07:00
Bill Yi
9943f149bd
[automerger skipped] Import translations. DO NOT MERGE am: 04a6245af9
-s ours
...
am: 3af7b7f342
-s ours
am skip reason: subject contains skip directive
Change-Id: Iae5a81bb895de3c76a54bc6ff349af2a3136bfd8
2019-07-22 12:46:57 -07:00
Bill Yi
3af7b7f342
[automerger skipped] Import translations. DO NOT MERGE
...
am: 04a6245af9
-s ours
am skip reason: subject contains skip directive
Change-Id: I59b9117b3767daeddfd91a10a490b46e4bb2b9d7
2019-07-22 12:24:56 -07:00
Bill Yi
7d966975ad
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0369197f24082cadfbb6b3ac72d33243231090ac
2019-07-22 10:59:39 -07:00
Bill Yi
04a6245af9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: If2b98e7c7fadad3c2fb18275ed458da76e9cc7ac
2019-07-22 10:37:18 -07:00
TreeHugger Robot
0a902e46a0
Merge "Add admin user checking in MobileNetworkActivity"
2019-07-22 12:13:25 +00:00
TreeHugger Robot
9fd2b11555
Merge "Fix crash in getMetricsTag"
2019-07-22 06:29:25 +00:00
TreeHugger Robot
c0a4e657e7
Merge "Use the date format to show the system update info"
2019-07-22 04:50:19 +00:00
Cosmo Hsieh
223386ec08
Merge "[NetworkRequest] Implement Single Specified SSID ALTERNATE FLOW V2"
2019-07-22 04:39:39 +00:00
Raff Tsai
54a5c444da
Fix crash in getMetricsTag
...
SettingsIntelligence put a null in intent extra bundle, caused the
crash. Check the null before use it.
Fixes: 137351833
Test: make RunSettingsRoboTests
Change-Id: I9630760396c72bddf6a11314b869873c3b83b45a
2019-07-22 12:33:21 +08:00
TreeHugger Robot
f88b71f430
Merge "Prevent accounts page directly opening in screen pinning mode"
2019-07-22 03:24:43 +00:00
Sunny Shao
162e88c262
Use the date format to show the system update info
...
Use the "July 13, 2019" or similar to display if the value is a valid
date data.
Bug: 137089104
Test: visual test & robotest
Change-Id: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
2019-07-22 03:24:40 +00:00
Sunny Shao
d2c74a5a7f
Add admin user checking in MobileNetworkActivity
...
Long press QuickSetting mobile icon will launch MobileNetworkActivity.
Add isAdminUser checking in onCreate to avoid no permission fail.
Fixes: 137859662
Test: manual test
Change-Id: I8c7ab4fa6e2644f7c7a8e9442bdf5478aadb249f
2019-07-22 03:22:30 +00:00
tmfang
a2be917dbe
Change owner for wifi and development
...
Test: Rebuilt
Change-Id: Ide41b0076f1a30ee3e7f65ca2499cab718876288
2019-07-20 08:00:19 +08:00
Bill Yi
d3687fca78
[automerger skipped] Import translations. DO NOT MERGE am: efc7ac061c
-s ours
...
am: ec64f48808
-s ours
am skip reason: subject contains skip directive
Change-Id: I6c6ce26c5b8e1d55770f6b6d9491d03b95148b3a
2019-07-19 14:23:47 -07:00
Bill Yi
ec64f48808
[automerger skipped] Import translations. DO NOT MERGE
...
am: efc7ac061c
-s ours
am skip reason: subject contains skip directive
Change-Id: Id1ff8188cc1638770dffc0d2f3eabbbd5660b73a
2019-07-19 14:04:20 -07:00
Mill Chen
f3242dab35
Prevent accounts page directly opening in screen pinning mode
...
There is no auth mechanism to prevent accounts page being opened in
screen pinning mode. We will directly close the account page if users
are trying to navigate to it from screen pinning mode.
Fixes: 137015265
Test: manual, robotests
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
2019-07-20 02:51:14 +08:00
Hai Shalom
f2b52be493
Reject SUITE_B_192 network creation for non EAP-TLS
...
Reject creation of WPA3-Enterprise 192-bit network in Settings app if
the selected EAP method is not EAP-TLS, as mandated by the
specification.
Note that this is just a protection against invalid networks, a UI
change to prevent this in Settings will follow.
Bug: 135127581
Test: atest WifiConfigControllerTest
Test: Create invalid network, verify it is not saved
Change-Id: I2978c2c71a90433778b6187a986e3284e9095d41
2019-07-19 10:54:19 -07:00
Bill Yi
efc7ac061c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9ce6d671fe6587af26ea31b711da0d4594433ee6
2019-07-19 10:23:51 -07:00
TreeHugger Robot
b1625b3158
Merge "Add start margin in the Screen usage item"
2019-07-19 16:40:53 +00:00
Sunny Shao
af68c44ed4
Add start margin in the Screen usage item
...
Avoid the title and subtitle overlap while text length is long. So add the
start margin for subtitle.
Fixes: 136282569
Test: manual test
Change-Id: Id1728ae60904c654c4ffe95fae7fb5139f368092
2019-07-19 06:11:56 +00:00
Antony Sargent
136a0f53f6
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev am: 20ec6a4b6f
...
am: f61428cf1d
Change-Id: I21991a0d06bf861d6a0fd6906b455a36d8b10c55
2019-07-18 20:06:19 -07:00
Antony Sargent
f61428cf1d
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
...
am: 20ec6a4b6f
Change-Id: I72317d0d45103cbc4791e1f9d67e726d7426b758
2019-07-18 19:57:18 -07:00
Arc Wang
a12b372dd2
[Wi-Fi DPP] Refine code
...
Remove unused code.
Rename some variables and methods for better readability.
Fix typos.
Reduce unnecessary variable scope and method scope.
Simplify some code logic.
Bug: 120645817
Test: atest com.android.settings.wifi.dpp
Change-Id: I8f30b3e445f25ada927e995befee1783d2270b91
2019-07-19 10:29:06 +08:00
TreeHugger Robot
20ec6a4b6f
Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
2019-07-19 02:26:19 +00:00
Mehdi Alizadeh
1aaf41b2dc
Removes logic to disable gesture nav when default home app changes
...
Bug: 137197916
Test: Manual test with setting a 3P launcher as default
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Change-Id: Id397cfa1c2439222aa21a7b7fe5f69818bf1fe97
2019-07-18 15:27:05 -07:00
Bill Yi
5d1c65e3e9
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours am: 1f4b32a154
-s ours
...
am: aaae63aaa9
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie5d7634343da300257e1ef469759660ef59ee57e
2019-07-18 14:43:38 -07:00
Bill Yi
83a9c6bfb5
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours am: ad2542c534
-s ours
...
am: 160a6efb72
-s ours
am skip reason: subject contains skip directive
Change-Id: I31f26e54f6eb69af4f6e925d616f7dd4c14f54d0
2019-07-18 14:42:41 -07:00
Bill Yi
e7a46a0f2b
[automerger skipped] Import translations. DO NOT MERGE am: 56887f467c
-s ours
...
am: f36921c04b
-s ours
am skip reason: subject contains skip directive
Change-Id: Ieaa51e11b9cf70ffff2938d76b9933672c7a2b0e
2019-07-18 14:34:18 -07:00
Android Build Merger (Role)
aaae63aaa9
Merge "[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours am: 1f4b32a154
-s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-07-18 21:33:57 +00:00
Bill Yi
7355faeb99
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours
...
am: 1f4b32a154
-s ours
am skip reason: subject contains skip directive
Change-Id: I000d7b47e58b2238e6969ae321aa09d170555d5d
2019-07-18 14:33:35 -07:00
Bill Yi
160a6efb72
[automerger skipped] Import translations. DO NOT MERGE am: e73e59c562
-s ours
...
am: ad2542c534
-s ours
am skip reason: subject contains skip directive
Change-Id: I5738457ce2d693b01b1368dc17987ee77de9a33d
2019-07-18 14:33:33 -07:00
Bill Yi
ad2542c534
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
-s ours
am skip reason: subject contains skip directive
Change-Id: I52627f2e7b30beb857a5e7c8ca955671ceefef28
2019-07-18 14:24:36 -07:00
Bill Yi
f36921c04b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 56887f467c
-s ours
am skip reason: subject contains skip directive
Change-Id: I0f83f2ea5a5f6fdd6659a9113b7561ea63ebf097
2019-07-18 14:24:36 -07:00
Bill Yi
1f4b32a154
[automerger skipped] Import translations. DO NOT MERGE
...
am: e73e59c562
-s ours
am skip reason: subject contains skip directive
Change-Id: I888c9b99282dcccfe58db799c1c02ceed4b63747
2019-07-18 14:24:35 -07:00
Bill Yi
e73e59c562
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Idb389ab591b291cae86749badc8d7cef2052e388
2019-07-18 11:28:21 -07:00
Bill Yi
56887f467c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id43eff8bedf9c1bd2d3d25a73a560705ab8da213
2019-07-18 11:07:45 -07:00
Raff Tsai
738a233f0c
Merge "Fix Disabled text color in dark theme"
2019-07-18 11:02:02 +00:00
Kevin Chang
aae770eda5
[automerger skipped] Merge "Add footer preference into caption preferences" into qt-r1-dev am: 5fc6db2cf7
...
am: 08be6c4a84
-s ours
am skip reason: change_id I95e0aa301eba7343fbc798cc406c0242f4f4eb7e with SHA1 8f4b8b9a74
is in history
Change-Id: Ic3153cef6f388c59f30a283cc47db435c774ab73
2019-07-18 01:16:18 -07:00