PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,253 Commits 1 Branch 0 Tags
050918c710a504fac4ae039c5d5cf1f55271f82f
Commit Graph

54253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
050918c710 [automerger skipped] Import translations. DO NOT MERGE am: 2a7b5e2abc -s ours am: acd8a48b6c -s ours 
am: 0a4c821751 -s ours
am skip reason: subject contains skip directive

Change-Id: I89dda01cb409f7eba0d8e31e8ef76baf22bc9a87
 2019-08-26 12:53:09 -07:00
Xin Li
353864df86 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bd8030e8b2 -s ours am: aba2be1b76 
am: cfb15a41ff

Change-Id: I1a9e295c603ad011d184abb3fba2389174286f31
 2019-08-26 12:37:17 -07:00
Xin Li
64f11bf200 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9 -s ours am: 657ac4e451 
am: 2b7dd17756

Change-Id: I3e80710150b862745a3469c762e4028a4fa23299
 2019-08-26 11:39:51 -07:00
Jayachandran Chinnakkannu
f51fdf64a9 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev am: 7afb9854a7 
am: b5617b6f21

Change-Id: Ia137a3f3454cff7af7c3aa7195eb89c049fadaf2
 2019-08-26 11:39:22 -07:00
Bill Yi
0a4c821751 [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
 2019-08-26 10:54:50 -07:00
Bill Yi
acd8a48b6c [automerger skipped] Import translations. DO NOT MERGE 
am: 2a7b5e2abc -s ours
am skip reason: subject contains skip directive

Change-Id: Ie41ed82249c2c5296d1bb030e37518bcbf1bcb5b
 2019-08-26 10:47:40 -07:00
Bill Yi
3f81ee5f55 [automerger skipped] Import translations. DO NOT MERGE 
am: 9781a780e4 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9c07a0e7ae93ab863f31bacdd6447c9118af59a
 2019-08-26 10:45:16 -07:00
Bill Yi
9781a780e4 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Icd19559f196f76e42d29fe3d9e77bf92d7376a07
 2019-08-26 05:04:21 -07:00
Bill Yi
2a7b5e2abc Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Iea44d6e2097aff936635e25e2cc2f241ef34f121
 2019-08-26 04:36:33 -07:00
Xin Li
cfb15a41ff [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master am: bd8030e8b2 -s ours 
am: aba2be1b76

Change-Id: I7c2e196f3226c93937b990e0a2ca0daf44ea8722
 2019-08-24 02:03:02 -07:00
Xin Li
aba2be1b76 [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
 2019-08-24 01:17:05 -07:00
Xin Li
2b7dd17756 [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history am: f92905cfe9 -s ours 
am: 657ac4e451

Change-Id: Iec169be2f57b78f76972516d013f637772a0be4a
 2019-08-23 21:22:31 -07:00
Jayachandran Chinnakkannu
b5617b6f21 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev 
am: 7afb9854a7

Change-Id: I561ecbcd376ac4be2003e291f5528130673460fd
 2019-08-23 20:36:56 -07:00
Xin Li
657ac4e451 [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
 2019-08-23 20:35:43 -07:00
Jayachandran Chinnakkannu
7afb9854a7 Merge "[Settings] hide preferred network mode UI" into qt-r1-dev 2019-08-24 00:09:32 +00:00
Xin Li
bd8030e8b2 DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master 
Bug: 139893257
Change-Id: I54b340294458df6016b7893838e1b0f6e61daf11
 2019-08-23 06:45:17 +00:00
Xin Li
f92905cfe9 DO NOT MERGE - Merge build QP1A.190711.001 into stage-aosp-master history 
Bug: 139893257
Change-Id: Iff267db7ff7312a786dc5004a7421b395da178a9
 2019-08-23 06:42:10 +00:00
Arc Wang
ea15072a94 Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev 
am: 318be48d07

Change-Id: I6a33141d8e12a3a16d723b506c986eff941956c9
 2019-08-22 22:23:57 -07:00
TreeHugger Robot
318be48d07 Merge "[Wi-Fi] Support hidden SSID Wi-Fi networks for Wi-Fi QR code scanner & generator" into qt-qpr1-dev 2019-08-23 05:04:35 +00:00
Bonian Chen
128de7bdb6 [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
 2019-08-22 14:36:12 -07:00
Bill Yi
5e5109e304 [automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours 
am: 92c5a4fafd -s ours
am skip reason: subject contains skip directive

Change-Id: Id650db71b5de1ed86c95a02122870032118ff84b
 2019-08-22 09:12:05 -07:00
Android Build Merger (Role)
fa115507c2 Merge "[automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours am: 32c8779c92 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp 2019-08-22 16:11:12 +00:00
Bill Yi
7f6847335c [automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: b227fad96a -s ours 
am: 32c8779c92 -s ours
am skip reason: subject contains skip directive

Change-Id: I2607c02aad32924424cf3c4a2c291a928869db42
 2019-08-22 09:10:56 -07:00
Bill Yi
496b257e51 [automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours am: 1f8f4362c4 -s ours 
am: 7aaf659356 -s ours
am skip reason: subject contains skip directive

Change-Id: I787acbcfe6a89991220b6a0560f8cf7aa8320f88
 2019-08-22 09:10:54 -07:00
Bill Yi
92c5a4fafd [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
 2019-08-22 08:56:32 -07:00
Bill Yi
7aaf659356 [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
 2019-08-22 08:55:21 -07:00
Bill Yi
32c8779c92 [automerger skipped] Import translations. DO NOT MERGE am: e6c59cd920 -s ours 
am: b227fad96a -s ours
am skip reason: subject contains skip directive

Change-Id: I7257f9247032fe4fe119610faf8c7df27122c365
 2019-08-22 08:54:33 -07:00
Bill Yi
1f8f4362c4 [automerger skipped] Import translations. DO NOT MERGE 
am: e6c59cd920 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib440f82e3fe673be9aaa79557166119689d7446e
 2019-08-22 08:40:37 -07:00
Bill Yi
b227fad96a [automerger skipped] Import translations. DO NOT MERGE 
am: e6c59cd920 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib9cd51789b9d1d747295f27f94905eca862b87d0
 2019-08-22 08:40:36 -07:00
SongFerng Wang
f1a5d8a08a Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev 
am: 201fc40816

Change-Id: I76ac45fbc93bf01bbc4783fecfd3eed8b9dbb6d2
 2019-08-22 03:01:21 -07:00
SongFerng Wang
201fc40816 Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev 2019-08-22 09:49:27 +00:00
Bill Yi
e6c59cd920 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I2995bfc89e4a39074ec7f05d1425054dfb39c8f6
 2019-08-22 02:42:58 -07:00
Bill Yi
cb63528d1f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 
am: 1407d45e3b -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6d964bd3a2c17fdb8469ffdb63fc18c87dab93b
 2019-08-21 17:25:32 -07:00
TreeHugger Robot
1407d45e3b Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-08-21 23:32:19 +00:00
Bill Yi
ca93f79957 [automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44 -s ours 
am: 075385c12e -s ours
am skip reason: subject contains skip directive

Change-Id: Ie8dffbd617990f1b7bf853be1adf2f54dbda932f
 2019-08-21 16:18:33 -07:00
Bill Yi
7ef83b488d [automerger skipped] Import translations. DO NOT MERGE am: 91ca872a44 -s ours 
am: 1b7486fe92 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic867e1efd3ccb97bcd7bc53c3185eb8d29feeb9a
 2019-08-21 16:17:47 -07:00
Bill Yi
1b7486fe92 [automerger skipped] Import translations. DO NOT MERGE 
am: 91ca872a44 -s ours
am skip reason: subject contains skip directive

Change-Id: I29b799f65bf043aa22b31b363c5a1660ca28210e
 2019-08-21 16:09:36 -07:00
Bill Yi
075385c12e [automerger skipped] Import translations. DO NOT MERGE 
am: 91ca872a44 -s ours
am skip reason: subject contains skip directive

Change-Id: I72351a3f496967c2ef6e6a4e457a4d30d5b70955
 2019-08-21 16:06:39 -07:00
Bill Yi
1815f5a534 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 138829927
Change-Id: Ibebcce851f08b7cc14d8707305f2c21b29e7dfc0
 2019-08-21 15:12:57 -07:00
Hyunyoung Song
bc09dd7921 Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev 
am: 9f4093daef

Change-Id: I2fa81a5397c4033361e821d7d42d2c57e1c8e36f
 2019-08-21 15:06:45 -07:00
Hyunyoung Song
20148f679e [DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791 
am: 84c67f5fd6

Change-Id: Ie612828734b6aed98b51048af9c5d98ea70f41c4
 2019-08-21 14:40:45 -07:00
TreeHugger Robot
9f4093daef Merge "[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791" into qt-qpr1-dev 2019-08-21 21:19:19 +00:00
Bill Yi
91ca872a44 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ia404cdb510ff6c09446362da5ca1738f20bcc9fe
 2019-08-21 12:57:11 -07:00
Hyunyoung Song
84c67f5fd6 [DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791 
Test: presubmit setup on source branch
Change-Id: I4ff876bd5e711e04be5148008fdaa6ef29df0cbe
 2019-08-21 16:05:31 +00:00
andychou
34fc2495d2 If the user add APN with empty APN type, map it for default type 
Original behavior will map all APN type if enter empty APN type. But it
sometimes cause problem that MMS or IMS not working when select to this
custom APN. So if the user doesn't enter any APN type, just map to
valure of carrier config 'apn_settings_default_apn_types_string_array'
to avoid all the functions broken.

Bug: 129704611
Test: 1.Enter empty APN type and check if only default is added into
APN. 2.atest ApnEditorTest pass.
Change-Id: Icec274e5b402af06822479bcc60294b347f5254f
 2019-08-21 21:20:49 +08:00
Goven Liu
fe3548ef41 Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev 
am: cfcfb024c4

Change-Id: If72465328b970ce0d8e9d0c69f0a229a528bdbee
 2019-08-20 22:36:09 -07:00
Goven Liu
cfcfb024c4 Merge "[Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog" into qt-qpr1-dev 2019-08-21 05:13:49 +00:00
govenliu
14a74125e6 [Wi-Fi NetworkRequest] Set theme for the NetworkRequest dialog 
We should set the same theme which applied in Settings APP to the NetworkRequestDialog

Bug: 139294487
Test: check if the right theme is applied when launching this activity.
Change-Id: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
Merged-In: Iefdfd5b810f5cf22c220830e1ee965113a439a3e
 2019-08-21 12:23:32 +08:00
Bill Yi
10ca16aebb [automerger skipped] Import translations. DO NOT MERGE 
am: 1dea02439a -s ours
am skip reason: subject contains skip directive

Change-Id: I88d487b3d8c48f58461e47ddc9b96eaedef311bf
 2019-08-20 17:27:05 -07:00
Bill Yi
1dea02439a Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I79a6c2c9db40e5198b2bbe60f23d4d2e40f5ab19
 2019-08-20 15:26:43 -07:00