Commit Graph

62478 Commits

Author SHA1 Message Date
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
b6c9f60163 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9 am: e3e2309149 am: bdffe50d16 am: 426c0d4da2
Change-Id: I243ee1bc7224e3ba37bf43816293b1562b23767f
2020-03-20 03:31:08 +00: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
426c0d4da2 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9 am: e3e2309149 am: bdffe50d16
Change-Id: Ic373f587cf3b3dab283909f4c1a5e0e12457c396
2020-03-20 03:20:16 +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
4519e932b9 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9 am: aecc635805 am: 9f7cab58e5
Change-Id: I77bf4d858b47e65ac32ea5a2f9ccc94c278bdcf7
2020-03-20 03:03:26 +00:00
TreeHugger Robot
72ebe55ea8 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 8fd066d5d3 am: bb219af59b am: f753a5941d
Change-Id: Ie8f9f2d46471ea049ad2b98bafeacf6153f968a8
2020-03-20 03:02:40 +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
9f7cab58e5 Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 23df2cf9c9 am: aecc635805
Change-Id: I6de3b6e07f1094421c12fcbf75d6d2a17fbdeb06
2020-03-20 02:59:37 +00:00
TreeHugger Robot
f753a5941d Merge "Update string for Adaptive sleep slice title." into rvc-dev am: b436d149e4 am: 8fd066d5d3 am: bb219af59b
Change-Id: Icbaf7893e806b7d93f8a038b4db3201525f11ea0
2020-03-20 02:58:21 +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
4d44c72097 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1 am: 221d385fea am: 6e032c607e am: 844810471f
Change-Id: I1a26a54452678a79a99d2c64eee39d2e0df3b9d9
2020-03-20 02:39:28 +00:00
TreeHugger Robot
a288e3f48b Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 33650f397b am: 7d5541262c am: 5a11876238
Change-Id: Ibcb747ea900940c440990c58fa4361d2bee6a3bc
2020-03-20 02:39:12 +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
24779d3848 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1 am: 9c411a05a8 am: add7d3ae54
Change-Id: I882a2800530dc1771d54adabe7f37f9e134a7e5d
2020-03-20 02:38:49 +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
844810471f Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1 am: 221d385fea am: 6e032c607e
Change-Id: Id07196fe33147cd164f809280b1ca2384b8ea78d
2020-03-20 02:38:48 +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
5a11876238 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 33650f397b am: 7d5541262c
Change-Id: I68aa5dd191e0125ef5986c22f9e8425d51dfde46
2020-03-20 02:16:07 +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
TreeHugger Robot
add7d3ae54 Merge "Change to Contact Discovery Dialog Language based on Privacy Feedback" into rvc-dev am: db468353e0 am: 70215248d1 am: 9c411a05a8
Change-Id: I0b09482ebc7856f2de184b24fe3bc73c47bd3fd7
2020-03-20 02:15:52 +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
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
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
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
TreeHugger Robot
9b72496123 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 123fcc61f7 am: a10b01df8b am: 7e25c0d19f am: 43bfae3a8a
Change-Id: I92498370f807a4a0c042d3adabfda92c58d45451
2020-03-19 23:41:02 +00:00
TreeHugger Robot
cb2a14e73a Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 2fac4fae3a am: ab6d1522de am: 9ae2332edf am: 5ee75fe858
Change-Id: I078df720d95dab21d0cd0752d782f97b1ed84767
2020-03-19 23:39:43 +00:00
TreeHugger Robot
43bfae3a8a Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 123fcc61f7 am: a10b01df8b am: 7e25c0d19f
Change-Id: Id3092c6c54ba075fd5e0c3b3ab1756685b5028dd
2020-03-19 23:23:15 +00:00
TreeHugger Robot
5ee75fe858 Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 2fac4fae3a am: ab6d1522de am: 9ae2332edf
Change-Id: Ib09ef002f85ff5b847dac88dca7f8e969741ca0c
2020-03-19 23:23:08 +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
4fbd58c2d3 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 7215a8a982 am: e06bef1536 am: 2aeb2a92bc
Change-Id: I78a2fe58b9506f7e08940232f985402754f0c3d0
2020-03-19 23:12:12 +00:00
Automerger Merge Worker
dcad07c952 Merge "Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 32d71ab700" into rvc-d1-dev-plus-aosp am: efb5934755 am: eab35b82a6
Change-Id: If109e30d04312f4afc7bbb591cad38f5106b7136
2020-03-19 23:11:55 +00:00
TreeHugger Robot
06f8261d39 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 123fcc61f7 am: 021a365b12 am: 5e3e2885e9
Change-Id: Iab2373795a904b705cfb61cb8b2c2b6b3c0b9fb6
2020-03-19 23:11:19 +00:00
TreeHugger Robot
2aeb2a92bc Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 7215a8a982 am: e06bef1536
Change-Id: I063d1cefefca599a10eaaac67bde2bd74357b694
2020-03-19 23:11:09 +00:00
Automerger Merge Worker
eab35b82a6 Merge "Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 32d71ab700" into rvc-d1-dev-plus-aosp am: efb5934755
Change-Id: I0cac4bd64c8f62edf83ae47c5c2b5b724bd3135c
2020-03-19 23:11:05 +00:00
TreeHugger Robot
a8d39b0db0 Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 2fac4fae3a am: 0e40fdfc6e am: 48c380ccc4
Change-Id: Ibb01abf12e2e95d0039397416ae4b29a95f45515
2020-03-19 23:11:00 +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
5e3e2885e9 Merge "Add strings for the install app banner in cross profile settings" into rvc-dev am: c4fd9b8d6f am: 123fcc61f7 am: 021a365b12
Change-Id: I82ce7cf9b8251ef0fbb230f2a4dcc4e2a8c2f5b7
2020-03-19 23:10:53 +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
48c380ccc4 Merge "Settings strings for bubbles" into rvc-dev am: 7be978cd84 am: 2fac4fae3a am: 0e40fdfc6e
Change-Id: I932adbd0d29e7d8d55281308e1491970d784e685
2020-03-19 23:10:39 +00:00
TreeHugger Robot
80a966e51c Merge "Change cross profile settings page title" into rvc-dev am: 691aa7a05e am: a94808e416 am: 64856e8dee am: eb694af63f am: c69af6791b
Change-Id: I90604bf7e598b349258b79ca0f864c5377bd2213
2020-03-19 23:04:26 +00:00