OSDN Git Service
Lucas Lin [Wed, 23 Oct 2019 10:07:20 +0000 (03:07 -0700)]
Merge "Improve the wifi description for the case of private DNS broken" am:
37b17ae752
am:
5eda5a3e7f
Change-Id: Idd568b71dab954a6b018594e15d3f695ea2aeac2
Lucas Lin [Wed, 23 Oct 2019 09:52:01 +0000 (02:52 -0700)]
Merge "Improve the wifi description for the case of private DNS broken"
am:
37b17ae752
Change-Id: I46ad5cff3809191483b48fe292dba220a0d699c6
Lucas Lin [Wed, 23 Oct 2019 09:20:09 +0000 (09:20 +0000)]
Merge "Improve the wifi description for the case of private DNS broken"
Niclas Rokicki [Tue, 22 Oct 2019 16:48:57 +0000 (09:48 -0700)]
Merge "translate="false" -> translatable="false"" am:
b333e79df9
am:
90f0230b54
Change-Id: Iad740a41439b112ffaff528ac74fccee7eb64150
Niclas Rokicki [Tue, 22 Oct 2019 16:41:58 +0000 (09:41 -0700)]
Merge "translate="false" -> translatable="false""
am:
b333e79df9
Change-Id: I3955c9f03c741efa86fcf03baafea81d7073d5ef
Treehugger Robot [Tue, 22 Oct 2019 16:29:50 +0000 (16:29 +0000)]
Merge "translate="false" -> translatable="false""
Niclas Rokicki [Fri, 18 Oct 2019 07:56:43 +0000 (09:56 +0200)]
translate="false" -> translatable="false"
Fixed a typo related to String translation
Bug:
142888682
Test: Manual
Change-Id: I86fd2d9a4c5b085679ed627c7ecb7578da168ced
Anamika Singh [Fri, 18 Oct 2019 08:55:53 +0000 (01:55 -0700)]
Merge "Move Emergency call button" am:
2501f6e268
am:
251411674b
Change-Id: I97e20041d520f2795affe8c66e1d12e16ec5cfde
Anamika Singh [Fri, 18 Oct 2019 08:49:54 +0000 (01:49 -0700)]
Merge "Move Emergency call button"
am:
2501f6e268
Change-Id: Ie687f4b03f7ebf572057dca6678ac4d70666f76f
Treehugger Robot [Fri, 18 Oct 2019 08:37:39 +0000 (08:37 +0000)]
Merge "Move Emergency call button"
Raff Tsai [Tue, 15 Oct 2019 18:02:23 +0000 (11:02 -0700)]
Merge "Make sure close button has proper color" am:
0f9ad6d7f9
am:
2bb6e54317
Change-Id: Iec6c4ec81a1be8f1635683a613fbde10c5dc1210
Xin Li [Tue, 15 Oct 2019 17:11:14 +0000 (10:11 -0700)]
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
am:
acfebe21ac
Change-Id: Ic67eed1985854f82ea33c59d88589cad46deda29
Raff Tsai [Tue, 15 Oct 2019 10:32:29 +0000 (03:32 -0700)]
Merge "Make sure close button has proper color"
am:
0f9ad6d7f9
Change-Id: I3f785f159c9b0e46a293acb8656eb47c9b6e4550
Raff Tsai [Tue, 15 Oct 2019 10:11:56 +0000 (10:11 +0000)]
Merge "Make sure close button has proper color"
Xin Li [Mon, 14 Oct 2019 20:25:43 +0000 (13:25 -0700)]
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug:
141248619
Change-Id: I8d4b7b73176b7323ea231bd98c5f74f6b6e96471
SongFerng Wang [Mon, 14 Oct 2019 07:39:16 +0000 (00:39 -0700)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am:
bc6a65ca32
am:
951e9b7742
Change-Id: Ifa44c34f2653e6e1146a9a6337f411761cc1ce17
SongFerngWang [Mon, 14 Oct 2019 07:39:09 +0000 (00:39 -0700)]
Preferred network list add 5G item am:
76422cab68
am:
10d41f52b7
Change-Id: I3356ff24d7d8669aae438bdccab9bccce5d3e295
SongFerngWang [Mon, 14 Oct 2019 07:39:02 +0000 (00:39 -0700)]
RadioInfo network mode list and network mode string add 5G am:
dc5149efef
am:
8cd10f774d
Change-Id: I3d2f8561ebb74cb5bb73ad2cc65b4d0df3454851
Bonian Chen [Mon, 14 Oct 2019 07:38:54 +0000 (00:38 -0700)]
[automerger skipped] [Settings] hide preferred network mode UI am:
92eb42c69e
am:
b36ff74ac3 -s ours
am skip reason: change_id Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968 with SHA1
128de7bdb6 is in history
Change-Id: Ieff603d09fc5be1a2439eb5674c1aad25751779f
Antony Sargent [Mon, 14 Oct 2019 07:38:46 +0000 (00:38 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am:
aa88b8cee6 -s ours
am:
0f1b14e467 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1
6d910e8608 is in history
Change-Id: Ic86a69026cb7db7049519aae4ee0367a13cf4c9a
SongFerng Wang [Mon, 14 Oct 2019 07:34:20 +0000 (00:34 -0700)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
am:
bc6a65ca32
Change-Id: I3ec33adf894393b43296e83b450f3a894785fc92
SongFerngWang [Mon, 14 Oct 2019 07:34:10 +0000 (00:34 -0700)]
Preferred network list add 5G item
am:
76422cab68
Change-Id: I05771619c27d7ce0dd40fd83a9b3560758d29621
SongFerngWang [Mon, 14 Oct 2019 07:33:54 +0000 (00:33 -0700)]
RadioInfo network mode list and network mode string add 5G
am:
dc5149efef
Change-Id: Id55735d6933965735249e6c25981c137877b00ed
Bonian Chen [Mon, 14 Oct 2019 07:33:34 +0000 (00:33 -0700)]
[Settings] hide preferred network mode UI
am:
92eb42c69e
Change-Id: Id16ca111b0fe79b83bc0eff0ebdaca03875718dc
Antony Sargent [Mon, 14 Oct 2019 07:33:09 +0000 (00:33 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes
am:
aa88b8cee6 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1
6d910e8608 is in history
Change-Id: Ieb25eb9b4d1c9d85bcaa6e0532f8814339070f4c
Anamika Singh [Wed, 9 Oct 2019 12:36:41 +0000 (20:36 +0800)]
Move Emergency call button
This is google issue because in Q DecorView (base of CryptKeeper view)
has added Navigation bar forcefully due to which Emergency call button
was hidden on CryptKeeper view.
Made changes to shift ECC button above navigation bar.
Hence it will show just below CryptKeeper password entry view pattern/pin/password).
Bug:
142626673
Test: Manual
Change-Id: If60fad3936bc67adcf26019bdf16975b5706be83
SongFerng Wang [Mon, 14 Oct 2019 07:14:54 +0000 (07:14 +0000)]
Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843
* changes:
String "CDME" is wrong
Preferred network list add 5G item
RadioInfo network mode list and network mode string add 5G
[Settings] hide preferred network mode UI
Make EnabledNetworkModePreferenceController listen to setting changes
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong
Bug:
142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Merged-In: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
SongFerngWang [Fri, 30 Aug 2019 08:06:41 +0000 (16:06 +0800)]
Preferred network list add 5G item
Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.
Bug:
138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass
Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
Merged-In: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
SongFerngWang [Fri, 23 Aug 2019 10:03:27 +0000 (18:03 +0800)]
RadioInfo network mode list and network mode string add 5G
Bug:
131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Merged-In: I945d3c2fd175f45151bbeee475e388ccc2d67642
Bonian Chen [Thu, 22 Aug 2019 09:13:06 +0000 (17:13 +0800)]
[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
Merged-In: Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968
Antony Sargent [Tue, 30 Jul 2019 17:10:57 +0000 (10:10 -0700)]
Make EnabledNetworkModePreferenceController listen to setting changes
The controller for the "Preferred network type" preference on the SIM
details page wasn't listening for changes to the underlying global
setting, so changes to the setting would be reflected in SysUI but not
on this page if it happened to be showing.
Bug:
135667565
Test: make RunSettingsRoboTests
Change-Id: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Merged-In: I5dfe4843a681c613f49caf4584e9dbebc54e708a
Luca Stefani [Thu, 10 Oct 2019 08:36:44 +0000 (10:36 +0200)]
Make sure close button has proper color
Test: manual, change theme to dark
Change-Id: I9b1c159834c1afcc03a1df33e2ea3b28ce6fc6c0
Bill Yi [Sun, 6 Oct 2019 22:03:16 +0000 (15:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
aa605a2ff8 -s ours
am skip reason: subject contains skip directive
Change-Id: I8582fd40ccfab6c247144759b8eac47e021b3ee4
Bill Yi [Sun, 6 Oct 2019 14:36:10 +0000 (07:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1af1cc81e5fffb4ead2146f8871efa5115f91be2
Auto-generated-cl: translation import
Paul Hu [Tue, 1 Oct 2019 10:09:15 +0000 (03:09 -0700)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am:
a67ca4cfd7
am:
3a728ae13b
Change-Id: Id211709644b505fa866b0661f9657991c36dbaf6
Paul Hu [Tue, 1 Oct 2019 10:03:36 +0000 (03:03 -0700)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
am:
a67ca4cfd7
Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
Paul Hu [Tue, 1 Oct 2019 09:50:28 +0000 (09:50 +0000)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
lucaslin [Thu, 26 Sep 2019 07:55:01 +0000 (15:55 +0800)]
Improve the wifi description for the case of private DNS broken
Currently, users don't know if the wifi description shows
"No internet" means it really doesn't have internet access or no
internet is because of private DNS resolution failed. So, Add a
new description for wifi when private DNS is broken.
Bug:
113242081
Test: make -j44 RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDetailPreferenceControllerTest
Change-Id: I44a7e51cf76dc3f2a6b9583f226af6649f9b1f5f
Taesu Lee [Thu, 26 Sep 2019 06:21:12 +0000 (23:21 -0700)]
Merge "Fix to show eUICC preference in eng build" am:
e825c30137
am:
9e81a2f4a8
Change-Id: I777273344c8eb4f791756be7fcb9755a5bf9e8b8
Taesu Lee [Thu, 26 Sep 2019 06:14:10 +0000 (23:14 -0700)]
Merge "Fix to show eUICC preference in eng build"
am:
e825c30137
Change-Id: Ie6ca5a575e5c5caa4c841286421d037649765397
Treehugger Robot [Thu, 26 Sep 2019 05:53:10 +0000 (05:53 +0000)]
Merge "Fix to show eUICC preference in eng build"
Bill Yi [Wed, 25 Sep 2019 14:30:56 +0000 (07:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
500e7b2b71 -s ours
am skip reason: subject contains skip directive
Change-Id: I4a84a614577ee9558b05de1e30fe543ff2ece1d3
Bill Yi [Wed, 25 Sep 2019 01:54:26 +0000 (18:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
Daniel Huang [Tue, 24 Sep 2019 09:39:02 +0000 (02:39 -0700)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am:
51cb777530
am:
f28625bcf1
Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
Daniel Huang [Tue, 24 Sep 2019 09:32:29 +0000 (02:32 -0700)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
am:
51cb777530
Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
Daniel Huang [Tue, 24 Sep 2019 09:21:51 +0000 (09:21 +0000)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
Yi-Ling Chuang [Mon, 23 Sep 2019 03:09:51 +0000 (20:09 -0700)]
Merge "Enable dismissal feature on legacy suggestions." am:
ee39335edc
am:
8d8c3e19b5
Change-Id: I8fae05f98c2ad04e0d7fba7a2aa409c08f781c0b
Yi-Ling Chuang [Mon, 23 Sep 2019 03:03:21 +0000 (20:03 -0700)]
Merge "Enable dismissal feature on legacy suggestions."
am:
ee39335edc
Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
Treehugger Robot [Mon, 23 Sep 2019 02:45:25 +0000 (02:45 +0000)]
Merge "Enable dismissal feature on legacy suggestions."
Bill Yi [Sun, 22 Sep 2019 19:53:43 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
73915b77ed -s ours
am skip reason: subject contains skip directive
Change-Id: I31f45d935e2c9a13feb71186730b99fffc102c9b
Bill Yi [Sun, 22 Sep 2019 14:38:24 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
Yi-Ling Chuang [Thu, 19 Sep 2019 20:39:53 +0000 (13:39 -0700)]
Enable dismissal feature on legacy suggestions.
Add back the close button for legacy suggestions.
Fixes:
140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
è‹—è‹— (Miao Miao) [Tue, 17 Sep 2019 01:14:08 +0000 (09:14 +0800)]
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information
EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information
Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug:
141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
Neil Fuller [Tue, 17 Sep 2019 17:06:03 +0000 (10:06 -0700)]
Merge "Remove use of deprecated Time class" am:
b3f8696c4d
am:
b83ddefb5c
Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
Neil Fuller [Tue, 17 Sep 2019 16:56:45 +0000 (09:56 -0700)]
Merge "Remove use of deprecated Time class"
am:
b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
Treehugger Robot [Tue, 17 Sep 2019 16:32:47 +0000 (16:32 +0000)]
Merge "Remove use of deprecated Time class"
Neil Fuller [Tue, 17 Sep 2019 12:53:17 +0000 (13:53 +0100)]
Remove use of deprecated Time class
Remove a use of the deprecated Time class.
Bug:
16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
Bill Yi [Fri, 13 Sep 2019 00:28:33 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
Bill Yi [Thu, 12 Sep 2019 22:54:53 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
paulhu [Fri, 23 Aug 2019 09:18:58 +0000 (17:18 +0800)]
[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.
Bug:
32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
Bill Yi [Thu, 12 Sep 2019 05:50:29 +0000 (22:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8173de150d -s ours
am skip reason: subject contains skip directive
Change-Id: I010ba47035a6530ec5d50abd363a6ea013515551
Bill Yi [Thu, 12 Sep 2019 02:10:50 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
Xin Li [Wed, 11 Sep 2019 21:09:27 +0000 (14:09 -0700)]
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
am:
aac7f8e2cd -s ours
am skip reason: change_id Idcc078c0e541c04633db6d94c613ac4c861ba963 with SHA1
7195e05dfa is in history
Change-Id: I7826eee6fd99a83bf4e8a96bb51f0622fbdf84c3
Bill Yi [Wed, 11 Sep 2019 19:03:01 +0000 (12:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
09c08d1da0 -s ours
am skip reason: subject contains skip directive
Change-Id: I8a743a33b14e424069a75ac9d590ffca287300f1
TreeHugger Robot [Wed, 11 Sep 2019 18:41:53 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Bill Yi [Wed, 11 Sep 2019 05:24:00 +0000 (22:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1163141368fc482f675e7d9dd7b4503dfcd309bf
Bill Yi [Wed, 11 Sep 2019 03:15:44 +0000 (20:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
c1bfd1f50d -s ours
am skip reason: subject contains skip directive
Change-Id: Ie4a0625a623ccb37a3de288121c366d25c8ab946
Bill Yi [Wed, 11 Sep 2019 01:35:47 +0000 (18:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: Ife760913fdf573fb8820f604e90fae666cab08e5
joshmccloskey [Tue, 10 Sep 2019 06:20:15 +0000 (23:20 -0700)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
am:
ff01d52d50
Change-Id: I08e856f94da8ac0b1151d61e8717088672852f6a
TreeHugger Robot [Tue, 10 Sep 2019 06:02:39 +0000 (06:02 +0000)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
joshmccloskey [Mon, 9 Sep 2019 23:11:27 +0000 (16:11 -0700)]
Change cancel button type to skip for SUW
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes:
140702414
Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
Xin Li [Sun, 8 Sep 2019 20:06:57 +0000 (13:06 -0700)]
Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
Bug:
135460123
Change-Id: Ifbb4b45d2d592e4a4ede265d2c882dc1cb4a0410
Merged-In: Idcc078c0e541c04633db6d94c613ac4c861ba963
Bill Yi [Sat, 7 Sep 2019 00:51:15 +0000 (17:51 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
53e826122d -s ours
am skip reason: subject contains skip directive
Change-Id: I79de9a02a1f3aefd51e6d436b939fc562bf3af72
Bill Yi [Fri, 6 Sep 2019 16:27:30 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie16be62ead2b453c69d0201a5aa5e7ae3411405f
Taesu Lee [Mon, 22 Jul 2019 10:20:05 +0000 (19:20 +0900)]
Fix to show eUICC preference in eng build
DEVELOPMENT_SETTINGS_ENABLED is not set before entering Developer
options in settings app even if it is in eng build. To show eUICC
preference in eng build, uses isDevelopmentSettingsEnabled() instead.
Test: Manual and make RunSettingsRoboTests
Change-Id: Ia1f46fad94bc62ca48dcfef7cd5d6188766aa380
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Bill Yi [Fri, 6 Sep 2019 01:30:03 +0000 (18:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e2f5f9b876 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib855906069bdfa6390895a92091cb28dbe9fd943
Bill Yi [Fri, 6 Sep 2019 00:10:26 +0000 (17:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: I162cbffdd4239b49c258bae8df318f7c4ebd0643
Joshua Mccloskey [Thu, 5 Sep 2019 22:59:59 +0000 (15:59 -0700)]
Merge "Modified text to cancel enrollment" into qt-r1-dev
am:
fde49ec3ad
Change-Id: I9f412f3eebda4dde2995932ad2ca2a16e2d2a82a
Joshua Mccloskey [Thu, 5 Sep 2019 22:44:12 +0000 (22:44 +0000)]
Merge "Modified text to cancel enrollment" into qt-r1-dev
Xin Li [Thu, 5 Sep 2019 21:05:27 +0000 (14:05 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am:
d7a8e234e9 -s ours
am:
377369bd0d
Change-Id: Id7cae58babeb74b53bc047a2098fe05b06fbc066
Xin Li [Thu, 5 Sep 2019 20:32:29 +0000 (13:32 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am:
d7a8e234e9 -s ours
am skip reason: subject contains skip directive
Change-Id: I3a3eb2d8dfa2a3a55c55445bffa5ae5565a5ad5d
Joshua Mccloskey [Thu, 5 Sep 2019 20:17:36 +0000 (13:17 -0700)]
Merge "Updated security settings string." into qt-r1-dev
am:
b7ac44e643
Change-Id: Ife05eee951852b471138afb3f73fd4e153cc9d43
joshmccloskey [Wed, 4 Sep 2019 19:44:56 +0000 (12:44 -0700)]
Modified text to cancel enrollment
Fixes:
140446388
Test: Manual.
Change-Id: If3f0affb390743cd7973957b5dea69d5e012dcb1
Joshua Mccloskey [Thu, 5 Sep 2019 19:22:29 +0000 (19:22 +0000)]
Merge "Updated security settings string." into qt-r1-dev
Xin Li [Thu, 5 Sep 2019 16:53:18 +0000 (16:53 +0000)]
Merge "DO NOT MERGE - Merge Android 10 into master"
Xin Li [Wed, 4 Sep 2019 20:34:43 +0000 (13:34 -0700)]
DO NOT MERGE - Merge Android 10 into master
Bug:
139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
joshmccloskey [Tue, 3 Sep 2019 23:33:39 +0000 (16:33 -0700)]
Updated security settings string.
Test: Manual.
Bug:
140445577
Change-Id: Ie31132dcfcc10a8970b32c1a9bd082990560a353
Bill Yi [Sat, 31 Aug 2019 01:57:28 +0000 (18:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
d595d265f0 -s ours
am skip reason: subject contains skip directive
Change-Id: Ifea9af76e490aafd88aabea7515a69de7e3e2301
Bill Yi [Fri, 30 Aug 2019 23:49:34 +0000 (16:49 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I59f54fe4b2f22bb52495436350e1c7e3cf02e800
android-build-team Robot [Tue, 27 Aug 2019 01:42:59 +0000 (01:42 +0000)]
Merge cherrypicks of [
9276111,
9276209,
9275845,
9276210,
9276238,
9276239,
9276211,
9276212,
9276240] into qt-c2f2-release
Change-Id: I45413bfa9c192aacfcf992a9767d7e6cecf66181
Bonian Chen [Thu, 22 Aug 2019 09:13:06 +0000 (17:13 +0800)]
[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
(cherry picked from commit
128de7bdb61b02202b72c8cb6fefceecdb2bdad0)
Bill Yi [Mon, 26 Aug 2019 17:57:36 +0000 (10:57 -0700)]
[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
Bill Yi [Mon, 26 Aug 2019 17:55:23 +0000 (10:55 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
18183ad552 -s ours
am skip reason: subject contains skip directive
Change-Id: Idfa1574adf65da278f9f428610e30c0c258d915b
Bill Yi [Mon, 26 Aug 2019 17:54:50 +0000 (10:54 -0700)]
[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
Bill Yi [Mon, 26 Aug 2019 17:48:23 +0000 (10:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2a7b5e2abc -s ours
am skip reason: subject contains skip directive
Change-Id: Id5178f84c020fa9a56f7159f44df89f7c069c5f9
Bill Yi [Mon, 26 Aug 2019 17:47:40 +0000 (10:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2a7b5e2abc -s ours
am skip reason: subject contains skip directive
Change-Id: Ie41ed82249c2c5296d1bb030e37518bcbf1bcb5b
Bill Yi [Mon, 26 Aug 2019 11:50:21 +0000 (04:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I21b57a34501c5882af563b0026d52940cc70b3bc
Bill Yi [Mon, 26 Aug 2019 11:36:33 +0000 (04:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Iea44d6e2097aff936635e25e2cc2f241ef34f121
Xin Li [Sat, 24 Aug 2019 09:03:02 +0000 (02:03 -0700)]
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am:
bd8030e8b2 -s ours
am:
aba2be1b76
Change-Id: I7c2e196f3226c93937b990e0a2ca0daf44ea8722
OSDN Git Service
