Daniel Bright
7178e1070b
Merge "Revert "access system resources with android.R package"" into rvc-dev am: b5e5aa9ef2
...
Change-Id: I7cb01e6980193d170eaf0438a47aa9feaf68bcaf
2020-03-20 05:16:29 +00:00
Daniel Bright
da8d46bdf9
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f
am: da2fe00a04
...
Change-Id: I3eae26f6789f463ae82150d2b950c90cfc8f7c61
2020-03-20 05:09:29 +00:00
Sooraj Sasindran
cb5953d272
Revert "access system resources with android.R package" am: 253ba4f3ef
am: 2628af114d
...
Change-Id: Ib765d1e4f0485cb3f4d42d659633e1d91c9d2735
2020-03-20 05:09:26 +00:00
Goven Liu
1db751a1d3
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
am: a3e9660230
...
Change-Id: Ia16dae9b6da10974921566f8299eb4b85e128a1d
2020-03-20 05:08:57 +00:00
Daniel Bright
da2fe00a04
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f
...
Change-Id: Ifb96ebf14d46e5c07a3cc7b96bb067f55b129b3f
2020-03-20 05:02:02 +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
Daniel Bright
dc3ca505f8
Merge "Revert "access system resources with android.R package"" into rvc-dev am: 6249dfbd9f
...
Change-Id: I115213610426564c133ddb0ca185f4273ceac242
2020-03-20 04:58:44 +00:00
Sooraj Sasindran
9c35cfa688
Revert "access system resources with android.R package" am: 253ba4f3ef
...
Change-Id: I78a68e8eef3b3cee9911cb89a9bd09ce83020357
2020-03-20 04:58:39 +00:00
Daniel Bright
b5e5aa9ef2
Merge "Revert "access system resources with android.R package"" into rvc-dev
2020-03-20 04:57:43 +00:00
Daniel Bright
6249dfbd9f
Merge "Revert "access system resources with android.R package"" into rvc-dev
2020-03-20 04:57:43 +00:00
Goven Liu
1853ed32df
Merge "[Wi-Fi] Add API to handle help button click event" into rvc-dev am: b626a602c9
...
Change-Id: Idce71a7d430a0d6da7fb8fa821e3853e0c2a9921
2020-03-20 04:57:38 +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
c38b757ae2
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
am: d5f0f2d8c8
...
Change-Id: I43810592e434d751f33d3c89175f835c3be264b5
2020-03-20 04:20:14 +00:00
TreeHugger Robot
33a8eb6d3a
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
am: bf82eab918
...
Change-Id: Ifecd2010f27b8ba5863a25adfae513b5b347b5c2
2020-03-20 04:13:15 +00:00
TreeHugger Robot
d5f0f2d8c8
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev am: b33c16cacb
...
Change-Id: Id86e0b84a70cfbeb2e96590b2d90d6059b94f37b
2020-03-20 04:02:14 +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
d01a8626ee
[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d
-s ours am: dc1f295a59
-s ours am: f28bf18e57
-s ours
...
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 91399607fe
is in history
Change-Id: I66c941397f1550d020ae12090319ac8d19e01745
2020-03-20 03:43:37 +00:00
TreeHugger Robot
291dce128c
[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: I243cada343b07b06cb99833f9d1a64ed5be5f1d9
2020-03-20 03:43:01 +00:00
TreeHugger Robot
b33c16cacb
Merge "Fixes incorrect Settings usages in ContextualAdaptiveSleepSliceTest" into rvc-dev
2020-03-20 03:40:00 +00:00
Yi-Ling Chuang
d44ceb95cc
Update the icon of security IA.
...
Fixes: 140556928
Test: rebuild and check the icon on the homepage
Change-Id: I211ea9f57910943a75d8a98c6d88ce99018debfe
2020-03-20 11:36:18 +08:00
TreeHugger Robot
f28bf18e57
[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: Ifc09356da641d2d801bbccf8370801821a0b6d12
2020-03-20 03:31:06 +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
3c137d807d
Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev
2020-03-20 02:51:54 +00:00
TreeHugger Robot
aecc635805
Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
am: 23df2cf9c9
...
Change-Id: I85acdd02d89be77fb84a4e2df332e19e5c5a98e1
2020-03-20 02:38:50 +00:00
TreeHugger Robot
bb219af59b
Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4
am: 8fd066d5d3
...
Change-Id: I9c779c447925b813728b399cb7b51ce5bc196685
2020-03-20 02:32:42 +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
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