PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,948 Commits 1 Branch 0 Tags
41f149889efc7502882b433c37851a92bdf4e01e
Commit Graph

63948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
41f149889e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 12072f339e -s ours 
am skip reason: subject contains skip directive

Change-Id: I5933c17de23b934e37075c76937767dc33aa1180
 2020-05-22 16:00:00 +00:00
Bill Yi
115a3e2a47 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours 
am skip reason: subject contains skip directive

Change-Id: I5f1ec20ea861b8cb6f930ba89207409170bdb777
 2020-05-22 15:59:54 +00:00
Bill Yi
12072f339e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours 
am skip reason: subject contains skip directive

Change-Id: I9cb17d06ec70b135859f8e2c5f61f56e86839972
 2020-05-22 15:47:26 +00:00
Bill Yi
131a9cb96e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3ad0501601df178a732a73b318ba9104374d27ea
 2020-05-22 15:47:26 +00:00
Bill Yi
8019c16a14 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-22 15:20:44 +00:00
Julia Reynolds
c50639ab32 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4fbaf23958 
Change-Id: I854f495cf222ca7a3d10d99e654a519427de8b88
 2020-05-22 12:04:17 +00:00
Julia Reynolds
c5570305d8 Update conversation-related strings am: 9e78ec75d1 am: f7eade72c6 
Change-Id: I071211b233ce480fea38f069470bfe9441603cd0
 2020-05-22 12:04:11 +00:00
Julia Reynolds
e5fc3bb57c Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 
Change-Id: I7c8da87f67f1306425677b6de82498cab2f3b45f
 2020-05-22 12:04:02 +00:00
Julia Reynolds
423fdfa8bb Update conversation-related strings am: 9e78ec75d1 am: 61e956443d 
Change-Id: I124b22d123aa7abf5bbc3adc264478e166cd900d
 2020-05-22 12:03:49 +00:00
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
4b78d753b8 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 
Change-Id: I2a163df1ff0574518804bcff3be2f9650357f73a
 2020-05-22 11:48:34 +00:00
Julia Reynolds
61e956443d Update conversation-related strings am: 9e78ec75d1 
Change-Id: I9fb42f08125dcfd078045c5737bae429870022d5
 2020-05-22 11:48:26 +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
Bill Yi
0cc77c1db8 Import translations. DO NOT MERGE 
BUG:154363304
Auto-generated-cl: translation import
Change-Id: I5e504e86b52fa341e03a497003190ca2e250bb01
 2020-05-21 20:26:49 +00:00
Automerger Merge Worker
74ddcbe020 Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp 2020-05-21 19:34:45 +00:00
Julia Reynolds
34e0ebd5dc Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d 
Change-Id: I75d636b27d67ce8a549d4d8287755c60c110677e
 2020-05-21 19:34:39 +00:00
Julia Reynolds
a98f5e1445 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d 
Change-Id: Iabb72c8e018cf568ae43ac1a24f7d1b7fafbfad7
 2020-05-21 19:34:33 +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
22ac6baf3d Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 
Change-Id: I84fb7adb02d4b7731327e531cddd48171bd4329b
 2020-05-21 19:16:53 +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
c47bdeb62f Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: fa85b4e1f6 
Change-Id: I28cf36ad0dc3c278af23cca880075bf7ffc79e07
 2020-05-21 15:33:16 +00:00
Robert Luo
b15149a1eb Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 
Change-Id: I5557b6c9dc3eeb82497f16ea1fdf912e26cfaa86
 2020-05-21 15:33:03 +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
83fa4e6425 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 
Change-Id: I9c81a2973ffcb3416390417c48a72e3635bec0c4
 2020-05-21 15:08:31 +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
b29c7c49e7 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 
Change-Id: I4ad18d5526b18a4eb862f77f379736fbd0e8a0e2
 2020-05-21 12:35:02 +00:00
TreeHugger Robot
9e5d3a8805 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 
Change-Id: I05397c331eadd9841fd8c2ba935b75ad5861dbc8
 2020-05-21 12:34:32 +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
1560e89128 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 
Change-Id: I97bc8f4fa39ca1fef9bbce21d1fb48832d948fba
 2020-05-21 12:20:57 +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
70aa2882a6 [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd 
Change-Id: I0a367b53e4c85ea3db4b8452073c64d836aa721e
 2020-05-20 20:33:02 +00: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
ac648d6916 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1a6119bcc82c95a996d762eb9a28e6a2878f1ca1
 2020-05-20 16:22:06 +00:00
TreeHugger Robot
42a6154347 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-20 16:00:46 +00:00
Automerger Merge Worker
a06ef7b194 Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp 2020-05-20 14:42:44 +00:00
TreeHugger Robot
1518db1927 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674 
Change-Id: Ica90e78597092bc44aabd28c5357fbe17ecffafe
 2020-05-20 14:42:40 +00:00
TreeHugger Robot
742dd6f60c Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc 
Change-Id: I764291b14b76fa7dd24644fe3ae739f324f4f5e9
 2020-05-20 14:42:31 +00: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
3ba40628fc Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda 
Change-Id: Ibc06bd838df06258f98e87fcb3a9da43c47be504
 2020-05-20 14:31:50 +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
e7495a57dc [automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd am: 075a17c995 -s ours am: 3d46b0e5ec -s ours 
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70 is in history

Change-Id: I0694e2236c4f7ecfb38583f3bb736f416991e434
 2020-05-20 13:19:34 +00:00