PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,855 Commits 1 Branch 0 Tags
ed6008efa8cb6443a0d874b2646f48802699258c
Commit Graph

59855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
afc604fa72 Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb am: 8715ccf4fb am: fe7b3665f5 
Change-Id: I16b871fff4c436fa53f777a161cd925210e9661c
 2020-02-28 00:53:59 +00:00
Automerger Merge Worker
bf96e8290f Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: cafa42b471 am: e08c48dc07 
Change-Id: I91b3d5e5b81a48947eb892e4311464e65846ffb5
 2020-02-28 00:45:47 +00:00
Automerger Merge Worker
c279547e70 Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb am: 7761f504ec 
Change-Id: I0a741fc6c4766b4d402cb50886a6a45fa6505f21
 2020-02-28 00:44:40 +00:00
Automerger Merge Worker
fe7b3665f5 Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb am: 8715ccf4fb 
Change-Id: I716906ac12b07da82783c7f91529bd68c14dc2cd
 2020-02-28 00:41:29 +00:00
Automerger Merge Worker
e08c48dc07 Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: cafa42b471 
Change-Id: I44de7c62b4b20437e27c25b9875319790ccebec2
 2020-02-28 00:36:07 +00:00
Automerger Merge Worker
8715ccf4fb Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb 
Change-Id: I4ca5c4f5ada31f40e1efb460366833afd06f97ce
 2020-02-28 00:34:30 +00:00
Automerger Merge Worker
7761f504ec Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 am: eb036399eb 
Change-Id: I8470280421e805d398236550a668afa5829c18d6
 2020-02-28 00:34:28 +00:00
Automerger Merge Worker
cafa42b471 Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 
Change-Id: Idc5e7757dcfc019be48b268f8730541f9cd8706e
 2020-02-28 00:27:15 +00:00
Automerger Merge Worker
eb036399eb Merge "Support updated rendering of conversation icons." into rvc-dev am: c1f6891ef3 
Change-Id: I1c94629f0d01ada4c0a6444ab11aa685a7414f4b
 2020-02-28 00:26:23 +00:00
Daniel Sandler
c1f6891ef3 Merge "Support updated rendering of conversation icons." into rvc-dev 2020-02-28 00:26:10 +00:00
Nathan Harold
b10babebd0 Optimize NetworkScan for only User-Enabled RANs 
Network scans comprise multiple different access
technologies, and scanning each of those techs can
be very time consuming. Worse, depending on a user's
settings, the device may only be allowed to connect
to 2G, 2G+3G, or 2G+3G+4G networks. If a scan finds
network types that a user can't connect to, it also
creates a poor user experience if a user tries to
select those network types.

This CL restricts the scans to only find and return
results that a user can select based on the other
user settings.

Bug: 128572818
Test: manual (crosshatch) - set allowed networks to
 2G+3G and verify that LTE networks are not returned.
 Set allowed networks to 2G+3G+4G and verify that LTE
 networks are returned.

Merged-In: Ic855100723b8604c1e872457a70fd8f25d225278
Change-Id: Ic855100723b8604c1e872457a70fd8f25d225278
(cherry picked from commit bda277b3b6)
 2020-02-27 16:10:19 -08:00
Sarah Chin
77dea1beb0 Rename calls to isGlobalModeEnabled 
Test: atest FrameworksTelephonyTests
Bug: 148603998
Change-Id: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6
 2020-02-27 16:00:13 -08:00
Xin Li
9fe7d6c59b DO NOT MERGE - Skip QQ2A.200305.003 in stage-aosp-master 
Bug: 150410372
Change-Id: I5a62dae10a3c5d0b6fd38c364cf38a39de021e2d
 2020-02-27 15:45:16 -08:00
Xin Li
28f9734a4a Skip QQ2A.200113.001 in stage-aosp-master 
Bug: 146167222
Change-Id: I28eeb421d0e76d44f825436d0e4a61badd7e866d
 2020-02-27 15:36:13 -08:00
Automerger Merge Worker
844fd7fffc Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 am: bbab2a3873 am: 6a8012fc7b 
Change-Id: If4be37cc791972571d1a2a5957e8d80ca17e622a
 2020-02-27 22:12:26 +00:00
Automerger Merge Worker
4e4ecd98d1 Merge "Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0 am: 32ab3a1853" into rvc-qpr-dev-plus-aosp am: 23150c4195 
Change-Id: Ied78899fe6bfd026efb6087e6a5b3830255b1689
 2020-02-27 22:11:28 +00:00
Automerger Merge Worker
9324131eea Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 am: 81a89153f0 am: 37dc275e08 
Change-Id: I71f31cb280d756020bfa9a64c56916b816991233
 2020-02-27 22:10:09 +00:00
Automerger Merge Worker
6a8012fc7b Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 am: bbab2a3873 
Change-Id: Ib20b72e1dc8d1845b83f6aec4cf53059728b5f39
 2020-02-27 21:58:38 +00:00
Automerger Merge Worker
23150c4195 Merge "Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0 am: 32ab3a1853" into rvc-qpr-dev-plus-aosp 2020-02-27 21:57:18 +00:00
Automerger Merge Worker
a5120ebc95 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0 am: 32ab3a1853 
Change-Id: Id63b2dc5510323742947e6cefac2c1a98508f65a
 2020-02-27 21:57:15 +00:00
Automerger Merge Worker
37dc275e08 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 am: 81a89153f0 
Change-Id: I00144920b20fe8d470bb3c2d790be39c591dbd96
 2020-02-27 21:57:12 +00:00
Automerger Merge Worker
bbab2a3873 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 
Change-Id: I1e26b6f490b721c7f6926cf5a0b3888a38223597
 2020-02-27 21:50:12 +00:00
Automerger Merge Worker
32ab3a1853 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 4d3c4518e0 
Change-Id: Ib8df9d0b2ed001e302ddd22229f1de0f88ff06eb
 2020-02-27 21:47:25 +00:00
Automerger Merge Worker
81a89153f0 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 am: 52be7605c1 
Change-Id: I6c648118389e8f6830ac939528d6f8c2609fa52c
 2020-02-27 21:46:41 +00:00
Nathan Harold
07f739f737 Merge "Optimize NetworkScan for only User-Enabled RANs" 2020-02-27 21:35:06 +00:00
Automerger Merge Worker
4d3c4518e0 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 
Change-Id: Iebe5c8a425ac02ed99ea8fd468e870cdf6ddac19
 2020-02-27 21:34:45 +00:00
Automerger Merge Worker
52be7605c1 Merge "Unhide work profile icon" into rvc-dev am: 7b9101e6a8 
Change-Id: I76f743fcdd60e45fd5fc8084d86efd8005c33dbc
 2020-02-27 21:34:25 +00:00
Julia Reynolds
7b9101e6a8 Merge "Unhide work profile icon" into rvc-dev 2020-02-27 21:27:08 +00:00
Automerger Merge Worker
717e5692af Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: c86e3124d4 am: 07d2bbaa8a am: c4bd8fec2c 
Change-Id: Id0df49edaf3ff642f27688e103d0541659aafe9c
 2020-02-27 16:43:35 +00:00
Automerger Merge Worker
334c6bbd09 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: d6b261c49e am: 5ebc70225e 
Change-Id: I05a9b69ec115ee430666882b328a4b6ff1e8f752
 2020-02-27 16:41:53 +00:00
Automerger Merge Worker
3eef202c8a Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: 54933e3bb5 am: 117f719ba6 
Change-Id: I7ae5f0f93719189d6005a99b47a9575e47a8c51d
 2020-02-27 16:39:42 +00:00
Alex Johnston
251b06086e Merge "Add policy transparency dialog to 'Remove work profile'" 2020-02-27 16:22:31 +00:00
Automerger Merge Worker
c4bd8fec2c Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: c86e3124d4 am: 07d2bbaa8a 
Change-Id: I8f7c114e6f7a97e31df48a3a79ca0b85add07df3
 2020-02-27 16:19:41 +00:00
Automerger Merge Worker
5ebc70225e Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: d6b261c49e 
Change-Id: I7116d882593e821cd36dccad83a274356f55e68f
 2020-02-27 16:18:44 +00:00
Automerger Merge Worker
117f719ba6 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 am: 54933e3bb5 
Change-Id: I8dea224359f1cf862fe30493f16e97d435820893
 2020-02-27 16:16:56 +00:00
Julia Reynolds
323e9315d3 Unhide work profile icon 
Test: Manual, dismiss work profile notif, look at history
Fixes: 150361222
Change-Id: I7bf17b400f084f5e1a0763c2b6d1ebe69c78b9c2
 2020-02-27 11:12:46 -05:00
Automerger Merge Worker
54933e3bb5 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 
Change-Id: I69ec23901a68268f03fdb718a4ca02781a34e1ac
 2020-02-27 15:58:57 +00:00
Automerger Merge Worker
07d2bbaa8a Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: c86e3124d4 
Change-Id: Ibc384b968d9821763dffb077bc60d5a2cb36eb08
 2020-02-27 15:58:54 +00:00
Automerger Merge Worker
d6b261c49e Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 am: 15dbc718e1 
Change-Id: I38cf1e8f818084261759f2aca0c9d21f2c34e82d
 2020-02-27 15:58:41 +00:00
Automerger Merge Worker
c86e3124d4 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 
Change-Id: I97d2c2c3e80af00c64a54cfb7a6c0e844b2610a6
 2020-02-27 15:49:31 +00:00
Automerger Merge Worker
15dbc718e1 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev am: 0c3bd003d0 
Change-Id: I6db41bb009930b62191d6066bfc4fcb958b66b2d
 2020-02-27 15:49:26 +00:00
James Lin
0c3bd003d0 Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." into rvc-dev 2020-02-27 15:37:22 +00:00
Daniel Hunt
26aaf07e9d Fix NPE in PanelFragment 
When updating the panel after getting a second intent to the
activity, there is a small window of opportunity for the user
to close the activity before the animation ends, causing an
NPE when onFinish is called as the activity already closed down.
This change will check that there is an activity before trying
to finish it.

Bug: 150322041
Test:
For an easy way to reproduce this, turn the screen on and run the
following in a terminal:
 while true; do adb shell am start -a \
 android.settings.panel.action.INTERNET_CONNECTIVITY; \
 sleep 0.1; done
Then press the back button while the screen is attempting to
display the fragment. There should be no Settings crash.
Change-Id: I4ca831d71a7221a7a4a62bb29e802f507ce5213c
 2020-02-27 15:47:38 +01:00
Automerger Merge Worker
7ed34c1e6d Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 0c94f7f87e am: ac3216adc3 
Change-Id: Ia37b7553ce58a08819e29cb2a098f7a4e19908c6
 2020-02-27 12:14:50 +00:00
Automerger Merge Worker
55a6b61549 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e am: 594f014fa3 am: 226be880c9 
Change-Id: I04597f2721a8ddf3fb014b0425a46927e49f5092
 2020-02-27 12:14:44 +00:00
Automerger Merge Worker
501870039b Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 764a7eb922 am: 8c8c9d7bfc 
Change-Id: I731e2cbb4da3ad88c999a0f0bd07bdb8b4ace90c
 2020-02-27 12:14:34 +00:00
Automerger Merge Worker
ac3216adc3 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 0c94f7f87e 
Change-Id: Ib2383d97abb176dd2437d543f8d149a7114a34e6
 2020-02-27 12:02:32 +00:00
Automerger Merge Worker
226be880c9 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: d2750a8d0e am: 594f014fa3 
Change-Id: I2aaa8009cdf337be63c50e1b8d51c641f8c62ef2
 2020-02-27 12:02:28 +00:00
Automerger Merge Worker
8c8c9d7bfc Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 am: 764a7eb922 
Change-Id: I871ff8341511d56977f1927fd969a6201cc1ce31
 2020-02-27 12:02:19 +00:00
Automerger Merge Worker
0c94f7f87e Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde am: 5c5d6ce282 
Change-Id: Iec4002f07c246c21d0796652a30ce22e86c83d7a
 2020-02-27 11:47:56 +00:00