PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
60,311 Commits 1 Branch 0 Tags
f2dbeb154251ddabdc44d5cd64130c68c7bee936
Commit Graph

60311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Luo
f2dbeb1542 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 am: c13ecfad98 
Change-Id: I265d9fdf691f443319417d4cf24b91b0223824d3
 2020-03-31 08:19:39 +00:00
Robert Luo
c13ecfad98 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev am: c3535eab06 
Change-Id: Ibf6f65fc9659992bb7da934f2f39572b3f108ac2
 2020-03-31 08:01:50 +00:00
Robert Luo
c3535eab06 Merge "Refine NFC payment wording for "Set default" and "Update" scenarios." into rvc-dev 2020-03-31 07:42:24 +00:00
Bonian Chen
155c698d4f Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 
Change-Id: Ie800cbe35040ed63a8488e7cac8e1bfdfdadb8a4
 2020-03-31 07:00:57 +00:00
Bonian Chen
949ec8a1f0 Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 
Change-Id: Ib23864723f76e376338604b65171a058cc0df611
 2020-03-31 06:39:12 +00:00
Bonian Chen
268bdc12c6 Merge "[Settings] Code Refactor" into rvc-dev 2020-03-31 06:24:15 +00:00
TreeHugger Robot
7fea1bf993 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba am: 46cc33c9a6 
Change-Id: Id213c4a4ffdd6bc57fc45e6956660b92d725a75e
 2020-03-31 05:04:30 +00:00
TreeHugger Robot
46cc33c9a6 Merge "Get MediaDevice from devices list" into rvc-dev am: cd329951ba 
Change-Id: I066c17625736fd8cdaa96068a2bc5accdb5ae3fc
 2020-03-31 04:42:59 +00:00
TreeHugger Robot
cd329951ba Merge "Get MediaDevice from devices list" into rvc-dev 2020-03-31 04:26:31 +00:00
Bonian Chen
21475ae6c6 [Settings] Code Refactor 
Code refactor in order to support auto testing

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest

Change-Id: I2427732435b59d7359a102e0dd56317ac6a024b4
 2020-03-31 03:46:45 +00:00
TreeHugger Robot
52162fde91 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 
Change-Id: Ief6b6435ad6b344c9fecaa12af0ff83e3e680199
 2020-03-31 03:13:39 +00:00
TreeHugger Robot
2093f0dee4 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 
Change-Id: Ia47c8ea68d5b5709e1aa82930ea38ab61f0c7222
 2020-03-31 02:51:01 +00:00
tim peng
1106c19951 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 
Change-Id: I13e4e901bd2e6a462e2ad7ba29077aa79255d018
 2020-03-31 02:45:01 +00:00
TreeHugger Robot
477c4fef48 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev 2020-03-31 02:34:51 +00:00
tim peng
4a82a5abb5 Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 
Change-Id: Ic6c44c4ce05197d113f4f0718640f0abb868793e
 2020-03-31 02:24:16 +00:00
tim peng
5b0913c2b6 Merge "No media status is visible in Output Switcher" into rvc-dev 2020-03-31 02:04:48 +00:00
TreeHugger Robot
50699d4595 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours am: 7f94e44f55 -s ours 
am skip reason: subject contains skip directive

Change-Id: I660c2a7e46b4c055e417e955a9e9b99aadca3052
 2020-03-31 00:25:29 +00:00
TreeHugger Robot
7f94e44f55 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 4a08ac176f -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie75baff25f3026bfdb41b067769e7ffef4123eec
 2020-03-31 00:04:51 +00:00
TreeHugger Robot
4a08ac176f Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-30 23:39:52 +00:00
TreeHugger Robot
0c0dc0f64e Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d 
Change-Id: Ibba92edec9c66ed27f37ceeb7eb6e891faa28ac2
 2020-03-30 22:51:13 +00:00
TreeHugger Robot
ea63b90c3d Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd 
Change-Id: I76ca506736ed0d8400ed3e063695e96acd8eff5e
 2020-03-30 21:32:06 +00:00
TreeHugger Robot
a2d56af9bd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev 2020-03-30 21:07:15 +00:00
TreeHugger Robot
dfdb9d18f8 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd 
Change-Id: Ib59231d29edd5747afdf73053c837d796c2e0922
 2020-03-30 20:39:11 +00:00
Julia Reynolds
5c44faa98d Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 am: 52b375b242 
Change-Id: I233bcf4e9ba089718534186437472db15b6c87ba
 2020-03-30 20:39:06 +00:00
Julia Reynolds
8fcac244ad Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec 
Change-Id: Icdeaafe85fa03ed0ee03379bcb41995be18d46dd
 2020-03-30 20:39:02 +00:00
TreeHugger Robot
f61da397fd Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf 
Change-Id: I0c72a61512a8faf17835b1b212b909de69980995
 2020-03-30 20:18:29 +00:00
Julia Reynolds
52b375b242 Merge "Remove bubble settings from channel pages" into rvc-dev am: 56d45997b3 
Change-Id: Ibd13d19b4bf335c14a1063422943e8e65a549c4b
 2020-03-30 20:18:22 +00:00
Julia Reynolds
6d30804cec Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 
Change-Id: I3504ff5e96055ce63098d738f7390cb5c3c3569b
 2020-03-30 20:18:13 +00:00
TreeHugger Robot
6f837d10bf Merge "Don't filter demoted conversation from app subtext" into rvc-dev 2020-03-30 20:03:45 +00:00
Julia Reynolds
56d45997b3 Merge "Remove bubble settings from channel pages" into rvc-dev 2020-03-30 20:01:17 +00:00
Julia Reynolds
b3f2c0d528 Merge "Conversations can't individually bypass dnd" into rvc-dev 2020-03-30 19:57:48 +00:00
Julia Reynolds
acbf2b36e4 Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 am: 2b541018da 
Change-Id: Ie477d8a14ff898c754d333c387f963d610178eb0
 2020-03-30 19:18:02 +00:00
Julia Reynolds
2b541018da Merge "Fix some history a11y issues" into rvc-dev am: 2f77fd08e9 
Change-Id: I4bd2a3608df02dfaca852f009ac7b7cf37ddceb7
 2020-03-30 18:57:37 +00:00
Julia Reynolds
2f77fd08e9 Merge "Fix some history a11y issues" into rvc-dev 2020-03-30 18:05:55 +00:00
Beverly
ef2c91c9a3 Don't filter demoted conversation from app subtext 
If the notification channel is a demoted converation, we still want to
include it as a notification channel that can bypass DND under the
"apps" preference for DND.

Test: manual, make RunSettingsRoboTests7
Fixes: 152765113
Change-Id: Ief072b19280b0dc6e6c37d2d46d51f045d42bb4e
 2020-03-30 14:01:38 -04:00
Bill Yi
423b63dff5 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I39a20af187565ba809b33debdf968309c597dc18
 2020-03-30 10:57:45 -07:00
Julia Reynolds
138518141b Remove bubble settings from channel pages 
It's only relevant for conversations

Test: manual
Fixes: 152764095
Change-Id: I31b342396ac3e66652ffc1457321594c55bbe0f3
 2020-03-30 13:20:10 -04:00
Julia Reynolds
56d0f6b03a Conversations can't individually bypass dnd 
Test: atest
Fixes: 152482973
Change-Id: I19432b79724beca46974c1c88d42a231f0703dc7
 2020-03-30 13:18:38 -04:00
TreeHugger Robot
54058eedca Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 am: 68a77ceb47 
Change-Id: I170948c32946caf7a695bdbea31b1fc0cf5bce2c
 2020-03-30 17:17:55 +00:00
TreeHugger Robot
68a77ceb47 Merge "Fix the ringtone subtext is empty" into rvc-dev am: 83dfe52029 
Change-Id: Iea5f49823d98abfcf25193cf338dd226943e6188
 2020-03-30 16:57:10 +00:00
TreeHugger Robot
83dfe52029 Merge "Fix the ringtone subtext is empty" into rvc-dev 2020-03-30 16:45:32 +00:00
Julia Reynolds
cfb1f98668 Fix some history a11y issues 
Test: manual
Fixes: 152578971
Fixes: 152728558
Fixes: 152734825
Change-Id: I6a2dc434f0c456d466d23fd2cff86362f8dcd246
 2020-03-30 11:54:21 -04:00
Yanting Yang
6b42c0780e Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 
Change-Id: I173138dd6983c9cd677e982134ee11823675aaf5
 2020-03-30 15:47:18 +00:00
Yanting Yang
d8f14f11b0 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 
Change-Id: Ibcd672023ec7cceef0e41bf1501fc28ade481430
 2020-03-30 15:32:46 +00:00
Yanting Yang
ad4405d0f8 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev 2020-03-30 15:15:06 +00:00
Tsung-Mao Fang
61e352bba7 Fix the ringtone subtext is empty 
Because ag/10750991 change the controller key in xml,
the controller can get a correct preference.

In order to fix this problem, change the key to correct one.

Test: Rebuilt rom, and see the subext
Fix: 162593762
Change-Id: I0226ece059944655a25af48a603916a14cede2e0
 2020-03-30 22:48:05 +08:00
Arc Wang
3aee35a882 [Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest 
In ag/10785119, WifiStatusTracker#setListening calls
ConnectivityManager#unregisterNetworkCallback twice.
Modify the fail test to match it.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Change-Id: Idd9917ce204e2abbc4bfbf760222191adadf4afa
 2020-03-30 22:07:21 +08:00
TreeHugger Robot
052610467e Merge "Only request focus if change was self-triggered" into rvc-dev am: c22d90cb1b am: 5093ea158d 
Change-Id: I2392e5c9c082039db729e457e76c6439b2c250ae
 2020-03-30 13:45:18 +00:00
Julia Reynolds
5ba1c6e55d Merge "Remove items from the 'last 24 hours' history on swipe" into rvc-dev am: dad135f4ed am: fe8ad05005 
Change-Id: Ifa9dd59eb974607d8b5501e3b8733462e6abdc31
 2020-03-30 13:45:12 +00:00
TreeHugger Robot
99ab33a0fa Merge "Add tap targets to top 2 sections" into rvc-dev am: 9db658bfe0 am: 9d9504f951 
Change-Id: I4615321944d83159db733bbeff960a44591236a6
 2020-03-30 13:45:07 +00:00