Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,276 Commits 1 Branch 0 Tags
b701190f5f8373cfc1925725e3e1cddd405e634e
Commit Graph

59276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
b701190f5f Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 am: c3ab634078 
Change-Id: I220ddabc30a23574d294c903922da7c269b1985a
 2020-03-01 03:47:11 +00:00
Automerger Merge Worker
c3ab634078 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev am: 3248376473 
Change-Id: Ic92989a2d2a096c06d59039b6359e869855edf84
 2020-03-01 03:34:09 +00:00
tim peng
3248376473 Merge "Change volume panel title from "Volume" to "Sound"" into rvc-dev 2020-03-01 03:22:29 +00:00
Automerger Merge Worker
cb914954a7 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 
Change-Id: I19ab18c1e05dc1f559351de60057e2281aa3f790
 2020-02-29 05:52:30 +00:00
Automerger Merge Worker
90551d0a85 Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 
Change-Id: Iea24224c2f7137619e7faf123914cb360283da05
 2020-02-29 05:38:56 +00:00
TreeHugger Robot
9229504fe2 Merge "Fix notification history crash & layout" into rvc-dev 2020-02-29 05:23:07 +00:00
Julia Reynolds
291ee404c2 Fix notification history crash & layout 
- Fix occasional crash on device boot
- No more overlapping text

Test: manual
Fixes: 150326599
Fixes: 149767075
Change-Id: I3032a2913f2ca4ce57af596c180faa819e4c9363
 2020-02-28 16:16:44 -05:00
Automerger Merge Worker
bad7d5578b Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec am: d858122105 
Change-Id: I020c2888494297e7ff381d745a80ff8a452ea801
 2020-02-28 17:11:31 +00:00
Automerger Merge Worker
d858122105 Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev am: f7fe2b0dec 
Change-Id: I4f4f4356a2b481a18b5aeffdcd72c4f0a23658a2
 2020-02-28 16:56:34 +00:00
Sarah Chin
f7fe2b0dec Merge "Optimize NetworkScan for only User-Enabled RANs" into rvc-dev 2020-02-28 16:48:41 +00:00
Automerger Merge Worker
c311369f40 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 am: 54575ffdfa 
Change-Id: Id380c299d304da18a1be5678529b62b9fe32f674
 2020-02-28 16:34:23 +00:00
Automerger Merge Worker
54575ffdfa Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev am: fc2939ddd1 
Change-Id: I689d269de3bbc9e96f6999721d99a1b6986b8dfb
 2020-02-28 16:22:28 +00:00
TreeHugger Robot
fc2939ddd1 Merge "[Wi-Fi] Ignore incorrect user certificates" into rvc-dev 2020-02-28 16:14:33 +00:00
Automerger Merge Worker
e86b816046 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b am: 9f61f4e415 
Change-Id: Id80601383e934bc6f8f4ad5991f5272fdf4f65c9
 2020-02-28 15:48:24 +00:00
Automerger Merge Worker
c3b12f302b Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 am: d5e10793e5 
Change-Id: I37e25bf184114eef9367c1a2844cbf6a7632ef01
 2020-02-28 15:48:01 +00:00
Automerger Merge Worker
9f61f4e415 Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev am: c2153e244b 
Change-Id: I6963808bde5c96e4ee93ef72de3135409a7947d2
 2020-02-28 15:46:30 +00:00
Automerger Merge Worker
d5e10793e5 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev am: 3071821207 
Change-Id: I0f96de0f766c0eccfd55e0b4ed3a5341be8884f9
 2020-02-28 15:34:12 +00:00
TreeHugger Robot
c2153e244b Merge "[Wi-Fi] Set Wi-Fi Privacy option at the last one position" into rvc-dev 2020-02-28 15:33:44 +00:00
Shafik Nassar
3071821207 Merge "Use AppOpsManager#setUidMode instead of #setMode" into rvc-dev 2020-02-28 15:30:58 +00:00
Automerger Merge Worker
20e3b25292 [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours am: 7c636e673c -s ours 
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I0937aa22f16d1356f89ca1f2b2d3d54d250da594
 2020-02-28 06:54:10 +00:00
Automerger Merge Worker
7c636e673c [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours am: fe066eab8d -s ours 
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: I9496cc3e9dcf882a3f24dea801163e81a7100f9b
 2020-02-28 06:28:16 +00:00
Automerger Merge Worker
fe066eab8d [automerger skipped] Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev am: 594a5c71f5 -s ours 
am skip reason: Change-Id I0cb1ceda6d89a52224f80ea5ffd1af709a6acace with SHA-1 41661fe69c is in history

Change-Id: Ie5c75f89bb59471650fbc4dbabfc85cf8f64b45e
 2020-02-28 06:16:47 +00:00
TreeHugger Robot
594a5c71f5 Merge "[Wi-Fi] Force users to select a phase2 authentication for PEAP & TTLS" into qt-qpr1-dev 2020-02-28 06:04:46 +00:00
Automerger Merge Worker
3542ce579c Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 am: ed20d772f1 
Change-Id: I12634ec0b9ef0bce1b4491820b9f6c3ffaa2648e
 2020-02-28 01:47:40 +00:00
Automerger Merge Worker
06c880fff2 Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 am: 763c41ca36 
Change-Id: Iaffbda894d1ec07f467cb97d9dee0ccc5f500e10
 2020-02-28 01:47:33 +00:00
Automerger Merge Worker
ed20d772f1 Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev am: dc4f004cc9 
Change-Id: I96b3526fe5e7625c88d2f2d6ba48c9617032fd49
 2020-02-28 01:35:36 +00:00
Automerger Merge Worker
763c41ca36 Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev am: 51b06031e8 
Change-Id: I06f10f54f84c58071694666a63e3e40dfb8f1ca9
 2020-02-28 01:35:30 +00:00
TreeHugger Robot
dc4f004cc9 Merge "[Wi-Fi] Fix hint text color contrast problem in 'Add networks'" into rvc-dev 2020-02-28 01:31:08 +00:00
TreeHugger Robot
51b06031e8 Merge "[Wi-Fi] Fix data usage screen flash 1~2 times problem" into rvc-dev 2020-02-28 01:28:23 +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
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
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
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
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
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
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
Automerger Merge Worker
5c5d6ce282 Merge "Minor change to cross profile setting subtext." into rvc-dev am: 4e3b62adde 
Change-Id: If8492d184dad2daa43dcf5e39206cb029dad72e3
 2020-02-27 11:35:46 +00:00
TreeHugger Robot
4e3b62adde Merge "Minor change to cross profile setting subtext." into rvc-dev 2020-02-27 11:17:18 +00:00
Arc Wang
a001e42d7b [Wi-Fi] Fix hint text color contrast problem in 'Add networks' 
To raise hint text color, set android:attr/textColorSecondary
to android:textColorHint.

Bug: 146908018
Test: accessibility scanner
Change-Id: Id2525c1a0fc0b3f95298d493e2dc69b91aa13d77
 2020-02-27 18:36:20 +08:00
James.cf Lin
64ac0d4a74 [Settings] "Data during calls" in DDS SUB is still in advanced option. 
The DataDuringCallsPreferenceController didn't listen the mobile data changed and update the preference.

Bug: 149344454
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataDuringCallsPreferenceControllerTest

Change-Id: I0121f06efb5257dccc05ad06b93a9db263f012b5
 2020-02-27 17:52:47 +08:00
Automerger Merge Worker
6820c6e8f5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 am: 554b10a866 
Change-Id: I322771c42e3890b57e3fa4b72f56023c0096c875
 2020-02-27 09:07:54 +00:00
Automerger Merge Worker
554b10a866 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev am: 2f492604e5 
Change-Id: I4947e650122998b51413fc81397a6728f9ef837b
 2020-02-27 08:55:13 +00:00
TreeHugger Robot
2f492604e5 Merge "Fixes ApnEditor not restoring previous UI" into rvc-dev 2020-02-27 08:41:57 +00:00
Arc Wang
9b69fd17bf [Wi-Fi] Fix data usage screen flash 1~2 times problem 
Data loaders should be destroyed at onPause or
the APP list will be updated twice.

Bug: 146841747
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageListTest
Change-Id: Ic1b8ef443dd8e50777f1e3a16977add654748c54
 2020-02-27 16:18:04 +08:00
Tim Peng
3405c3dfa9 Change volume panel title from "Volume" to "Sound" 
Bug: 150337735
Test: manual
Change-Id: Icc457c2c1aae21282261549de47eeaf9c7219887
 2020-02-27 08:11:39 +00:00