PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,643 Commits 1 Branch 0 Tags
4fbaf2395850b0ba69341640b451a6941d8a525c
Commit Graph

61643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
4fbaf23958 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 
Change-Id: I3c7138e8e806aeed78da7a1c0807790af8b519f0
 2020-05-22 11:48:42 +00:00
Julia Reynolds
f7eade72c6 Update conversation-related strings am: 9e78ec75d1 
Change-Id: I11b6a55cffee069a1aef0df8d2ca9be0ca141161
 2020-05-22 11:48:36 +00:00
Julia Reynolds
edca211a67 Merge "clean up layout & styling of notification history" into rvc-dev 2020-05-22 11:23:59 +00:00
Julia Reynolds
9e78ec75d1 Update conversation-related strings 
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
 2020-05-21 20:49:53 +00:00
Julia Reynolds
0dc740b13d Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 
Change-Id: Ic642152c044aed6a4778ae38b449eabae4f77eb5
 2020-05-21 19:17:25 +00:00
Julia Reynolds
2679bf5af0 clean up layout & styling of notification history 
Test: manual
Fixes: 157161601
Fixes: 157162238
Fixes: 157160265
Fixes: 157161125
Fixes: 157160611
Fixes: 157158944
Change-Id: I9853426987549898b7996e9db43f7767e4c41641
 2020-05-21 14:55:51 -04:00
Julia Reynolds
6d63120295 Merge "Switch from shortlabel to label" into rvc-dev 2020-05-21 18:53:24 +00:00
Robert Luo
fa85b4e1f6 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 
Change-Id: I0e65ecc63313558f55c4ed1d0b6a4e263913610b
 2020-05-21 15:08:49 +00:00
Robert Luo
31f96bbcf6 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev 2020-05-21 14:56:54 +00:00
TreeHugger Robot
e65b99bce2 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 
Change-Id: I9a5a8969ec1998d0988ce1acc0ed68e3ec24d8a8
 2020-05-21 12:21:01 +00:00
TreeHugger Robot
43d6bd38f5 Merge "Only show work profile notifs if enabled" into rvc-dev 2020-05-21 12:09:37 +00:00
Robert Luo
b7d1aa8efa Add data collection and metrics for Media Output Switcher - 2/n 
Fixes: 147792668
Test: ./out/host/linux-x86/bin/statsd_testdrive Atom_ID
Change-Id: I1a34228da75c197663bcfe909c961e57665590d4
 2020-05-21 18:00:50 +08:00
Jeff Tinker
01b3da1dbd [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours 
am skip reason: skipped by user jtinker

Change-Id: I41cccce692c4cd294c74054cb072e0ada6f41941
 2020-05-20 20:14:25 +00:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c 
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
 2020-05-20 19:50:57 +00:00
Jeff Tinker
9e974afd4c Merge "Revert "[Settings] Remove mobile network v1"" 2020-05-20 19:37:56 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1" 
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
 2020-05-20 19:14:57 +00:00
Julia Reynolds
04d50c9709 Switch from shortlabel to label 
Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
 2020-05-20 14:23:43 -04:00
Julia Reynolds
39ceee9e00 Only show work profile notifs if enabled 
Test: manual, turn off profile
Fixes: 157137055
Change-Id: Ic042300297c09d132e793d13fec18b23d24f2cc8
 2020-05-20 12:29:39 -04:00
TreeHugger Robot
d06d373674 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda 
Change-Id: I1867ea8309ed5ec9e8bda40f68cd6e56c69b1755
 2020-05-20 14:32:11 +00:00
TreeHugger Robot
946e3adeda Merge "Show subtext for previously connected devices on BT card" into rvc-dev 2020-05-20 14:10:31 +00:00
Bonian Chen
3d46b0e5ec [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: Ide8eb53eff3252d31505cc975ea094d76c70bf31
 2020-05-20 13:03:03 +00:00
Bonian Chen
075a17c995 Merge "[Settings] Remove mobile network v1" am: 10799d12fd 
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
 2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd Merge "[Settings] Remove mobile network v1" 2020-05-20 12:28:20 +00:00
Jason Chiu
07767907d5 Show subtext for previously connected devices on BT card 
Fixes: 157089483
Test: visual, robotest
Change-Id: If4f2dec9df802a80a686827de7e61115e85d54a7
 2020-05-20 17:02:43 +08:00
Amy Hsu
cf0ef7ae38 Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f 
Change-Id: Ife2360ddac1e760471c0ab22f588f344e0d6723d
 2020-05-20 08:51:01 +00:00
Amy Hsu
a75dddbf9f Merge "Move PeakRefreshRateController to Settings app" into rvc-dev 2020-05-20 08:48:56 +00:00
TreeHugger Robot
4af7cebe18 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c -s ours 
am skip reason: subject contains skip directive

Change-Id: I54dc9b432f4b13258c3ff07c789ab4fcc57de45e
 2020-05-20 08:43:38 +00:00
TreeHugger Robot
a47d90f59c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-20 08:30:46 +00:00
Bonian Chen
daf6c9e85b [Settings] Remove mobile network v1 
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90

Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
 2020-05-20 07:49:33 +00:00
TreeHugger Robot
3d5669a8b4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2 -s ours 
am skip reason: subject contains skip directive

Change-Id: I288af7e67934943ec684587a52a7fa4771234a99
 2020-05-20 07:07:19 +00:00
TreeHugger Robot
77429677b2 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-20 07:05:37 +00:00
TreeHugger Robot
b5a3893f76 Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 
Change-Id: Ib8f58a2e5930dfd4f3b8a25dcd0d02d4455a5b24
 2020-05-20 06:43:42 +00:00
TreeHugger Robot
dde2bfd209 Merge "Add corresponding code for the new NR condition" into rvc-dev 2020-05-20 06:26:52 +00:00
tim peng
4f89d73350 Merge "Talkback focus doesn't move in liner order after tapping selected option in switch device panel" into rvc-dev am: 16d773c865 
Change-Id: Ia33d6cbf6a615c2413249a2db3483622c77fa400
 2020-05-20 03:21:35 +00:00
Bill Yi
6a73e08db2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I7014134d629aa12a8320e20927a4f48a2ab2c5bc
 2020-05-20 03:16:42 +00:00
tim peng
16d773c865 Merge "Talkback focus doesn't move in liner order after tapping selected option in switch device panel" into rvc-dev 2020-05-20 02:59:37 +00:00
Bill Yi
0b64a3c313 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I8da4907d040c026bcad0cff8e5d4475986cc230e
 2020-05-20 01:56:49 +00:00
Julia Reynolds
8041b162a8 Fix button selected state am: d1d32e7d22 
Change-Id: I3f1099e22581c2c2464888639dead0b05e3f1512
 2020-05-19 21:51:26 +00:00
Julia Reynolds
68e09db264 Guard against NPE am: 663cc934d9 
Change-Id: I56317984b7803128829f77889dccd4d69601bad9
 2020-05-19 21:02:18 +00:00
Julia Reynolds
d1d32e7d22 Fix button selected state 
Test: toggle between buttons with a11y service
Fixes: 156990411
Change-Id: I421c6d2e9762794bdf8a090db8a808678ffd8a1c
 2020-05-19 14:36:32 -04:00
Julia Reynolds
7e17205035 Map local context menu to the correct item am: a1c0269027 
Change-Id: Ibaa8644feff3c098b1a384c7dfb645d0fb30d5c0
 2020-05-19 17:45:07 +00:00
Julia Reynolds
663cc934d9 Guard against NPE 
Test: manual, launching screen from locked lock screen
Fixes: 153569405
Change-Id: Idb546f58623792d94a43ca6659f7498de3beec94
 2020-05-19 12:29:24 -04:00
Julia Reynolds
a1c0269027 Map local context menu to the correct item 
Since the position of the item might have changed
if ohter items were deleted

Test: manual: delete item 0/2, item 2/2, then 1/2
Fixes: 156716919
Change-Id: I989a064d3a3f89b5c2692d5a687d759c842e080c
 2020-05-19 11:22:31 -04:00
Amy Hsu
7730d301b7 Move PeakRefreshRateController to Settings app 
1. 60/90 Hz switch
2. Allow DeviceConfig to change default refresh rate

bug: 139869828
bug: 137064289
bug: 132750102

Test: Check refresh rate is expected.
Change-Id: Ia6a3e3717fd8845c7177e55b70bc6d2d952d58f3
 2020-05-19 21:45:33 +08:00
SongFerngWang
414f8b8fe6 Add corresponding code for the new NR condition 
Bug: 155915216
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (Pass)

Change-Id: I171ea0a8adc621ad5e9dc5cd2090e431b923e775
 2020-05-19 12:32:57 +00:00
Treehugger Robot
045783bd37 Merge "Preserve icon for "manage space"" am: c39b3dfd76 am: d71f2b3f1a 
Change-Id: I6b0b1a56980191bc551ba409bfce8e104ca2706a
 2020-05-19 12:12:16 +00:00
Treehugger Robot
d71f2b3f1a Merge "Preserve icon for "manage space"" am: c39b3dfd76 
Change-Id: Ic24c59d88117a9e0a6f61e2c1b0e2726a1546487
 2020-05-19 11:58:13 +00:00
Treehugger Robot
c39b3dfd76 Merge "Preserve icon for "manage space"" 2020-05-19 11:42:46 +00:00
Zoey Chen
2f10922368 [automerger skipped] Merge "[Settings] Code refactor" am: f4d59078fb am: 6622ff7181 -s ours 
am skip reason: Change-Id I3fa9dcc630b7612c1af3300024dee4f8deb6b308 with SHA-1 0065f2e460 is in history

Change-Id: I6776bff1f5791d40772c489b40a9ef5160fdf7c9
 2020-05-19 10:29:13 +00:00
Zoey Chen
6622ff7181 Merge "[Settings] Code refactor" am: f4d59078fb 
Change-Id: I65a011ca26c574d53d7ae3c2551fe6aa44f9c861
 2020-05-19 10:15:33 +00:00