Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,203 Commits 1 Branch 0 Tags
d1b2de5bfab67a9061fa31465ed1eac388a89440
Commit Graph

51203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amit Mahajan
d1b2de5bfa [automerger skipped] Merge "Treat mcx apn type as not wild-cardable." am: 61841ba690 am: afa7f96768 -s ours 
am: 54bc89029c -s ours
am skip reason: change_id Ic3e643646491e5a187505fd54ca767ad91e285f5 with SHA1 2fa0b7ed85 is in history

Change-Id: If5442a67f21d1a7d9e726e7e98936861b0b64df7
 2019-04-09 20:52:26 -07:00
Fan Zhang
54156e760c Merge "Do not retrive app detail if the fragment is exiting." into qt-dev am: dda677cf77 
am: 19f3c372f5

Change-Id: Ia5d69ec098d9abdc14714bb6221319b8a9b6f446
 2019-04-09 20:32:45 -07:00
Antony Sargent
2dafa9d54c Merge "Use helper method for determining whether eSIM is supported" into qt-dev am: 5840e1e1cd 
am: 550e5cb88d

Change-Id: I1ebb74f860e479161c24dd9c58b54ff535d5cf2f
 2019-04-09 20:31:45 -07:00
Lei Yu
e830d20de0 Merge "Move bitmap recycle to onDestroy()" into qt-dev am: 72a162a17c 
am: 2ba8f2a98d

Change-Id: I9bfc0afe6b13d0c4ae17c460c5638d3973f56a3d
 2019-04-09 20:21:20 -07:00
Amit Mahajan
0c40ebafb0 Merge "Treat mcx apn type as not wild-cardable." into qt-dev am: 125fe8ae9f 
am: c9651a21ad

Change-Id: I06258d9377b9fc44cb6495b2df0f20d01655115d
 2019-04-09 18:28:23 -07:00
Amit Mahajan
54bc89029c [automerger skipped] Merge "Treat mcx apn type as not wild-cardable." am: 61841ba690 
am: afa7f96768 -s ours
am skip reason: change_id Ic3e643646491e5a187505fd54ca767ad91e285f5 with SHA1 2fa0b7ed85 is in history

Change-Id: I00ba2c885d3e9a4ac7d6257f0fddc3ca17bc979e
 2019-04-09 17:56:14 -07:00
Fan Zhang
19f3c372f5 Merge "Do not retrive app detail if the fragment is exiting." into qt-dev 
am: dda677cf77

Change-Id: Ia6c5033a82ca5a79e6209758ddf2f7209790c4f7
 2019-04-09 17:48:37 -07:00
Antony Sargent
550e5cb88d Merge "Use helper method for determining whether eSIM is supported" into qt-dev 
am: 5840e1e1cd

Change-Id: I2678177d182e7948f487495b0c56f24227d0a80a
 2019-04-09 17:47:30 -07:00
Amit Mahajan
afa7f96768 Merge "Treat mcx apn type as not wild-cardable." 
am: 61841ba690

Change-Id: I422e025bcacbae3f0c52b71f3e21d3881a42d553
 2019-04-09 17:32:34 -07:00
Lei Yu
2ba8f2a98d Merge "Move bitmap recycle to onDestroy()" into qt-dev 
am: 72a162a17c

Change-Id: I32ba09bd99cf35669378b5febb0bdb328bfec19e
 2019-04-09 17:21:41 -07:00
Amit Mahajan
61841ba690 Merge "Treat mcx apn type as not wild-cardable." 2019-04-10 00:08:43 +00:00
Amit Mahajan
c9651a21ad Merge "Treat mcx apn type as not wild-cardable." into qt-dev 
am: 125fe8ae9f

Change-Id: I20676a7bee156c2894377bda52ae8a8e8a0dbaa0
 2019-04-09 15:44:29 -07:00
Amit Mahajan
ac0244e572 Treat mcx apn type as not wild-cardable. 
Test: manual
Bug: 130167974
Merged-in: Ic3e643646491e5a187505fd54ca767ad91e285f5
Change-Id: Ic3e643646491e5a187505fd54ca767ad91e285f5
(cherry picked from commit 2fa0b7ed85)
 2019-04-09 14:52:48 -07:00
Jordan Liu
8eb02d1e18 Merge "Do not reuse phonestatelistener" 2019-04-09 21:39:12 +00:00
TreeHugger Robot
dda677cf77 Merge "Do not retrive app detail if the fragment is exiting." into qt-dev 2019-04-09 21:19:24 +00:00
TreeHugger Robot
5840e1e1cd Merge "Use helper method for determining whether eSIM is supported" into qt-dev 2019-04-09 20:45:10 +00:00
sj.cha
44191cc4b0 Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 70cae1ce8d am: 2c0ba8b48e 
am: 26412bb907

Change-Id: I88f6a19992c80342cd86d1ab031662a6e8824339
 2019-04-09 13:29:09 -07:00
Lei Yu
72a162a17c Merge "Move bitmap recycle to onDestroy()" into qt-dev 2019-04-09 20:23:48 +00:00
TreeHugger Robot
125fe8ae9f Merge "Treat mcx apn type as not wild-cardable." into qt-dev 2019-04-09 20:18:03 +00:00
Antony Sargent
bab7e3a3ee Merge "Use active instead of available subscriptions in 2 places" into qt-dev am: e4669acc91 
am: f1129f72ef

Change-Id: Ie3a1be80a34e934669398e987ee83fdfb4385dab
 2019-04-09 12:47:43 -07:00
sj.cha
26412bb907 Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 70cae1ce8d 
am: 2c0ba8b48e

Change-Id: I853372683440048c16141b0fb2b46bbc6f27e972
 2019-04-09 11:44:05 -07:00
Antony Sargent
f1129f72ef Merge "Use active instead of available subscriptions in 2 places" into qt-dev 
am: e4669acc91

Change-Id: Id0c2d5b231bdbcda06cd99172783f8c23df61401
 2019-04-09 11:41:26 -07:00
Yi-Ling Chuang
ba4aed4897 Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev am: 8b3cde0fb1 
am: 4b6479bcf7

Change-Id: I4f69ba0dca1521987f87cc918d5746157eb1b644
 2019-04-09 11:33:24 -07:00
Antony Sargent
f5bc241627 Use helper method for determining whether eSIM is supported 
It turns out to be more complicated than I had thought to determine if a
device should be considered to support eSIM. But the good news is that
we already had a helper method for this - this CL switches to using it
in some code for DSDS UI.

Fixes: 129061243
Test: make RunSettingsRoboTests
Change-Id: I41e500eb70b6c6b725c0ddf09fe1ca1a69df4563
 2019-04-09 11:31:08 -07:00
Yi-Ling Chuang
3b53d2f98f Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev am: a31acac404 
am: 2bb41176cf

Change-Id: I180a8b423fa9d9823418d8e462931a97a5f14f75
 2019-04-09 11:24:18 -07:00
sj.cha
2c0ba8b48e Merge "Fix code for NPE when click add and cancel repeatly VPN profile" 
am: 70cae1ce8d

Change-Id: Ie18c7977bb0c48ba5f9524130cbe6649f8840153
 2019-04-09 11:20:55 -07:00
TreeHugger Robot
e4669acc91 Merge "Use active instead of available subscriptions in 2 places" into qt-dev 2019-04-09 18:01:30 +00:00
Yi-Ling Chuang
3cffcbacab Merge "Only enable feedback dialog in debuggable build." into qt-dev am: 3a9707b81a 
am: e2aea6ffcd

Change-Id: I1303bd76cd6764781242993ab9a9e04ab6de943f
 2019-04-09 10:48:54 -07:00
Treehugger Robot
70cae1ce8d Merge "Fix code for NPE when click add and cancel repeatly VPN profile" 2019-04-09 17:46:23 +00:00
Yi-Ling Chuang
4b6479bcf7 Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev 
am: 8b3cde0fb1

Change-Id: Ia9747b66b6e5f4ed332d979fcf6ecbe692bc5180
 2019-04-09 10:45:10 -07:00
Yi-Ling Chuang
2bb41176cf Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev 
am: a31acac404

Change-Id: Ibf89f70e45518ff4b6a99a745949661715d2149e
 2019-04-09 10:44:08 -07:00
Linda Tseng
3682bf3950 Merge "Fix panel slices title not updated when locale changed" into qt-dev am: 3ec5e76c86 
am: 7b50cf0192

Change-Id: Iccf7e20ed68074c3590962f2d2e4649b2c834488
 2019-04-09 10:41:37 -07:00
Jordan Liu
9bc2a584f6 Do not reuse phonestatelistener 
Due to b/117555407, the same PhoneStateListener object can not be used
to register on different subIds, so we workaround this by recreating
the PhoneStateListener when reregistering.

Fixes: 129989656
Test: manual
Change-Id: I9d6631da628351511e285afeb5b6d4331aaab7e5
 2019-04-09 10:31:41 -07:00
Yi-Ling Chuang
e2aea6ffcd Merge "Only enable feedback dialog in debuggable build." into qt-dev 
am: 3a9707b81a

Change-Id: Idb97798f0b10c5be584c15934486bec32492c7b7
 2019-04-09 10:20:07 -07:00
Linda Tseng
7b50cf0192 Merge "Fix panel slices title not updated when locale changed" into qt-dev 
am: 3ec5e76c86

Change-Id: Ia65ba2136400b6657275704d5e3d7f2b46751db4
 2019-04-09 10:18:20 -07:00
TreeHugger Robot
8b3cde0fb1 Merge "Remove viewFlipper used in contextual card dismissal." into qt-dev 2019-04-09 17:11:40 +00:00
TreeHugger Robot
a31acac404 Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev 2019-04-09 17:11:11 +00:00
TreeHugger Robot
3a9707b81a Merge "Only enable feedback dialog in debuggable build." into qt-dev 2019-04-09 17:00:13 +00:00
Linda Tseng
3ec5e76c86 Merge "Fix panel slices title not updated when locale changed" into qt-dev 2019-04-09 16:57:26 +00:00
Julia Reynolds
ff125d11bc Merge "Move NAS selection to 'special app access'" into qt-dev am: 8bf3ab9d5c 
am: b8fa1028ac

Change-Id: I12da431dd30328c274199c99552326057864dce7
 2019-04-09 08:21:39 -07:00
Pasty Chang
00665b615f Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev am: 6ffdbb6096 
am: 614d0cce2b

Change-Id: I8bc28dc7d3c943e62f0fc35918f69c88a91cfb26
 2019-04-09 08:05:39 -07:00
Julia Reynolds
b8fa1028ac Merge "Move NAS selection to 'special app access'" into qt-dev 
am: 8bf3ab9d5c

Change-Id: Ie408690b2352eda4cbb9549bb62df856a01d1fbe
 2019-04-09 06:12:51 -07:00
Julia Reynolds
8bf3ab9d5c Merge "Move NAS selection to 'special app access'" into qt-dev 2019-04-09 12:56:40 +00:00
Pasty Chang
614d0cce2b Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev 
am: 6ffdbb6096

Change-Id: Ic60b4336b3e651681691b540db7a6239602ec5e6
 2019-04-09 05:32:03 -07:00
Pasty Chang
6ffdbb6096 Merge "Add strings used for setupwizard lockscreen skip dialog" into qt-dev 2019-04-09 11:53:00 +00:00
Arc Wang
a7d67bc2a6 Merge "Should not decode Wi-Fi QR code after onPause" into qt-dev am: d50bb09876 
am: ce9e61ee8e

Change-Id: Id0da8742a507462e16f549afeae2b36dd47f0fc3
 2019-04-09 04:07:33 -07:00
Clown SHEN
9671f4f3fc Merge "Redraw WiFi detail page's header icon" into qt-dev am: 740dd43700 
am: 31d150d16b

Change-Id: I16d6185e6321a3d39120e09aa0b7575a157dec89
 2019-04-09 03:32:43 -07:00
Hai Zhang
b56125843e Merge changes from topic "role-replace" into qt-dev am: 0aa0d665c0 
am: b3299e654e

Change-Id: Iea7316880d6edb7b29d976f7caf54746add9b096
 2019-04-09 03:28:48 -07:00
Fan Zhang
d532430fc6 Merge "Add null check in UserPreference" into qt-dev am: c11f792795 
am: 9e9fccd707

Change-Id: Ib08b3d7dfb140a22ae7661f89291999c51e5553d
 2019-04-09 03:27:55 -07:00
Arc Wang
787e37b962 Merge "Supports to share Wi-Fi networks of WPA3 security SAE & OWE via QR code generator" into qt-dev am: 48ed84ebf4 
am: 01a26124d7

Change-Id: I7dc26c8ebd15fc07c994e97b0eff4d4108f59b75
 2019-04-09 03:26:56 -07:00