Sooraj Sasindran
9885fd223a
Revert "access system resources with android.R package" am: 253ba4f3ef
am: 2628af114d
am: 5d42a76fcd
...
Change-Id: Ie2671eebc7f57108d650908989b737ca46ca9d36
2020-03-20 05:26:15 +00:00
Goven Liu
e909a1def8
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
am: a3e9660230
am: bb21d59c96
...
Change-Id: Ib9c3babc5eba602d488ea2a6117008be9d50d96d
2020-03-20 05:25:46 +00:00
Sooraj Sasindran
5d42a76fcd
Revert "access system resources with android.R package" am: 253ba4f3ef
am: 2628af114d
...
Change-Id: I2bb5796b7c181d68a8c1d6a4cba3201162930a02
2020-03-20 05:09:17 +00:00
Goven Liu
bb21d59c96
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
am: a3e9660230
...
Change-Id: I9bafbacf24f2d26446e043fcc9952dde9eaaa6ba
2020-03-20 05:08:58 +00:00
Sooraj Sasindran
2628af114d
Revert "access system resources with android.R package" am: 253ba4f3ef
...
Change-Id: Idf5eee8350df4aaa7ea37f85677b315b35c56028
2020-03-20 05:01:58 +00:00
Goven Liu
a3e9660230
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
...
Change-Id: I35f128811a9d4e480ada35a99f1fa4b90c243834
2020-03-20 04:56:52 +00:00
Goven Liu
b626a602c9
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev
2020-03-20 04:54:46 +00:00
TreeHugger Robot
75062d0a6a
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
am: bf82eab918
am: 1bea826cad
...
Change-Id: I1c3db45282066d8f10fbca84f2719d8e01d94581
2020-03-20 04:25:19 +00:00
TreeHugger Robot
1bea826cad
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
am: bf82eab918
...
Change-Id: If87953e41319b8660dab392f339092c30ce7f6f6
2020-03-20 04:13:50 +00:00
TreeHugger Robot
303eabfc93
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d
-s ours am: dc1f295a59
-s ours am: e04ffe1aa1
-s ours am: 779a069520
-s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: Ie0acf11792ad4a43b510f8cabd1730047690e354
2020-03-20 04:02:16 +00:00
TreeHugger Robot
bf82eab918
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
...
Change-Id: Idb9f81cf4621e1d62fa182bdfafbfdb105390ff8
2020-03-20 04:01:46 +00:00
TreeHugger Robot
779a069520
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d
-s ours am: dc1f295a59
-s ours am: e04ffe1aa1
-s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: If21132afaf33cb00d178be19fa63b4d1b3951866
2020-03-20 03:43:31 +00:00
TreeHugger Robot
b33c16cacb
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev
2020-03-20 03:40:00 +00:00
TreeHugger Robot
e04ffe1aa1
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d
-s ours am: dc1f295a59
-s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: Id0c124c57c782835535df26c5eee251af97dd12b
2020-03-20 03:30:26 +00:00
TreeHugger Robot
dc1f295a59
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d
-s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: I279a6e1584a26219a1b3b26a0054ebb9728b498e
2020-03-20 03:19:10 +00:00
TreeHugger Robot
bdffe50d16
Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
am: 23df2cf9c9
am: e3e2309149
...
Change-Id: I74925d6ec263360f9ca6c9cc90cebc7c1480a97f
2020-03-20 03:02:33 +00:00
TreeHugger Robot
3c137d807d
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev
2020-03-20 02:51:54 +00:00
TreeHugger Robot
e3e2309149
Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
am: 23df2cf9c9
...
Change-Id: I88956b7fca1e11e434b3f19cf8b29c313834e220
2020-03-20 02:38:48 +00:00
TreeHugger Robot
23df2cf9c9
Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
...
Change-Id: Ic0b09f6cd825e413e87b06434bfdeb65e66225c3
2020-03-20 02:18:53 +00:00
TreeHugger Robot
6e032c607e
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0
am: 70215248d1
am: 221d385fea
...
Change-Id: Ia210245ea35453ff8970073f89f5f56e66e4a573
2020-03-20 02:15:46 +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
b436d149e4
Merge "Update string for Adaptive sleep slice title." into rvc-dev
2020-03-20 01:16:53 +00:00
TreeHugger Robot
221d385fea
Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0
am: 70215248d1
...
Change-Id: I122499b6d4bccf7ece08039abc02a1a5dedc9e9a
2020-03-20 01:09:41 +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
7e25c0d19f
Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f
am: 123fcc61f7
am: a10b01df8b
...
Change-Id: I0400c2de031191401063b3968d5dcade8714db03
2020-03-19 23:10:54 +00:00
TreeHugger Robot
9ae2332edf
Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84
am: 2fac4fae3a
am: ab6d1522de
...
Change-Id: I5787c6304dd04cde18b664ac62be4178668c4f6b
2020-03-19 23:10:46 +00:00
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
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
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
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
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
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
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
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
TreeHugger Robot
691aa7a05e
Merge "Change cross profile settings page title" into rvc-dev
2020-03-19 22:03:22 +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
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
Hall Liu
311f618c31
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
am: f5e8d0662a
am: 0f8b597b2e
...
Change-Id: I66e3faffaeac07fb2d5e03d48af3bdb90fe341b1
2020-03-19 21:39:17 +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
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
0f8b597b2e
Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev am: 64e48c2061
am: f5e8d0662a
...
Change-Id: I24f8120dec0d8d26efaba5310a6ffd9abe2a1ff3
2020-03-19 21:15:07 +00:00