Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,963 Commits 1 Branch 0 Tags
a4f7f62dd108a3dfd00631efc3f620d5eb96d196
Commit Graph

63963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
a4f7f62dd1 Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev am: 37318d03a4 am: 9821b664b7 
Change-Id: I7fd79aa6294b0c0b6748169b68599e0b2757a614
 2020-05-26 06:16:41 +00:00
Paul Hu
9821b664b7 Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev am: 37318d03a4 
Change-Id: I18618155c37e90cb08337f78a8000ccbc227419b
 2020-05-26 06:00:52 +00:00
Paul Hu
37318d03a4 Merge "Forward the ResultReceiver to Tethering Entitlement app" into rvc-dev 2020-05-26 05:47:09 +00:00
Treehugger Robot
01f5f6ad49 Merge "Settings performance testing" am: 32ca9b270d am: 9cfbb7fba3 am: 271f5f2972 
Change-Id: Ia6596cef93e0c433979a23bf12ce674f216ed337
 2020-05-25 14:08:22 +00:00
Treehugger Robot
271f5f2972 Merge "Settings performance testing" am: 32ca9b270d am: 9cfbb7fba3 
Change-Id: If7a33f361203d5d27407ba8b8419f84fa5b931ed
 2020-05-25 13:56:14 +00:00
Treehugger Robot
9cfbb7fba3 Merge "Settings performance testing" am: 32ca9b270d 
Change-Id: Id0f496b2c8709c2655eadccef900256d52a6a130
 2020-05-25 13:44:32 +00:00
Treehugger Robot
32ca9b270d Merge "Settings performance testing" 2020-05-25 13:32:11 +00:00
youtengliang
bc1618f5d5 Settings performance testing 
1. Enable airplane mode before start testing.
2. Reset airplane mode after testing.
3. Add all_results tag to track results we have.
4. Add result_count tag to track how many results we have.
5. Add shell command result details to log.

Test: atest SettingsPerfTests:LaunchSettingsTest
Change-Id: I24ed167599b660b2aa94b4a3f8ddae1dcf3d04ff
 2020-05-25 16:37:03 +08:00
Bill Yi
6d0f303f44 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 8643486fa9 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ieba6e6a2ac62a0a7680a6192ae88da7b2feb53f3
 2020-05-23 14:15:39 +00:00
Bill Yi
46aa733b9f [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours am: 4bd86eba02 -s ours 
am skip reason: subject contains skip directive

Change-Id: If8bb5a3b7fb51c2f978c151413939e994b6bb488
 2020-05-23 14:15:25 +00:00
Bill Yi
4bd86eba02 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours 
am skip reason: subject contains skip directive

Change-Id: I6970239f79d3ae7b2ce56138fc764c317ec5130d
 2020-05-23 13:55:26 +00:00
Bill Yi
8643486fa9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e0789355e -s ours 
am skip reason: subject contains skip directive

Change-Id: I288b377fa62ad7147586ac99fadefe882e38018f
 2020-05-23 13:55:26 +00:00
Bill Yi
1e0789355e Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-23 13:32:43 +00:00
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
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
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
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
Bill Yi
cd9694bd2f Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I3f42416bc415f259eaaaf87aeb8d273523e47989
 2020-05-21 11:53:23 -07: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
paulhu
2efe482d95 Forward the ResultReceiver to Tethering Entitlement app 
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
 2020-05-21 02:33:15 +00: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