PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,308 Commits 1 Branch 0 Tags
0295e0249967eeb9a892106846597c5bb071704c
Commit Graph

61308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
0295e02499 Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e" into rvc-d1-dev-plus-aosp 2020-04-01 03:49:43 +00:00
Goven Liu
4b67490445 Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb 
Change-Id: I4409afa7c65bbf7d6d5ac051b8ebd7e258bedf91
 2020-04-01 03:49:40 +00:00
Goven Liu
d0bc27f31e Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e 
Change-Id: Id059dbb0a8fc61d225f2efff917cba62dd3822d3
 2020-04-01 03:49:40 +00: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
15ff53ecfb Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad 
Change-Id: I681ff5a91c45eca3d6f80dc61aed8907d08842b5
 2020-04-01 03:36:05 +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
Sarah Chin
8f14309c6a [automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours 
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0 is in history

Change-Id: Iab8f4ddeb21032e44ee74cc18db2b5fd5e3d1cb5
 2020-03-31 23:40:46 +00: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
41df03ff47 [automerger skipped] Merge changes I06df2928,I70821964 am: 24ddbf5e8c am: 8bc35321d8 -s ours am: 2139c0b50a -s ours 
am skip reason: Change-Id I06df2928116b33fec39aade733401d60e6cde1c1 with SHA-1 60204898ec is in history

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

Change-Id: I5ba07f1336bd4d4c5c9af6af38df350752667f55
 2020-03-31 20:28:49 +00:00
TreeHugger Robot
0b06034144 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: 0d78f267d8 
Change-Id: I1be31e7940bb9ff43dcca3753a8cc4390371c797
 2020-03-31 20:28:02 +00:00
TreeHugger Robot
d4aa412835 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: c823a3169b 
Change-Id: I830b29d7328a9d0e0a71e5a208d7c629596b2e60
 2020-03-31 20:23:04 +00:00
TreeHugger Robot
81df373d42 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 am: e9c4d17eb2 
Change-Id: I12caf300aeefc9a15a97fdbe79598f2bdc538f1c
 2020-03-31 20:22:03 +00:00
TreeHugger Robot
0035707d32 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 
Change-Id: I9995b090e07d81a3e46be1e9d80e87ab3b098dba
 2020-03-31 20:20:53 +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
e9c4d17eb2 Merge "Add dnd messages + calls senders image resource" into rvc-dev am: 947cb48303 
Change-Id: I1f8a53b6543452481e62c309a1140af3ef8e1899
 2020-03-31 20:10:56 +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
TreeHugger Robot
6e9938cf48 Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e 
Change-Id: I5e6deeabc8dacb165ee20809a07af2e5b6db78d9
 2020-03-31 20:10:11 +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
31e2de7c48 Merge "Use DEFAULT_LIST contact intent" into rvc-dev am: 07a3b1c6ed am: 249a806fed 
Change-Id: Ie1685d04d11e986502b93cc9e61be43df1318c15
 2020-03-31 19:14:38 +00:00
TreeHugger Robot
157b568e40 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: 8ca191b565 
Change-Id: Id6623fe974bf6b13fef9e83711b7c70901f3b4cf
 2020-03-31 19:13:45 +00:00
Bonian Chen
f8a79db702 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: ddb2495761 
Change-Id: Ie71e4b59dab47d9a2298647bd8ba446298c177c5
 2020-03-31 19:13:04 +00:00
Bonian Chen
8fb70b2510 Merge "[Settings] Remove internal ImsManager access within MobileNetworkUtils" into rvc-dev am: 311941c7d3 am: 17cd51e9eb 
Change-Id: Ia0b142b307083bc2b184bfe8fa1965370b39e4be
 2020-03-31 19:13:02 +00:00
TreeHugger Robot
8e1929cdc4 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 0d76063cc5 
Change-Id: I61aa64518000747bf384017ceeee45c5df1f93a5
 2020-03-31 19:12:15 +00:00
Kholoud Mohamed
f9f06a2f04 Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: c2b8fd2e85 
Change-Id: I7a1b4daf8fe0e3ac40c9fac0bd5d739ba4ba1528
 2020-03-31 19:11:54 +00:00
Robert Luo
aff3082301 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: f62beedb4f 
Change-Id: I0192a74a3c2246a0206c70a4b01eb13462d9eeba
 2020-03-31 19:11:07 +00:00
Bonian Chen
a27ebac065 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 9dda57cd21 
Change-Id: Id714807d7fb24d5b42dc2e80ec095c4120fabd3f
 2020-03-31 19:09:59 +00:00
TreeHugger Robot
d45eb1fc8b Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 820d35b59a 
Change-Id: Ie38c2af54bc8f15def8defa9e30a2c4176dae53c
 2020-03-31 19:08:56 +00:00
TreeHugger Robot
9ecc677cc0 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 58920061b1 
Change-Id: Ia1a79e26bccb1a62bc31754396878738ba1cb781
 2020-03-31 18:45:57 +00:00
tim peng
21978e8269 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 5c81b237cd 
Change-Id: I03ed2ce730eadd35f90a553bc3504e0e3ac219ae
 2020-03-31 18:44:16 +00:00
TreeHugger Robot
8f7429dda4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7c4f2d2cc8 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5750cc3ea6772ceb5a384af9c15c096f4e5c24e4
 2020-03-31 18:35:53 +00:00
TreeHugger Robot
e01e07fab7 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ee96c179b4 
Change-Id: I4eba351b1c24893a835615b9c85b32289234927a
 2020-03-31 18:34:51 +00:00
TreeHugger Robot
1cb8ff7871 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: 21cd235d70 
Change-Id: I0ef4f6c16446653199ed25c780064a6a510ac73a
 2020-03-31 18:33:56 +00:00
Julia Reynolds
6192f73159 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 17ee537e91 
Change-Id: Iacb33fa5302216cd253374f88214b76d5ea5aa7c
 2020-03-31 18:33:03 +00:00
Julia Reynolds
7ce567b66d Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 1dc6ae3d5f 
Change-Id: I42e5e7961e0b33968aa7f06366e386cc99addb59
 2020-03-31 18:28:00 +00:00
Julia Reynolds
6a13fb955a Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 77e6a449b0 
Change-Id: I89276b86cf1a8e8ea9cd2914b78609a0ad56d671
 2020-03-31 18:24:26 +00:00
TreeHugger Robot
bcddeed27c Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 am: 07ea2e40f9 
Change-Id: I0f6984a96cbe5dc5ce43929a9cae776e96daa6c0
 2020-03-31 18:23:40 +00:00
Yanting Yang
a1ddc050fa Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: 2b802a4745 
Change-Id: I583d94c2b58e0c4e658bc026e213bd6d79fcf6e8
 2020-03-31 18:20:09 +00:00
TreeHugger Robot
5b4f99eb2d Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b am: dc5550102b 
Change-Id: Id8199f8990940fab0c2d16d1b51d0ffa197776bd
 2020-03-31 18:18:28 +00:00
Julia Reynolds
7a942e85b9 Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed am: 1819365216 
Change-Id: I8c4144f85aae52cdf93b6904d34c05619689218f
 2020-03-31 18:13:46 +00:00
TreeHugger Robot
10fee8a8a6 Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0 am: 9c129157d0 
Change-Id: If7e13909f87a0b458cc9127ca7a3337c962c7bab
 2020-03-31 18:11:16 +00:00
TreeHugger Robot
1d4ee34775 Merge "Update App storage usage summary" into rvc-dev am: 9c32d89aaa am: c2a4b3bfd0 
Change-Id: I1853ac7872a070f9f2c9df477acb3bbf96ba65d4
 2020-03-31 18:10:00 +00:00