Commit Graph

61101 Commits

Author SHA1 Message Date
TreeHugger Robot
8fd066d5d3 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
Change-Id: Ice2f1aae12ae46f1448bf11b25c78008c5ab4e34
2020-03-20 02:16:04 +00:00
Sooraj Sasindran
3e26fc0f21 Revert "access system resources with android.R package"
Revert "access system resources with android.R package"

Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
I1e698d404:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Idc1095563:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4
2020-03-20 01:37:47 +00:00
Sooraj Sasindran
253ba4f3ef Revert "access system resources with android.R package"
Revert submission 10146616-sim_colors

Reason for revert: b/151455581
Bug:151455581
Reverted Changes:
Idc1095563:access system resources with android.R package
Id1eab78a8:access system resources with android.R package
I1e698d404:access system resources with android.R package
I38b2e096e:access system resources with android.R package
I82bff7bd4:access system resources with android.R package
I554812a9d:access system resources with android.R package
I17831cd35:access system resources with android.R package
I2ccb04c0e:access system resources with android.R package
If25b159e1:access system resources with android.R package
Ie0189ef3b:make sim_colors a system config

Change-Id: I1e370f0eadce02508b0a16e01e51c4ac5b002ac9
2020-03-20 01:37:30 +00:00
TreeHugger Robot
7d5541262c Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 33650f397b
Change-Id: I492cddd4989b279b94ef051b7624e9a23603b7e6
2020-03-20 01:17:02 +00:00
TreeHugger Robot
b436d149e4 Merge "Update string for Adaptive sleep slice title." into rvc-dev 2020-03-20 01:16:53 +00:00
TreeHugger Robot
9c411a05a8 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1
Change-Id: I6aef0c2ce768ab6867f961b2494ba4ad4d4b8f8c
2020-03-20 01:09:21 +00:00
TreeHugger Robot
33650f397b Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0
Change-Id: I70f069eed562fedf4cdcc89361a115942c6ed1b3
2020-03-20 00:51:17 +00:00
TreeHugger Robot
70215248d1 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0
Change-Id: I5c210eec0fe7d89e8117ea5c21d4656e42cba522
2020-03-20 00:51:01 +00:00
TreeHugger Robot
db468353e0 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev 2020-03-20 00:41:34 +00:00
govenliu
907e402cfa [Wi-Fi] Add API to handle help button click event
Add API to launch help page when Openroaming help button is tapped.

Bug: 146669261
Test: Add openSubscriptionHelpPage_shouldCallStartActivityForResult unit test to check StartActivityForResult had been launched correctly.
Change-Id: If18248e7d985215e65dfdc5742cd9007efbbff1a
2020-03-19 23:22:36 +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
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
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
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
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
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
TreeHugger Robot
691aa7a05e Merge "Change cross profile settings page title" into rvc-dev 2020-03-19 22:03:22 +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
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
Varun Anand
5f0937286b Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3 am: 742cec9ad4
Change-Id: I0058545d4d9fa0cd7d524e8790e885e59208216f
2020-03-19 21:46:23 +00:00
Michael Groover
4605509b09 Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
Change-Id: Iddcb73d6300a4563d6ce146c27446d88638f212b
2020-03-19 21:37:41 +00:00
Michael Groover
44c041651b Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev am: 0a189b3abe
Change-Id: Ic0a0fb5ea9c1e75168bb3ea75d620de2ec1da42f
2020-03-19 21:36:20 +00:00
Varun Anand
38fc2238bd Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
Change-Id: Ia42e358a40f86101ab8f104697861b325fbc3293
2020-03-19 21:36:13 +00:00
Varun Anand
742cec9ad4 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
Change-Id: I3d474eaef339d445550f6d8a7bf99a01123deba0
2020-03-19 21:36:13 +00:00
Michael Groover
0a189b3abe Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev 2020-03-19 21:31:01 +00:00
Varun Anand
4ebfaec3a3 Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev 2020-03-19 21:21:22 +00:00
Hall Liu
988c14607e Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f5e8d0662a
Change-Id: Iff9a752ba2693f27e7b43e8b2b7c2a218ef5613c
2020-03-19 21:16:12 +00:00
Hall Liu
a81102b92c Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061 am: f0f5796b95
Change-Id: Id08966f10e2c84d49b10aafee7d99d35f72c4d24
2020-03-19 21:11:44 +00:00
Hall Liu
f0f5796b95 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
Change-Id: I9224f80e87ab21b00ce78427c093b5b686c9ddea
2020-03-19 21:09:09 +00:00
Hall Liu
f5e8d0662a Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
Change-Id: I5493831165ec966b30221669bd3d154a880271e5
2020-03-19 21:08:47 +00:00
Hall Liu
64e48c2061 Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev 2020-03-19 21:06:54 +00:00
Peter Wang
9009179333 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: 13dd87a9b8
Change-Id: Ieace1b8da5732c6634e10e1e39f0d959bb81566f
2020-03-19 20:46:10 +00:00
Peter Wang
13dd87a9b8 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
Change-Id: Iac656249241c2b5fe3c74f9accfc84b7195cc153
2020-03-19 20:29:16 +00:00
Peter Wang
b3bf9454eb Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6 am: e85186f38e
Change-Id: Ic3caa8e7ff348e9a6caf22431d33e92706dfa5e4
2020-03-19 20:17:01 +00:00
Mady Mellor
1f54e84c3c Settings strings for bubbles
To be used in a follow up..

Test: treehugger
Bug: 151965589
Change-Id: I1a285d0eb827eed33d9dcca2ec6e2be2ef098185
2020-03-19 13:16:36 -07:00
Peter Wang
e85186f38e Merge "[API Review] APIs in SubscriptionManager" into rvc-dev am: 6c95bb5cf6
Change-Id: I904e10cf91836c1d25d6b318dff364185f5a796f
2020-03-19 20:16:15 +00:00
Peter Wang
6c95bb5cf6 Merge "[API Review] APIs in SubscriptionManager" into rvc-dev 2020-03-19 20:07:39 +00:00
kholoud mohamed
48db1a2b0d Add strings for the install app banner in cross profile settings
Bug: 151920866
Test: N/A
Change-Id: Ib0cf7e437952211ce929c1eba763dc8ed54793e6
2020-03-19 20:04:31 +00:00