OSDN Git Service
Raff Tsai [Fri, 25 Oct 2019 02:08:08 +0000 (19:08 -0700)]
Merge "Skip loading contextual cards if legacy cards are used" am:
c53771e80a am:
81e9c58691
am:
9dbbf88d14
Change-Id: I52f7724fc50af20888d31821dc56732186a07c84
Raff Tsai [Fri, 25 Oct 2019 01:58:01 +0000 (18:58 -0700)]
Merge "Skip loading contextual cards if legacy cards are used" am:
c53771e80a
am:
81e9c58691
Change-Id: I09b7f37f094c24144b0448f2e7f820cffd5ddadd
Raff Tsai [Fri, 25 Oct 2019 01:51:50 +0000 (18:51 -0700)]
Merge "Skip loading contextual cards if legacy cards are used"
am:
c53771e80a
Change-Id: Idae5d4948edc9767afae23f2fcbbd522410654b5
Raff Tsai [Fri, 25 Oct 2019 01:35:20 +0000 (01:35 +0000)]
Merge "Skip loading contextual cards if legacy cards are used"
Lucas Lin [Wed, 23 Oct 2019 10:20:15 +0000 (03:20 -0700)]
Merge "Improve the wifi description for the case of private DNS broken" am:
37b17ae752 am:
5eda5a3e7f
am:
9b29332cd3
Change-Id: I3cd916c67afaebfd62863301eca5f6aeb8b0d1c5
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:56:02 +0000 (09:56 -0700)]
Merge "translate="false" -> translatable="false"" am:
b333e79df9 am:
90f0230b54
am:
f72fb5a049
Change-Id: I75dcf19b087d98eb328a33138daecd7bd25b5d1a
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
Daniel Hunt [Wed, 9 Oct 2019 09:51:01 +0000 (11:51 +0200)]
Skip loading contextual cards if legacy cards are used
This stops a jarring animation that occurs when returning to the
settings top level when legacy contextual cards are enabled and
shown at the top of the top level list,
Bug:
142936956
Test: Manual
Change-Id: I43605adf6f1bf63cc40157ac97c8e3295dd3cd99
Bill Yi [Sat, 19 Oct 2019 11:56:30 +0000 (04:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
476d82715a -s ours
am skip reason: subject contains skip directive
Change-Id: I22006097e4ff21843030e9bac2138c9d2c5b56f3
Bill Yi [Sat, 19 Oct 2019 07:50:29 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d35ecce542fee9f4f6367d2a11a4cca2d4b4b60
Auto-generated-cl: translation import
Anamika Singh [Fri, 18 Oct 2019 09:01:54 +0000 (02:01 -0700)]
Merge "Move Emergency call button" am:
2501f6e268 am:
251411674b
am:
32f4f10d4a
Change-Id: I5457a7f278db3a87a22696d0a698a5aaf861e148
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"
Yi-Ling Chuang [Thu, 17 Oct 2019 04:09:58 +0000 (21:09 -0700)]
Merge "Fix non responding slice toggling problem." into qt-qpr1-dev
am:
5956f903cb
Change-Id: I2235eeb55d9ebcaaac399956d854471779c23b31
TreeHugger Robot [Thu, 17 Oct 2019 01:32:14 +0000 (01:32 +0000)]
Merge "Fix non responding slice toggling problem." into qt-qpr1-dev
Raff Tsai [Tue, 15 Oct 2019 18:36:40 +0000 (11:36 -0700)]
Merge "Make sure close button has proper color" am:
0f9ad6d7f9 am:
2bb6e54317
am:
f35dddaef5
Change-Id: Ie3330395e2c214b56b92cc44ae464ad7d2f48425
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:30:34 +0000 (10:30 -0700)]
DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am:
acfebe21ac
am:
c789e737f8
Change-Id: I0dc7cbba09c4e1405c61e68442a43fe4d703bf0a
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:45:38 +0000 (00:45 -0700)]
[automerger skipped] Merge changes Ifaed6ca8,I4a78e2e7,I945d3c2f,Ia0d1333c,I5dfe4843 am:
bc6a65ca32 am:
951e9b7742
am:
9507e5f2f9 -s ours
am skip reason: change_id Ifaed6ca8aba8f34ecb27abb863aeaf679132934f with SHA1
dfd9aa99e5 is in history
Change-Id: I8f79a9268e0ccef959e3802406b22cffb86a8f0e
SongFerngWang [Mon, 14 Oct 2019 07:45:30 +0000 (00:45 -0700)]
[automerger skipped] Preferred network list add 5G item am:
76422cab68 am:
10d41f52b7
am:
24b3051e9b -s ours
am skip reason: change_id I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90 with SHA1
dd7f9b57f6 is in history
Change-Id: I2c6e54c59018227081f896beef1fca68dc7fa322
SongFerngWang [Mon, 14 Oct 2019 07:45:23 +0000 (00:45 -0700)]
[automerger skipped] RadioInfo network mode list and network mode string add 5G am:
dc5149efef am:
8cd10f774d
am:
fae02cf405 -s ours
am skip reason: change_id I945d3c2fd175f45151bbeee475e388ccc2d67642 with SHA1
ec384c2f6f is in history
Change-Id: Id95745ca4710f72232d472ae89c64741002e811a
Bonian Chen [Mon, 14 Oct 2019 07:45:14 +0000 (00:45 -0700)]
[automerger skipped] [Settings] hide preferred network mode UI am:
92eb42c69e am:
b36ff74ac3 -s ours
am:
ef55302465 -s ours
am skip reason: change_id Ia0d1333c6cbae3a3717c8db6b77fbb9ea8cec968 with SHA1
128de7bdb6 is in history
Change-Id: I1c4d75ea62efd825f4cd4ac3fecf2c9e4b5288fc
Antony Sargent [Mon, 14 Oct 2019 07:45:06 +0000 (00:45 -0700)]
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am:
aa88b8cee6 -s ours am:
0f1b14e467 -s ours
am:
5a4c8856bc -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1
6d910e8608 is in history
Change-Id: I5a90bf84d360c22f21e0fc830f480e9c7fb11d01
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
SongFerngWang [Fri, 11 Oct 2019 15:16:03 +0000 (08:16 -0700)]
String "CDME" is wrong
am:
dfd9aa99e5
Change-Id: I6d3dab30dbd9282a3a6589efebbf5e08a1359c4a
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong
Bug:
142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
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
Android Build Merger (Role) [Sun, 6 Oct 2019 22:10:28 +0000 (22:10 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
aa605a2ff8 -s ours am:
6fa03d4cad -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Sun, 6 Oct 2019 22:10:17 +0000 (15:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
aa605a2ff8 -s ours
am:
6fa03d4cad -s ours
am skip reason: subject contains skip directive
Change-Id: I907eb3de51fb2427bc525282a87ceea97581815c
Bill Yi [Sun, 6 Oct 2019 22:10:15 +0000 (15:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
aa605a2ff8 -s ours
am:
165a3e6152 -s ours
am skip reason: subject contains skip directive
Change-Id: I22a3b3c49c309e7ccd9424f16841722fd1a228b0
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 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: I67820e45b4aceb3a9d3c141cc3be69e899551e2e
Bill Yi [Sun, 6 Oct 2019 20:21:35 +0000 (13:21 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
42eff7e319 -s ours
am skip reason: subject contains skip directive
Change-Id: I35cc62652e4cb9c2a7448b1db141cbba125c6f04
TreeHugger Robot [Sun, 6 Oct 2019 19:48:23 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
SongFerngWang [Sun, 6 Oct 2019 16:20:09 +0000 (09:20 -0700)]
Preferred network list add 5G item
am:
dd7f9b57f6
Change-Id: I70f89c6c5e5c43107788c58f1fc3ca44383b4ce5
SongFerngWang [Sun, 6 Oct 2019 16:20:06 +0000 (09:20 -0700)]
RadioInfo network mode list and network mode string add 5G
am:
ec384c2f6f
Change-Id: I280fb1f3e0acddcb3a85eee876112e491bd4f8f4
Bill Yi [Sun, 6 Oct 2019 14:50:11 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4fdf91f299defd2a361d76455093db5a410d0d6
Auto-generated-cl: translation import
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
Yi-Ling Chuang [Fri, 27 Sep 2019 04:21:59 +0000 (12:21 +0800)]
Fix non responding slice toggling problem.
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.
Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to prevent from
getting PendingIntent.CancelExcpetion from SliceActionView when toggling
slices.
Note that this change would only apply on Wifi, MobileData, Flashlight
and Bluetooth Slices.
Bug:
140719905
Test: rebuild and switch toggles
Change-Id: Iddbb16ddcbcf97b6f6e680b43645c04fbc061f39
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
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
Bill Yi [Thu, 3 Oct 2019 17:13:25 +0000 (10:13 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ccd0c91498 -s ours
am skip reason: subject contains skip directive
Change-Id: I2f2bcc99472507969722b03882633814370e3e10
Bill Yi [Wed, 2 Oct 2019 23:55:04 +0000 (16:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33d1ef5a92b84fc166b35f7b5b341e7a92b35820
Auto-generated-cl: translation import
Bonian Chen [Wed, 2 Oct 2019 02:53:31 +0000 (19:53 -0700)]
Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev
am:
556b34d03d
Change-Id: Ibffb60c57aa4152b4681f3fe95dae7175f2e878e
Bonian Chen [Wed, 2 Oct 2019 02:44:34 +0000 (02:44 +0000)]
Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev
Bill Yi [Wed, 2 Oct 2019 00:07:00 +0000 (17:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
d57831b7d2 -s ours
am skip reason: subject contains skip directive
Change-Id: Idf60f77bdffa5efdd33d01c20f4e12076f9b9b87
Bill Yi [Tue, 1 Oct 2019 23:05:46 +0000 (16:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
141777841
Change-Id: I5ef0e8ee2f723c81d4cc1c0be5daf311c7c38e84
Bill Yi [Tue, 1 Oct 2019 22:18:03 +0000 (15:18 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
833512a1d2 -s ours
am skip reason: subject contains skip directive
Change-Id: I20fe79ea6a6f6b3fd54da7ab03eaa233913287c1
Joshua Mccloskey [Tue, 1 Oct 2019 22:17:26 +0000 (15:17 -0700)]
Merge "Added new string." into qt-qpr1-dev
am:
262f5fe91f
Change-Id: If8467461e0963648886c02159353c177e9b88d41
TreeHugger Robot [Tue, 1 Oct 2019 22:08:03 +0000 (22:08 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Joshua Mccloskey [Tue, 1 Oct 2019 22:05:41 +0000 (22:05 +0000)]
Merge "Added new string." into qt-qpr1-dev
Bill Yi [Tue, 1 Oct 2019 19:53:15 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I594742575ea6729d9c71e0ef04658f6513875aaf
Auto-generated-cl: translation import
Bonian Chen [Mon, 9 Sep 2019 07:10:13 +0000 (15:10 +0800)]
[Settings Telephony] Carrier name API replacement
Replacing TelephonyManager.getNetworkOperatorName() by
Obtaining carrier name from SubscriptionInfo.getCarrierName().
TelephonyManager.getNetworkOperatorName() only be used when there's no
SubscriptionInfo can be found.
Bug: b/
140443508
Test: Manual testing
atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
Paul Hu [Tue, 1 Oct 2019 10:15:14 +0000 (03:15 -0700)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am:
a67ca4cfd7 am:
3a728ae13b
am:
a6dadc465b
Change-Id: I08a04f4e627ce876a3cabd194a9838a0b5ce8459
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"
Bill Yi [Mon, 30 Sep 2019 19:42:10 +0000 (12:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0631ad6efb -s ours
am skip reason: subject contains skip directive
Change-Id: I1338a125768855043cf83c6c5c759b470e12e7d4
Bill Yi [Mon, 30 Sep 2019 10:35:57 +0000 (03:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10e5b04a3a580ba34f945305d011ac192a3c4dd3
Auto-generated-cl: translation import
Bill Yi [Sat, 28 Sep 2019 21:16:37 +0000 (14:16 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
b01e0ab05c -s ours
am skip reason: subject contains skip directive
Change-Id: Ie644497f111a2029d99a700b6333d3dec43fa948
TreeHugger Robot [Sat, 28 Sep 2019 21:05:31 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sat, 28 Sep 2019 11:11:34 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfb9ca3c6ddf6aa0a9bc04a262b8e0fd76032867
Auto-generated-cl: translation import
joshmccloskey [Fri, 27 Sep 2019 23:41:36 +0000 (16:41 -0700)]
Changed string for translations.
am:
186dbc65af
Change-Id: Id48a469817c96a13ac1311792ad4b8bcd61fe88f
joshmccloskey [Fri, 27 Sep 2019 22:09:05 +0000 (15:09 -0700)]
Added new string.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
joshmccloskey [Fri, 27 Sep 2019 21:54:38 +0000 (14:54 -0700)]
Changed string for translations.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: Ieebb2ec15cf5cff2afcfefcb130193bdce6086fe
Kevin Chyn [Fri, 27 Sep 2019 08:07:02 +0000 (01:07 -0700)]
Fix FaceSetupSliceTest
am:
acde97cf90
Change-Id: Ied72d5ae4b891ef1c5600b8d416b016d0aede23e
Kevin Chyn [Fri, 27 Sep 2019 05:01:56 +0000 (22:01 -0700)]
Fix FaceSetupSliceTest
Bug:
141380252
Test: make -j56 RunSettingsRoboTests
Change-Id: Ifb9a29d8f3115759a9e8e93e3721135c6ba229bf
joshmccloskey [Fri, 27 Sep 2019 03:06:48 +0000 (20:06 -0700)]
Added different flow for re-enrollment
am:
bba7632f28
Change-Id: Ie5174848a3a35df197177b0aa2cf6c324813b8dd
joshmccloskey [Thu, 19 Sep 2019 18:23:29 +0000 (11:23 -0700)]
Added different flow for re-enrollment
In order to enable this new flow, a user must currently have an enrolled
face and the security setting face_unlock_re_enroll must be non-zero.
Ex.
1. Enroll Face.
2. adb shell settings put
(secure face_unlock_re_enroll|secure_face_unlock_must_re_enroll) 1
3. If settings is opened, close it.
4. Open settings
5. Verify the new flow appears.
Bug:
141380252
Bug:
141254937
Test: Verified that the user's face is deleted after clicking delete.
Test: Verified that the user can re-enroll after removing their face.
Change-Id: I2b36a0bda5cb10fb33dfb2a5627d8fa40f14fb7e
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:28:11 +0000 (23:28 -0700)]
Merge "Fix to show eUICC preference in eng build" am:
e825c30137 am:
9e81a2f4a8
am:
c4c8f51bb0
Change-Id: I58dae46adec67c855a5e26542d75d15f116c37dc
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
OSDN Git Service
