Commit Graph

54670 Commits

Author SHA1 Message Date
Yanting Yang
1a71b22120 Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
am: c453af3f91

Change-Id: I1f3c517c6056c1a12a64a274bf81aef50abe2d97
2019-07-23 09:46:39 -07:00
Yanting Yang
920f6109a8 Merge "Support new regulatory label for location" into qt-dev
am: 28736bee5d

Change-Id: I2a2fb86c5062f38b52ac38366c619aa8e0bb2f00
2019-07-23 09:37:45 -07:00
Yanting Yang
c453af3f91 Merge "Support new regulatory label for location" into qt-dev
am: 28736bee5d

Change-Id: I0a966698855aa935b6acbf3829988d5004ff57e2
2019-07-23 09:37:45 -07:00
TreeHugger Robot
28736bee5d Merge "Support new regulatory label for location" into qt-dev 2019-07-23 16:12:52 +00:00
lucaslin
be8701bca5 Create a string for private DNS "On"
The last private DNS settings screen landed in P after string
freeze, which led us to reuse R.string.switch_on_text for the
"on" text when private DNS is active. That string comes from
notifications. Private DNS should have its own string for this
instead.

Bug: 79122154
Test: 1. Build pass
      2. make -j44 RunSettingsRoboTests \
      ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest

Change-Id: Ie013a858c8bc41e00a1b940d02efa2b605991685
2019-07-23 19:40:09 +08:00
Sunny Shao
f67401a4c3 Merge "Use the date format to show the system update info" into qt-r1-dev
am: a076039803

Change-Id: I12eab14b3a406348d13436df5843727f0dccf71d
2019-07-23 03:36:02 -07:00
Sunny Shao
aff0054855 Merge "Use the date format to show the system update info" into qt-r1-dev
am: a076039803

Change-Id: I71fec74cc487b40a9cf167bff6cae060f309ef24
2019-07-23 03:36:02 -07:00
TreeHugger Robot
a076039803 Merge "Use the date format to show the system update info" into qt-r1-dev 2019-07-23 10:07:36 +00:00
Quang Luong
f73d65c940 Default MAC address should display "Not Available" in network details
For saved networks that do not have a MAC address available in their
WifiConfiguration such as Passpoint networks, the MAC address will
be the default value of 20:00:00:00:00:00. In this case, display
"Not Available" as the summary of the MAC address preference.

Bug: 137282522
Test: atest WifiDetailPreferenceControllerTest &&
manual - open saved passpoint network details while disconnected
but in range and observe MAC address preference.

Change-Id: Ie9010b0430726de8105852ae2afe10047dcc3676
2019-07-22 17:06:51 -07:00
Mehdi Alizadeh
3d54229c38 Merge "Removes logic to disable gesture nav when default home app changes" into qt-r1-dev
am: 66b0cabf26

Change-Id: Iae76ee176083edefc6a8f6aab356751070689488
2019-07-22 16:55:15 -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
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
fa8d00ce1c [automerger skipped] Import translations. DO NOT MERGE am: 7d966975ad -s ours
am: 6e57d54d35 -s ours
am skip reason: subject contains skip directive

Change-Id: I79e5367a2c5a2a084265462a01c332d0815cbf03
2019-07-22 13:12:45 -07: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
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
bab1717c87 [automerger skipped] Import translations. DO NOT MERGE
am: 04a6245af9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie51bb342d50b05a3f1d37572934effb4b4ab9b84
2019-07-22 12:25:43 -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
Sunny Shao
47a1b24908 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
Merged-In: Ie4bab2617c1cd6fd956bf6d1a22ce96e6b0b58d0
(cherry picked from commit 162e88c262)
2019-07-22 04:59:27 +00:00
Bill Yi
7d47128058 [automerger skipped] Import translations. DO NOT MERGE
am: efc7ac061c -s ours
am skip reason: subject contains skip directive

Change-Id: I8639aa47b9d68a975ebc3b5fb44319509e177188
2019-07-19 14:05:21 -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
Yanting Yang
49b1bc1545 Support new regulatory label for location
Fixes: 137348817
Test: visual, robotests
Change-Id: I165b1e859891c7897e837d82702582458cecbb0d
2019-07-20 02:07:54 +08:00
TreeHugger Robot
f7e7bc4129 Merge "Use the Global value rather than the Secure value" into qt-r1-bubbles-dev 2019-07-19 17:55:47 +00: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
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
Antony Sargent
dd874eeb54 Merge "Make MobileNetworkActivity support onNewIntent" into qt-r1-dev
am: 20ec6a4b6f

Change-Id: I512000e6041c3611d4c7715355d8564aa3261b01
2019-07-18 19:57:18 -07: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
Mady Mellor
22c920cc01 Use the Global value rather than the Secure value
Fixes: 137876221
Test: manual - have setting in dev options turned off, post a bubble
               => no bubble appears
             - have setting in dev options turned on, post a bubble
               => bubble appears

Change-Id: I4490b978059a73b45fa8d09bf28e05965f42eec1
2019-07-18 14:40:04 -07:00
Bill Yi
10ea3f7280 [automerger skipped] Import translations. DO NOT MERGE am: e73e59c562 -s ours
am: 1f4b32a154 -s ours
am skip reason: subject contains skip directive

Change-Id: I23c9c5e6e8bdf6f59733d7fefbe658699ae997c4
2019-07-18 14:37:11 -07:00
Bill Yi
8e25581401 [automerger skipped] Import translations. DO NOT MERGE
am: 56887f467c -s ours
am skip reason: subject contains skip directive

Change-Id: Ifdb15f70ca027f4a429dbf84d03a5b82096aaac7
2019-07-18 14:36:14 -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
Lyn Han
d39e874570 Merge "Secure => global bubble settings pt 2" into qt-r1-bubbles-dev 2019-07-18 14:30:16 +00:00
Kevin Chang
08be6c4a84 Merge "Add footer preference into caption preferences" into qt-r1-dev
am: 5fc6db2cf7

Change-Id: I02eb493be2b958b766f06d85dde7aabcc1230a68
2019-07-18 00:53:55 -07:00
Kevin Chang
8c17c2f588 Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
am: 6bfc381173

Change-Id: Ic0b481b5306a91c58f1aeea4cb125874d6b77d2e
2019-07-18 00:53:02 -07:00
Kevin Chang
42f6f19216 Merge "UI change in caption preferences in Settings" into qt-r1-dev
am: af447c17b8

Change-Id: I5b669681267875963d9b91471bdb63a57b1c84b0
2019-07-18 00:52:00 -07:00
Kevin Chang
ada6b6f88e Merge "Add footer preference into caption preferences" into qt-r1-dev
am: 5fc6db2cf7

Change-Id: I66530a3acd24e227d3c659e03bed62db58d7fe92
2019-07-18 00:44:44 -07:00
Kevin Chang
55be763ccd Merge "Add new reminder in "Magnify with shortcut" page" into qt-r1-dev
am: 6bfc381173

Change-Id: Ic7255bbfdb06c5a38073198073d37f3ba1207d4c
2019-07-18 00:43:52 -07:00
Kevin Chang
2a725532f5 Merge "UI change in caption preferences in Settings" into qt-r1-dev
am: af447c17b8

Change-Id: Iba6562299043b23d2f3b5cbb06ed4ae23dede871
2019-07-18 00:42:38 -07:00