Edgar Wang
514d74621a
Correct confirm message in Reset options -> Erase all data(factory rest)
...
- when device doesn't support esim, don't mention SIM in sub-title.
Bug: 151899712
Test: manual
Change-Id: Id9f7b1e73173a5a623206f785894f5579a0c2151
2020-03-25 16:17:40 +08:00
Zhen Zhang
c04eec3c10
Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev am: c37fcd0cb8 am: a12da1ba40
...
Change-Id: I459b29cdfabe5e517d6cf2a31b1902fadb399573
2020-03-25 08:03:55 +00:00
Zhen Zhang
97dcb7dfac
Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev am: c37fcd0cb8 am: e3892d4d8d
...
Change-Id: I64708099ca0d328f4d493b63ca4cfd9e7b414f19
2020-03-25 08:03:55 +00:00
Zhen Zhang
fb5a490371
Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev am: c37fcd0cb8 am: a12da1ba40
...
Change-Id: I9a84a10f0aab8d9b3a059eb2a89c998041aafab4
2020-03-25 08:03:17 +00:00
Zhen Zhang
e3892d4d8d
Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev am: c37fcd0cb8
...
Change-Id: Ieb2d2f950d9d6f43ba712d2220d5e66d9b1d5beb
2020-03-25 07:42:49 +00:00
Zhen Zhang
a12da1ba40
Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev am: c37fcd0cb8
...
Change-Id: I692fd1c378fc3c1518b9b62138043557bd4b04e3
2020-03-25 07:42:16 +00:00
Zhen Zhang
c37fcd0cb8
Merge changes Ibd2f4111,Ia6cc60bc into rvc-dev
...
* changes:
Fix crash in AllInOneTetherSettings when user is not admin
Refactor new tether settings to remove SharedPreferences
2020-03-25 07:25:07 +00:00
TreeHugger Robot
8d2f98a29c
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: 31bd47a36c am: a02e32c408 am: ad049718ef
...
Change-Id: I3c2f9ea13f07288cfc0f408576f41b371e0d216f
2020-03-25 06:43:42 +00:00
TreeHugger Robot
216071d3eb
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: d32790d616 am: b1d3dfe467
...
Change-Id: I4ec0ac5dd4ca942c16207d60d067c25f172bb550
2020-03-25 06:27:36 +00:00
TreeHugger Robot
ad049718ef
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: 31bd47a36c am: a02e32c408
...
Change-Id: Ibbbe704a1ee427f93fb20840d02e1495b05e061e
2020-03-25 06:27:22 +00:00
TreeHugger Robot
8cc6f609ac
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: 31bd47a36c am: 461dfb3889
...
Change-Id: I0ae0de85c56c8aca94222627c09db7554062ed82
2020-03-25 06:27:22 +00:00
Menghan Li
5f938f1a78
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: 9b306bb73e am: d898d71ba1
...
Change-Id: Ic27d114313c6aeb57aef5a05e363829dca3fc1ec
2020-03-25 06:14:56 +00:00
TreeHugger Robot
b1d3dfe467
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: d32790d616
...
Change-Id: Ibb9246361e614dab3bc5f408c053a3f55605e6be
2020-03-25 06:14:50 +00:00
TreeHugger Robot
a02e32c408
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: 31bd47a36c
...
Change-Id: I4cffe0ecd0cd9c5a375e1e56a29c391386596dac
2020-03-25 06:14:37 +00:00
TreeHugger Robot
461dfb3889
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8 am: 31bd47a36c
...
Change-Id: Id8480c4860dce7eb0de13c80565d200615ff457a
2020-03-25 06:14:10 +00:00
Menghan Li
937594aecf
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: cf48a06391 am: d9821fda4c
...
Change-Id: Icf3e068fb7a0b0aa4507e0df1d1979bccf1a1aae
2020-03-25 06:03:32 +00:00
Menghan Li
ee6b74de12
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: cc7f9e781f
...
Change-Id: Ibf78e5342d57b7d55cebf2862cf106bb35a91a9e
2020-03-25 06:03:18 +00:00
Menghan Li
d898d71ba1
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a am: 9b306bb73e
...
Change-Id: Iae596894030282f562db02bc54ef8e93aab3a280
2020-03-25 06:02:54 +00:00
TreeHugger Robot
d32790d616
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8
...
Change-Id: I660927a464cfb4cd45bee5ff05ab720ce1485d6f
2020-03-25 05:56:18 +00:00
TreeHugger Robot
31bd47a36c
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev am: 6045790df8
...
Change-Id: I72c85e1c369f335ec678c40a9fd0bad8fbd8be6f
2020-03-25 05:55:43 +00:00
Menghan Li
d9821fda4c
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: cf48a06391
...
Change-Id: I8f09e68381dc85809b0959558f79ac0123635b9f
2020-03-25 05:49:22 +00:00
Menghan Li
9b306bb73e
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a
...
Change-Id: I7f645782778726318beaad59cba18d380526d2f3
2020-03-25 05:48:57 +00:00
Menghan Li
cc7f9e781f
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be am: f84c49f13a
...
Change-Id: I831ad7fedeb62267949f5685839f42f68cc0090d
2020-03-25 05:47:59 +00:00
TreeHugger Robot
6045790df8
Merge "Remove MobileNetworkSettingsTest#onAttach" into rvc-dev
2020-03-25 05:44:07 +00:00
Menghan Li
cf48a06391
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be
...
Change-Id: I39827e0788e207b7d670f77303b964cf6923ce61
2020-03-25 05:36:46 +00:00
Jack Yu
f5b6614485
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f -s ours am: e3d56edd8b -s ours am: 73a4b1dbbd -s ours
...
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2
2020-03-25 05:36:32 +00:00
Menghan Li
f84c49f13a
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev am: f9f732e3be
...
Change-Id: Idc56795f80561051b73cc36cb6c3174b67626815
2020-03-25 05:36:20 +00:00
Menghan Li
f9f732e3be
Merge "Enlarge the touch area of edit shortcut dialog" into rvc-dev
2020-03-25 05:23:44 +00:00
Jack Yu
73a4b1dbbd
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f -s ours am: e3d56edd8b -s ours
...
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2
2020-03-25 05:15:27 +00:00
Bonian Chen
97a1bf9c61
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: 243d1a61b7 am: c8cb51a422
...
Change-Id: I8263653c202eb546b9a3650f17de296b46d47c40
2020-03-25 05:14:56 +00:00
SongFerng Wang
2f901a72f7
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: f30fa1c861 am: f90f7cf31b
...
Change-Id: If740b309c96cfacb4a91da2b2d5771db566de791
2020-03-25 05:14:49 +00:00
Jack Yu
e3d56edd8b
[automerger skipped] Merge "Added slot index in area info broadcast" am: 07f1ec2cca am: d1cd033f6f -s ours
...
am skip reason: Change-Id Icd1bcc2fa905bae6b0f2220e9a27178711bac0c7 with SHA-1 5a4dabcba2
2020-03-25 05:00:44 +00:00
Bonian Chen
f8693e511a
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: fdca269a5e am: 082ce97eba
...
Change-Id: I311499c5d91a6bd89c2ca4cf737708973f0f8d3d
2020-03-25 05:00:31 +00:00
SongFerng Wang
13f59bc23c
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: a2fea961c2 am: f58b07ae72
...
Change-Id: I2600b0cc513cc2efb10e7f4f7489ea8bab4a866c
2020-03-25 05:00:22 +00:00
Bonian Chen
8f9c9e6402
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: ff7dc60895
...
Change-Id: Iff72ccacfbead5cdc1bcc297cc15dd529526eff7
2020-03-25 05:00:13 +00:00
Bonian Chen
c8cb51a422
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6 am: 243d1a61b7
...
Change-Id: I54bd6dbc2c85aaf6f7edac03cde57e9d160f1659
2020-03-25 04:59:46 +00:00
SongFerng Wang
869883bcd8
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: 3d28629f5e
...
Change-Id: I3dc6fa3c7a6c8fbf0f9a6f87895aa5777a7bb64c
2020-03-25 04:59:41 +00:00
SongFerng Wang
f90f7cf31b
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6 am: f30fa1c861
...
Change-Id: Id223e18fbe00e4eb1f35c379929620dd30b9abbb
2020-03-25 04:59:37 +00:00
Bonian Chen
082ce97eba
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: fdca269a5e
...
Change-Id: I5666b526b7113dce4ab004ea34f92df1cc57071d
2020-03-25 04:51:45 +00:00
Bonian Chen
243d1a61b7
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6
...
Change-Id: Ic5c58238e13d1b235125c34badaccdf7196930f8
2020-03-25 04:51:36 +00:00
SongFerng Wang
f58b07ae72
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: a2fea961c2
...
Change-Id: I56a1f5911a3e1b31f030a8392e5e41289bbb7744
2020-03-25 04:51:27 +00:00
SongFerng Wang
f30fa1c861
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6
...
Change-Id: Ia7332d609bd40646005985fd296876d4f44a3c1e
2020-03-25 04:51:26 +00:00
Bonian Chen
ff7dc60895
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05 am: 0f4345cdf6
...
Change-Id: Ibce5efebb8c0fd20471811f7cd5ce324a5b347c1
2020-03-25 04:51:01 +00:00
SongFerng Wang
3d28629f5e
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c am: e8604065d6
...
Change-Id: I2bb4ec5e524099f1d3fccf53e55dcca27d1e0ad6
2020-03-25 04:50:42 +00:00
SongFerngWang
199ee2cbb0
Remove MobileNetworkSettingsTest#onAttach
...
The MobilieNetworkActivity has MobileNetworkSettings fragment. The
MobileNetworkActivityTest do testcases for activity stability.
The activity's launch test successful is equals the fragment doesn't
crash, so the activity's testcases cover
MobileNetworkSettingsTest#onAttach.
Bug: 147464840
Test: build pass
Change-Id: Idbabb846c40fd117f22a39b86fd6628b7d8c5b1b
2020-03-25 04:44:14 +00:00
Jack Yu
d1cd033f6f
Merge "Added slot index in area info broadcast" am: 07f1ec2cca
...
Change-Id: Iaab7b201cd25d3854031d65ce828829108b427c4
2020-03-25 04:42:15 +00:00
Bonian Chen
fdca269a5e
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
...
Change-Id: I11095d23554c38e431bef78aee0665853367a8dd
2020-03-25 04:42:03 +00:00
Bonian Chen
0f4345cdf6
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev am: f9bb3b4d05
...
Change-Id: I82b04e8dadd3559c7d12d6bba1df7cd2e968c89b
2020-03-25 04:41:24 +00:00
Bonian Chen
f9bb3b4d05
Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev
2020-03-25 04:35:04 +00:00
SongFerng Wang
a2fea961c2
Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
...
Change-Id: Ic3357eec640d4023714877a555dcc82dec3fe67c
2020-03-25 04:34:36 +00:00
