OSDN Git Service
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"
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
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
Xin Li [Sat, 24 Aug 2019 08:17:05 +0000 (01:17 -0700)]
[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
Xin Li [Sat, 24 Aug 2019 04:22:31 +0000 (21:22 -0700)]
[automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am:
f92905cfe9 -s ours
am:
657ac4e451
Change-Id: Iec169be2f57b78f76972516d013f637772a0be4a
Jayachandran Chinnakkannu [Sat, 24 Aug 2019 03:36:56 +0000 (20:36 -0700)]
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
am:
7afb9854a7
Change-Id: I561ecbcd376ac4be2003e291f5528130673460fd
Xin Li [Sat, 24 Aug 2019 03:35:43 +0000 (20:35 -0700)]
[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
Jayachandran Chinnakkannu [Sat, 24 Aug 2019 00:09:32 +0000 (00:09 +0000)]
Merge "[Settings] hide preferred network mode UI" into qt-r1-dev
Xin Li [Fri, 23 Aug 2019 06:45:17 +0000 (06:45 +0000)]
DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug:
139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
Xin Li [Fri, 23 Aug 2019 06:42:10 +0000 (06:42 +0000)]
DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history
Bug:
139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
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
Bill Yi [Thu, 22 Aug 2019 15:56:32 +0000 (08:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e6c59cd920 -s ours
am:
b227fad96a -s ours
am skip reason: subject contains skip directive
Change-Id: Ie130f1213412043590b081561fa371dc98158dc7
Bill Yi [Thu, 22 Aug 2019 15:55:21 +0000 (08:55 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e6c59cd920 -s ours
am:
1f8f4362c4 -s ours
am skip reason: subject contains skip directive
Change-Id: I8d520cc26e8315f8bbb6eb1694547dfab1bc4e0a
Bill Yi [Thu, 22 Aug 2019 15:40:37 +0000 (08:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e6c59cd920 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib440f82e3fe673be9aaa79557166119689d7446e
Bill Yi [Thu, 22 Aug 2019 15:40:36 +0000 (08:40 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e6c59cd920 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0
Bill Yi [Thu, 22 Aug 2019 09:42:58 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2995bfc89e4a39074ec7f05d1425054dfb39c8f6
Bill Yi [Wed, 21 Aug 2019 23:09:36 +0000 (16:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
91ca872a44 -s ours
am skip reason: subject contains skip directive
Change-Id: I29b799f65bf043aa22b31b363c5a1660ca28210e
Bill Yi [Wed, 21 Aug 2019 19:57:11 +0000 (12:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
Bill Yi [Tue, 20 Aug 2019 20:36:38 +0000 (13:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ba8880dd87 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic0805579cd91f4ec10fb11c34dfe3ca652a43f50
Bill Yi [Tue, 20 Aug 2019 17:52:47 +0000 (10:52 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
139484065
Change-Id: I6c50b4480bec5326951eb809eabc7194d1d06b65
Kevin Chyn [Tue, 20 Aug 2019 02:57:37 +0000 (19:57 -0700)]
Merge "Remove attention controller" into qt-r1-dev
am:
41aafab963
Change-Id: I31966ea8f672f664a4d1feae8be30eb47d0a2d32
TreeHugger Robot [Tue, 20 Aug 2019 02:37:20 +0000 (02:37 +0000)]
Merge "Remove attention controller" into qt-r1-dev
Kevin Chyn [Mon, 19 Aug 2019 22:09:00 +0000 (15:09 -0700)]
Merge "Remove delay from enroll start button" into qt-r1-dev
am:
ca2bbdfeca
Change-Id: Ide066e65d76c70175ade9ebeaf94e471cb11c806
Kevin Chyn [Mon, 19 Aug 2019 21:50:22 +0000 (21:50 +0000)]
Merge "Remove delay from enroll start button" into qt-r1-dev
Bill Yi [Sat, 17 Aug 2019 16:45:16 +0000 (09:45 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
7892f729a5 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia2280686d74a66951529c333f5c7e6a05d989208
TreeHugger Robot [Sat, 17 Aug 2019 16:30:21 +0000 (16:30 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
Arc Wang [Sat, 17 Aug 2019 14:18:03 +0000 (07:18 -0700)]
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
am:
54dbed859d
Change-Id: I0d5071d429dbd82d420e1199bd5baed0b687e2ae
TreeHugger Robot [Sat, 17 Aug 2019 13:58:53 +0000 (13:58 +0000)]
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
Bill Yi [Sat, 17 Aug 2019 08:35:46 +0000 (01:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
Kevin Chyn [Fri, 16 Aug 2019 23:40:39 +0000 (16:40 -0700)]
Remove delay from enroll start button
Fixes:
139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Kevin Chyn [Sat, 17 Aug 2019 02:43:00 +0000 (19:43 -0700)]
Merge "Update attention string" into qt-r1-dev
am:
e218dc0517
Change-Id: Id6f6bb10ef8a9bcb96e03da291df3f054bda5f32
Kevin Chyn [Sat, 17 Aug 2019 02:01:31 +0000 (02:01 +0000)]
Merge "Update attention string" into qt-r1-dev
Arc Wang [Mon, 12 Aug 2019 12:11:13 +0000 (20:11 +0800)]
[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.
This fix check the setting of active subscription and shows the preference.
Bug:
138956509
Test: CellularFallbackPreferenceControllerTest
manual test:
1. Insert feature supported SIM and check UI.
2. Remove feature supported SIM and check UI.
3. Turn airplane mode on and check 1. and 2..
Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
Kevin Chyn [Thu, 15 Aug 2019 23:48:39 +0000 (16:48 -0700)]
Remove attention controller
Bug:
139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
Kevin Chyn [Fri, 16 Aug 2019 23:34:01 +0000 (16:34 -0700)]
Update attention string
Bug:
139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
Xin Li [Thu, 15 Aug 2019 07:50:19 +0000 (00:50 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am:
1e53efc4c4 -s ours am:
b03fdd4dcf -s ours
am:
e66eb255ee
Change-Id: I34d560cf4bdd6b47e0a45c070185ba3f4eaa1f52
Xin Li [Thu, 15 Aug 2019 07:40:41 +0000 (00:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am:
1e53efc4c4 -s ours
am:
b03fdd4dcf -s ours
am skip reason: subject contains skip directive
Change-Id: I8b48996bdb25fda1adb55fcb63a3956dddbb8710
Xin Li [Thu, 15 Aug 2019 07:25:54 +0000 (00:25 -0700)]
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am:
1e53efc4c4 -s ours
am skip reason: subject contains skip directive
Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e
Xin Li [Thu, 15 Aug 2019 07:16:41 +0000 (00:16 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am:
c3ef16882d -s ours am:
f8c25b6ac4 -s ours
am:
f62f61cbfb
Change-Id: I6b798a4044f146cad1f6824e17aa82f80521251f
Xin Li [Thu, 15 Aug 2019 06:52:30 +0000 (23:52 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am:
c3ef16882d -s ours
am:
f8c25b6ac4 -s ours
am skip reason: subject contains skip directive
Change-Id: Ieeffd5db1009f7dda5b595f3a6790ec1f2ce6db8
Xin Li [Thu, 15 Aug 2019 06:32:21 +0000 (23:32 -0700)]
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
am:
c3ef16882d -s ours
am skip reason: subject contains skip directive
Change-Id: I1d1b46e30a9ec5b4e01f351342fe45ac64994d47