Commit Graph

62478 Commits

Author SHA1 Message Date
TreeHugger Robot
a10b01df8b Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 123fcc61f7
Change-Id: I31a2dfcd7e45e9f1199e4d66a3f4cc5814b371bc
2020-03-19 22:58:15 +00:00
TreeHugger Robot
e06bef1536 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 7215a8a982
Change-Id: Iebd7b32f4eb29d7691f30202ccfa190d253daff1
2020-03-19 22:57:26 +00:00
Automerger Merge Worker
efb5934755 Merge "Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 32d71ab700" into rvc-d1-dev-plus-aosp 2020-03-19 22:57:24 +00:00
TreeHugger Robot
ab6d1522de Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 2fac4fae3a
Change-Id: Id607570b46bf2a16435955b9dbe9cc3d57cb40f8
2020-03-19 22:57:20 +00:00
TreeHugger Robot
a1205ce199 Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 32d71ab700
Change-Id: I9fcc56eb859ba39bfc2c311af6dc1cd76b91d1af
2020-03-19 22:57:20 +00:00
TreeHugger Robot
021a365b12 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 123fcc61f7
Change-Id: I8da2031b0ab34ebcc167ceac0b8bab1c7ff381c2
2020-03-19 22:57:17 +00:00
TreeHugger Robot
0e40fdfc6e Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 2fac4fae3a
Change-Id: Iaa38091a41e7c45f4dab978b5d5f74276a124d24
2020-03-19 22:57:08 +00:00
TreeHugger Robot
7215a8a982 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f
Change-Id: I40ad2a07f2e9231fa16d98006e6ad79c49a9de4c
2020-03-19 22:48:43 +00:00
TreeHugger Robot
123fcc61f7 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f
Change-Id: I73daeb7b347a75ca9ba17150ccb0e1d15d158872
2020-03-19 22:48:32 +00:00
TreeHugger Robot
c69af6791b Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416 am: 64856e8dee am: eb694af63f
Change-Id: I897ccc4d688387df3d1db28ee0c27d64365535fc
2020-03-19 22:47:46 +00:00
TreeHugger Robot
2fac4fae3a Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
Change-Id: I3cb785619efbd09712a60a3a1b02cb1265ad7748
2020-03-19 22:47:27 +00:00
TreeHugger Robot
32d71ab700 Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
Change-Id: I0d1b386cb8fb5ad18bfe832fe9cee8bdacfbf603
2020-03-19 22:47:21 +00:00
Yi Jiang
80d0fa1c5e Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest
Bug: 139319542
Test: atest ContextualAdaptiveSleepSliceTest
Change-Id: Ie10e8c06382594fe417d9d495b8b071afb717723
2020-03-19 15:39:34 -07:00
TreeHugger Robot
c4fd9b8d6f Merge "Add strings for the install app banner in cross profile settings" into rvc-dev 2020-03-19 22:39:31 +00:00
TreeHugger Robot
7be978cd84 Merge "Settings strings for bubbles" into rvc-dev 2020-03-19 22:37:11 +00:00
Michael Groover
eecd130403 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: d8947709a8 am: dd1f73de70 am: 8069ceb870
Change-Id: I73a9676e32ba902060aa3dfbc4c57c2399653018
2020-03-19 22:28:56 +00:00
Varun Anand
b021fb473a Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: b017ddac36 am: 8b51e34a88 am: 3afa79d613
Change-Id: Ib3a9384b199d777f07e6335b43e0ab56f14e2a27
2020-03-19 22:28:34 +00:00
TreeHugger Robot
69cfccbcce Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: 13b129632a am: ffbf0f432c am: a4d0d4cf88
Change-Id: I10848a03f41f4984265c37e1bc8e22aeb1cf7233
2020-03-19 22:28:21 +00:00
TreeHugger Robot
f228011189 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416 am: 7c487d23b3 am: aa56446b28
Change-Id: I59692f2ed46409fc31187f9786e94217ad67436c
2020-03-19 22:27:48 +00:00
TreeHugger Robot
eb694af63f Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416 am: 64856e8dee
Change-Id: If033304b8f79c8c033f40f1e7df442f3dc8d2e0b
2020-03-19 22:27:28 +00:00
Brad Ebinger
de2ffe1f16 Change to Contact Discovery Dialog Language based on Privacy Feedback
Bug: 141950843
Test: verify text
Change-Id: Iadc46ac18c1ec8e63cfe0d4d162e7222bfbc9a12
2020-03-19 15:26:25 -07:00
Michael Groover
4e0539d74c Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 4605509b09 am: 835451cb23 am: fcc5744298
Change-Id: Ic0820332547a82461acc861c45e0c30b459379d1
2020-03-19 22:23:52 +00:00
Varun Anand
861b2e6f5f Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 38fc2238bd am: 49c5126eea am: 2e8baa0421
Change-Id: I08146bbff7f7651234f3b264bdc2dad1e20accce
2020-03-19 22:23:00 +00:00
Michael Groover
8069ceb870 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: d8947709a8 am: dd1f73de70
Change-Id: I70062e11c96964cfcada337cf3b8fdcd2dd708f5
2020-03-19 22:20:50 +00:00
Varun Anand
3afa79d613 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: b017ddac36 am: 8b51e34a88
Change-Id: I3e90c8b6ae1c7a65abafefa745abf91416c2a1a4
2020-03-19 22:20:23 +00:00
Michael Groover
3c14b044ff Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: 81020f989d am: 64453c54f0
Change-Id: I0bd0205132c4e60b3b0968d62cfc66b4412b686e
2020-03-19 22:20:23 +00:00
TreeHugger Robot
a4d0d4cf88 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: 13b129632a am: ffbf0f432c
Change-Id: I01b891a8405ceb2e7c82ea9f3f2f59e4d21fdc36
2020-03-19 22:15:51 +00:00
TreeHugger Robot
aa56446b28 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416 am: 7c487d23b3
Change-Id: I7b9b42d861bc07bead8888d0e9536229d033cbf9
2020-03-19 22:15:24 +00:00
TreeHugger Robot
ffbf0f432c Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: 13b129632a
Change-Id: I548539c3d32e8b58ebfbe199e1324bb528671ae3
2020-03-19 22:12:25 +00:00
TreeHugger Robot
64856e8dee Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416
Change-Id: I50a57b2854dbc3da9422e685d5a6714474204d90
2020-03-19 22:12:12 +00:00
Michael Groover
fcc5744298 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 4605509b09 am: 835451cb23
Change-Id: I5591e1801370446e9ac49e839699491cd2898645
2020-03-19 22:11:58 +00:00
Varun Anand
2e8baa0421 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 38fc2238bd am: 49c5126eea
Change-Id: Id2b29127794d108587b329b4d9c92739804f2e23
2020-03-19 22:11:40 +00:00
TreeHugger Robot
7c487d23b3 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416
Change-Id: Ib606f92ca70fd65a8b90a38bbb518843ed1f8d80
2020-03-19 22:11:34 +00:00
TreeHugger Robot
13b129632a Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
Change-Id: Iee14e77394977a8b2aafc6249a010fa9b820ca96
2020-03-19 22:11:31 +00:00
TreeHugger Robot
a94808e416 Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e
Change-Id: I20b328855032254efc862de8b7fe46f2b78e09fb
2020-03-19 22:11:21 +00:00
Michael Groover
64453c54f0 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: 81020f989d
Change-Id: I6b85e508ca42513793257d9f0f6c15b15760869a
2020-03-19 22:11:19 +00:00
Michael Groover
dd1f73de70 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b am: d8947709a8
Change-Id: I1e5b31b9bc1a56e6c428d9c71021e1619d5ad8c7
2020-03-19 22:11:18 +00:00
Hall Liu
3049cce720 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a am: 0f8b597b2e am: 311f618c31 am: 52ecdf66df
Change-Id: Ib5bce7a36794b2b9ba3baf1ca8ffc5a48d648dc5
2020-03-19 22:10:43 +00:00
Varun Anand
61d26322b3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: 5f0937286b am: acb2d24b80
Change-Id: I9d7c382c30de485c5530960c996775010e57c361
2020-03-19 22:05:53 +00:00
TreeHugger Robot
691aa7a05e Merge "Change cross profile settings page title" into rvc-dev 2020-03-19 22:03:22 +00:00
Peter Wang
ccd031a012 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8 am: 2e4430f334 am: a8ade48709 am: 6046dbfc6d
Change-Id: Id280e9a57cf5ffbd1ce1db09587e97e505df4f2e
2020-03-19 22:01:16 +00:00
Hall Liu
fc0d71a086 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a am: 988c14607e am: aae46fccf1
Change-Id: I81ea46744571d38fdd65b9a685453cb5e2f1f672
2020-03-19 21:59:17 +00:00
Varun Anand
8b51e34a88 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4 am: b017ddac36
Change-Id: Iff1316effa4f2f68459b60467090a5f854132f72
2020-03-19 21:56:10 +00:00
Hall Liu
900ccba596 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95 am: a81102b92c am: 30de5f4593
Change-Id: I18ffb79438ebc5cfb22b748953501f6a72ebf107
2020-03-19 21:54:53 +00:00
Hall Liu
52ecdf66df Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a am: 0f8b597b2e am: 311f618c31
Change-Id: Iedd0ac0bb8dbf8731f2e022ff1a5ba8751dbcc42
2020-03-19 21:52:45 +00:00
Michael Groover
835451cb23 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 4605509b09
Change-Id: I6c4cec755acfc931ff083d069101205f1caae039
2020-03-19 21:52:31 +00:00
Michael Groover
d8947709a8 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b
Change-Id: I63bd969e2bc4f22dc4f8c722c9c442b213f11ba9
2020-03-19 21:52:13 +00:00
Varun Anand
b017ddac36 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4
Change-Id: Ibb94c4ac652deedd9901ce577da7cc6775dcd1d7
2020-03-19 21:51:50 +00:00
Varun Anand
49c5126eea Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 38fc2238bd
Change-Id: Iafa49db88cdf8cce56f036efa4e89fb37e4f2ff2
2020-03-19 21:50:55 +00:00
Michael Groover
81020f989d Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe am: 44c041651b
Change-Id: I464c0b36d00f725526fad04715497330e9a557e6
2020-03-19 21:50:35 +00:00