Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,345 Commits 1 Branch 0 Tags
2bf0b05023edbfa78dd50fbb367979fa36ddc584
Commit Graph

60345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2bf0b05023 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: db76ac605e -s ours 
am skip reason: subject contains skip directive

Change-Id: Iaf50433a70fefad75997f260e19987dc9ecb267b
 2020-04-02 04:51:35 +00:00
TreeHugger Robot
5b144b6a33 Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb 
Change-Id: I55010c3dc5b2bb86159550aea5cc5cdc7e1f0aaa
 2020-04-02 04:50:51 +00:00
TreeHugger Robot
db76ac605e Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-02 04:38:23 +00:00
TreeHugger Robot
542746dadb Merge "Fix SupportDashboardActivityTest" into rvc-dev 2020-04-02 04:31:06 +00:00
Bill Yi
c94ea8ebff Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I6da65a4e5c521596b414cec5dffb68f5cf9b4c30
 2020-04-01 19:05:10 -07:00
TreeHugger Robot
5769ad00ca Merge "Add conversations image resource" into rvc-dev am: a3160941e2 
Change-Id: Id3b369c21624424ef80128a0a89b77cd4ccf24c7
 2020-04-01 23:28:38 +00:00
TreeHugger Robot
a3160941e2 Merge "Add conversations image resource" into rvc-dev 2020-04-01 23:06:58 +00:00
TreeHugger Robot
514dcef9df Merge "Fix crash when trying to open app info page" into rvc-dev am: a43e978ffb 
Change-Id: I69545cdbae3df0ed5b21c6f94b00352fa8f6c5c2
 2020-04-01 21:56:19 +00:00
TreeHugger Robot
a43e978ffb Merge "Fix crash when trying to open app info page" into rvc-dev 2020-04-01 21:43:47 +00:00
TreeHugger Robot
7883d6af66 Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d 
Change-Id: Ibdb294c1e340f71c29dbd94de7f872b0accd7e25
 2020-04-01 21:09:51 +00:00
TreeHugger Robot
c78ad2087d Merge "Some more a11y fixes" into rvc-dev 2020-04-01 20:38:29 +00:00
TreeHugger Robot
0949a64f97 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours 
am skip reason: subject contains skip directive

Change-Id: I52ec263d47b5d48c642845457c6c023087b8ef81
 2020-04-01 18:11:54 +00:00
Xiangyu/Malcolm Chen
d4beb34e3d Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 
Change-Id: Icc4846045889e549180188d1a5fc1da63f5ce965
 2020-04-01 18:11:40 +00:00
TreeHugger Robot
51a0b4eaef Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-01 18:02:44 +00:00
Xiangyu/Malcolm Chen
9b3a03e504 Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev 2020-04-01 17:57:07 +00:00
Beverly
216bf3c320 Add conversations image resource 
- Conversations image resource is a compilation of the conversation
icons that are allowed to bypass DND
- Update category header text on DND > Display options for hidden notifications
page
- Update a11y bug in messages and calls pref pages that said images were
tappable

Test: manual
Bug: 151845457
Change-Id: I5387722abf0543b6e07378d498cc0085122c91b9
 2020-04-01 13:51:52 -04:00
kholoud mohamed
f9a03cd415 Fix crash when trying to open app info page 
Fixed a crash in App info page that happens when
no work profile exists, also fixed some unit tests.

Fixes: 152933121
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest
Change-Id: I7a1e5857cb1e10b96b33abd64359ba30459b1b13
 2020-04-01 17:27:17 +00:00
Bonian Chen
0b1cc9979e Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 
Change-Id: I06dcc9e2304a4fdb04ce9ba1dd30fb96e8045a2d
 2020-04-01 16:19:07 +00:00
Bonian Chen
0d3732a595 Merge "[Settings] Code Refactor" into rvc-dev 2020-04-01 16:07:47 +00:00
Julia Reynolds
6fb9669e44 Some more a11y fixes 
Min height, and announcing button changes

Test: manual
Fixes: 152729661
Fixes: 152728211
Change-Id: I886ce046da3dd5b2b93673aee0cd5bdc37d5fc48
 2020-04-01 12:05:25 -04:00
Yanting Yang
f7b884f59b Fix SupportDashboardActivityTest 
Since the screen title of SupportDashboardActivity was changed to
page_tab_title_support string for fixing breadcrumb before.

We need to correct the test case to fix the test function fail.

Bug: 147851992
Test: robotests
Change-Id: I14e30ac2a5210bb2d89657cff5772c06c6e8fe5a
 2020-04-01 20:13:59 +08:00
TreeHugger Robot
6b7d3f8290 Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 
Change-Id: Ic1243f986b4c236c14c0c840fe7069d9557c35bc
 2020-04-01 09:52:54 +00:00
TreeHugger Robot
93162ce9f4 Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev 2020-04-01 09:39:12 +00:00
Arc Wang
26d3b7dd1b [Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test 
Sign in feature is integrated in WifiTraclerLib, change the test cases
to verify if WifiEntry sign in methods is called.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia0157f5a96c700e5596c00cef873c8f5016d6442
 2020-04-01 15:25:37 +08:00
Bonian Chen
d9f98f935b Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 
Change-Id: I3687e0c1884ea802801c3eb00aafe933428cb817
 2020-04-01 07:17:07 +00:00
Bonian Chen
cfbdcaf9f5 Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev 2020-04-01 07:00:15 +00:00
TreeHugger Robot
80036cffa9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours 
am skip reason: subject contains skip directive

Change-Id: I195e28633ce35791208174a7b3d61eb83dadbcdb
 2020-04-01 05:32:13 +00:00
TreeHugger Robot
58cadcc6ee Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-01 05:13:22 +00:00
Bonian Chen
bd03b17a62 [Settings] Avoid from crash when pull out SIM 
Avoid from crash through exception handling.

Bug: 148803073
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
 2020-04-01 12:05:38 +08:00
Bill Yi
20e0cbec41 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3d6289030419addc1ccd223de40be5e1bc422df8
 2020-03-31 20:55:13 -07:00
Goven Liu
336834b17e Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad 
Change-Id: I4d369739d3d83771f220cacb1846338056367969
 2020-04-01 03:36:29 +00:00
Goven Liu
783b0257ad Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev 2020-04-01 03:16:34 +00:00
Bill Yi
5f16525806 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ie47208d5573659f3bdcc57c8d9933a2245625669
 2020-03-31 20:12:42 -07:00
Bonian Chen
39ff4e4495 [Settings] Code Refactor 
1. Code refactor for android.telephony.ims.ImsManager.
2. Remove unused methods

Bug: 140542283
Test: build pass
Change-Id: I187789a8a553a2c073b3591807dfebfafba6bc14
 2020-04-01 10:58:27 +08:00
Malcolm Chen
0b2b2b50d7 Update string of showing conflict between 5G and DSDS. 
Bug: 152786064
Test: manual
Change-Id: I3ab8dc326caff5b7480c17b9a8004ed91a8b0578
 2020-03-31 17:19:16 -07:00
Sarah Chin
902793ffa7 [automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours 
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0 is in history

Change-Id: I1763402a852df8d830f211313e1b2549bf9f7a05
 2020-03-31 23:26:57 +00:00
Sarah Chin
c03048cd27 Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a 
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
 2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a Merge "Rename calls to isGlobalModeEnabled" 2020-03-31 23:02:20 +00:00
Brad Ebinger
2139c0b50a [automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours 
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec is in history

Change-Id: I6ec8cb78adfd5916249bf2364b3bee0c4780b4c8
 2020-03-31 20:20:40 +00:00
Brad Ebinger
5ef4a92dd0 [automerger skipped] Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a am: da1335a9f4 -s ours 
am skip reason: Change-Id I70821964bc618c3c389c9039cd7f5028e34c7ebb with SHA-1 66c709844a is in history

Change-Id: I94265a2af1e69f1257c93fb05222c79037840156
 2020-03-31 20:20:38 +00:00
TreeHugger Robot
0d78f267d8 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 
Change-Id: Ic5a9b57f6a6809decaab8153c11842860b8d44da
 2020-03-31 20:11:05 +00:00
TreeHugger Robot
c823a3169b Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e 
Change-Id: I32217aa77a2291d6882500dc0484e52528a051d7
 2020-03-31 20:10:16 +00:00
Brad Ebinger
8bc35321d8 Merge changes I06df2928,I70821964 am: 24ddbf5e8c 
Change-Id: I3aeb0e140fcb3a6c28e1880a6784e7800c368f47
 2020-03-31 20:10:07 +00:00
Brad Ebinger
da1335a9f4 Add new DialogFragment and Controller for capability discovery opt-in am: f469cac10a 
Change-Id: If7f5ed1343a5b13810455bcf7168b8b095db149c
 2020-03-31 20:10:05 +00:00
TreeHugger Robot
947cb48303 Merge "Add dnd messages + calls senders image resource" into rvc-dev 2020-03-31 19:40:48 +00:00
Brad Ebinger
24ddbf5e8c Merge changes I06df2928,I70821964 
* changes:
  Fixes ContactDiscoveryDialogFragmentTest
  Add new DialogFragment and Controller for capability discovery opt-in
 2020-03-31 19:39:59 +00:00
TreeHugger Robot
04d64f470e Merge "Disable conversation strip setting." into rvc-dev 2020-03-31 19:21:51 +00:00
TreeHugger Robot
249a806fed Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed 
Change-Id: Ife40597f05e6b9ba1ec54cc315595605286ef2fa
 2020-03-31 17:52:34 +00:00
TreeHugger Robot
8ca191b565 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 
Change-Id: I69bb6397853481800a21ce2e2f00ab7774dc039e
 2020-03-31 17:52:28 +00:00
TreeHugger Robot
07a3b1c6ed Merge "Use DEFAULT_LIST contact intent" into rvc-dev 2020-03-31 17:38:13 +00:00