Commit Graph

85785 Commits

Author SHA1 Message Date
tom hsu
d92d569e65 Avoid wrong telephonymanager with wrong sub id. am: ba845f7fe4 am: e8eb12011e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422724

Change-Id: Ibff3761f8df03c6b8352167340e07d3522b47699
2021-05-29 14:50:37 +00:00
TreeHugger Robot
541db70393 Merge "Apply footer icon for Smart Storage" into sc-dev am: f38af98895 am: 65b0f3382a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422710

Change-Id: Ib995419f21e66f5aed50573347922fca91cda370
2021-05-29 14:50:31 +00:00
Zoey Chen
026a50b2fb Merge "[Provider Model] Update the string to latest." into sc-dev am: e1880f026e am: d1eca65fd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13417066

Change-Id: I7ef4e6e8b0709fc92630fbbe5774312ee906e0e8
2021-05-29 14:50:24 +00:00
Peter Wang
580e050524 [automerger skipped] Merge "Add an intent filter for MobileNetworkListActivity to enable access from the LPA" am: ffccb8a611 am: b4f375fdc4 am: 003e5dc7c2 -s ours am: 3b414eb10b -s ours am: 3a627d300e -s ours
am skip reason: Merged-In I6e87d3a3c75c832354c3a3ad407889e8d2701cbd with SHA-1 0044fee7cb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1554772

Change-Id: Id273c0cb69e6c140e600acdcc562fbfca3158c54
2021-05-29 14:50:15 +00:00
Weng Su
7485367374 [automerger skipped] [Provider Model] Pass null to the reason parameter to avoid unnecessary am: 7c041874ce am: 3d7d7456c9 -s ours
am skip reason: Merged-In I469a8c72fc7a6ab057acef476296285bb8a62713 with SHA-1 7c041874ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413810

Change-Id: I65bce623c0a56d268517398c8e87ac67622b2b94
2021-05-29 14:50:02 +00:00
TreeHugger Robot
f4ea99a55f Merge "Fix the color problem at top/bottom border when page transition" into sc-dev am: 072bf553fe am: f8f435397c am: 97a4c0feba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733204

Change-Id: I06eea9227c52ffcf8cb7682c847ac7e905189f16
2021-05-28 17:10:01 +00:00
TreeHugger Robot
82ebdb5b51 Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06 am: 8ebc54161d am: 0401b8c829
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238

Change-Id: Ia4b8af05bc164084c8167bd7699d2ff0fabc21c4
2021-05-28 17:09:55 +00:00
TreeHugger Robot
1c9adbfb28 Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0 am: 1311cf8f80 am: 04c08d5a7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201

Change-Id: I713fb69bf1bb293e4ba083ef8be618e0d4cde7f4
2021-05-28 17:09:49 +00:00
TreeHugger Robot
7554c1e0d2 Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014 am: 6124c8475c am: 22b7e1a66e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754

Change-Id: Ib9c59bf39ab46fa603d0394f3d777ffedf0823ed
2021-05-28 17:09:43 +00:00
TreeHugger Robot
81dff62ea7 Merge "Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo" into sc-dev am: f2d23213b3 am: 5d9744e7de am: 755eba4304
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733200

Change-Id: Ic3e109c05eae7cca17725e123ea58b763640b383
2021-05-28 17:09:37 +00:00
menghanli
e5309560e4 Fix Magnification shortcut option content overlap with top and bottom dialog container am: ccc8a93c6c am: 4e99d76b6c am: 90bf05e1cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702393

Change-Id: I4e57bb99efee329f372131a5b084e4b6620c99a0
2021-05-28 17:09:30 +00:00
TreeHugger Robot
bd1b19d12c Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537 am: a80a4e78c7 am: ededd36ab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031

Change-Id: I48df8753ef823d49276d8f294c8a464301725d13
2021-05-28 17:09:25 +00:00
TreeHugger Robot
4b34d6827f Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083 am: 57320e6019 am: a977eff538
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: I16e1beedef32f97db94d4414f9de1ee9658c694a
2021-05-28 17:09:18 +00:00
TreeHugger Robot
7d594365b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8 -s ours am: 8018d4b2a8 -s ours am: fd90cf6ed5 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740734

Change-Id: Ic3f0988ecd858580520c071339548036f145e140
2021-05-28 17:09:12 +00:00
TreeHugger Robot
081dc96130 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours am: c6e8fc4459 -s ours am: 3c3bcfe1be -s ours am: 448cd13999 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740730

Change-Id: Ia0a0aea11001a6a5afb3af50830264aabda341f5
2021-05-28 17:09:07 +00:00
Bill Yi
b8a338cf84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours am: 3f0263ce7f -s ours am: 07b6b22b7a -s ours am: c86ec7306d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740620

Change-Id: I6950510a896390630318205d62b3b67b8aad56c7
2021-05-28 17:08:57 +00:00
TreeHugger Robot
eca72ed64a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours am: 197a03a9de -s ours am: 4d604cdfbf -s ours am: 79d0907c49 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740732

Change-Id: I043e227c1ba10da446ddbbdfbf133e293a96a9f9
2021-05-28 17:08:47 +00:00
Bill Yi
5b005634c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours am: b257c75f38 -s ours am: 7ca5092db4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740731

Change-Id: I3d71952aab02f84522ff5fede0224efa93ded0b6
2021-05-28 17:07:05 +00:00
TreeHugger Robot
ed239582a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours am: 123386039b -s ours am: a418518fd0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740737

Change-Id: I0eb9bac5e1f5f394450d14fd927cefa891478c07
2021-05-28 16:59:05 +00:00
TreeHugger Robot
97a4c0feba Merge "Fix the color problem at top/bottom border when page transition" into sc-dev am: 072bf553fe am: f8f435397c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733204

Change-Id: I4736c25b5da77416490ca0d0a25e0de656321f14
2021-05-28 16:33:05 +00:00
TreeHugger Robot
0401b8c829 Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06 am: 8ebc54161d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238

Change-Id: I711e66e96abc52fdb8520282bf39d296a16c472f
2021-05-28 16:33:01 +00:00
TreeHugger Robot
04c08d5a7e Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0 am: 1311cf8f80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201

Change-Id: Id0d156cbd9996f6c44450c305ec71b851a340893
2021-05-28 16:32:58 +00:00
TreeHugger Robot
22b7e1a66e Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014 am: 6124c8475c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754

Change-Id: Ia82a7e92ed5fc6b6d60a7eb765bc27cac9cde540
2021-05-28 16:32:54 +00:00
TreeHugger Robot
755eba4304 Merge "Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo" into sc-dev am: f2d23213b3 am: 5d9744e7de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733200

Change-Id: I7737e87bdbb409e8adc637ffb070294889c27ebb
2021-05-28 16:32:49 +00:00
menghanli
90bf05e1cd Fix Magnification shortcut option content overlap with top and bottom dialog container am: ccc8a93c6c am: 4e99d76b6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702393

Change-Id: Iafc5742139dccacac5619718a11e47b2e240d755
2021-05-28 16:32:44 +00:00
TreeHugger Robot
ededd36ab7 Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537 am: a80a4e78c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031

Change-Id: I5b1d6ddd2e77bd29bc36e70cdeff0c838343ad44
2021-05-28 16:32:41 +00:00
TreeHugger Robot
a977eff538 Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083 am: 57320e6019
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: I037daad324f870b2f94a32947a0e5d9e06c8a8cc
2021-05-28 16:32:36 +00:00
TreeHugger Robot
fd90cf6ed5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8 -s ours am: 8018d4b2a8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740734

Change-Id: I2541d1b98f101272cae7d97b6d9150aa829e5c73
2021-05-28 16:32:32 +00:00
TreeHugger Robot
448cd13999 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 695cdae2f7 -s ours am: c6e8fc4459 -s ours am: 3c3bcfe1be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740730

Change-Id: Id32082bac226f352d2de27ad7e00838b4fac2b0d
2021-05-28 16:32:25 +00:00
Bill Yi
c86ec7306d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a44ce2abe -s ours am: 3f0263ce7f -s ours am: 07b6b22b7a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740620

Change-Id: I945fc1fb0d8b0dd0c3201be1a2b16f1f4db31b35
2021-05-28 16:31:47 +00:00
TreeHugger Robot
79d0907c49 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 660d37d895 -s ours am: 197a03a9de -s ours am: 4d604cdfbf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740732

Change-Id: I706e412e28ddbb154a719d05135c58e2a9895622
2021-05-28 16:31:16 +00:00
Beth Thibodeau
9dec34ed34 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: ff3fc65ac3 am: f879401103
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: I37e09672af7c6308cfd46cc8396f8ab448738398
2021-05-28 16:29:03 +00:00
Betty Chang
46af29695f Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 am: 4a42b08b79 am: 5b9ff213e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: I91316d30445b2943b1c98e163dd645047b7bdbba
2021-05-28 16:28:52 +00:00
Kevin Chyn
3b6e2891f2 Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: c00c3bdd03 am: 107a499e8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: Ia9e075ba2bc7aa965a5a9237496ef78acbef34b9
2021-05-28 16:28:46 +00:00
Bill Yi
7ca5092db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f8a2c62f84 -s ours am: 332a439d60 -s ours am: b257c75f38 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740731

Change-Id: Ice2ab93eceb974442ca2865a23eb5fb4ba5d6048
2021-05-28 16:25:20 +00:00
TreeHugger Robot
278db21ec8 Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 am: a25ffb5ba9 am: 5f6f37a889
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: I5a87a84f02455045eb7feefe4fc1d9490b5b95c5
2021-05-28 16:24:52 +00:00
TreeHugger Robot
a418518fd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4b9bf7e90c -s ours am: 123386039b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740737

Change-Id: I28bbef627f3706ed9b2fcbebfff97132d602a8f4
2021-05-28 16:21:18 +00:00
Beth Thibodeau
f879401103 Merge "Add recommendation setting and remove app settings" into sc-dev am: 8e67634830 am: ff3fc65ac3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14720441

Change-Id: Id901a1fc59b639281395f09367f0371a5fdf1084
2021-05-28 16:05:29 +00:00
Betty Chang
5b9ff213e3 Merge "Adding an option to install a certificate from the CA certificate menu" into sc-dev am: b857491c48 am: 4a42b08b79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14209646

Change-Id: I0f554a255d964d0b6c86a3abad11a0ed3a60102a
2021-05-28 16:05:19 +00:00
Kevin Chyn
107a499e8f Merge "Use lottie animation for fingerprint edu" into sc-dev am: dc00faece6 am: c00c3bdd03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14721437

Change-Id: Ie0ab96cf46de93fc9e018499be96dbe57625ddfc
2021-05-28 16:05:15 +00:00
TreeHugger Robot
5f6f37a889 Merge "Update battery defender tip string" into sc-dev am: 029edb7c48 am: a25ffb5ba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14730710

Change-Id: Ib83a0db2d5fac3688ae4d3de35ce320bfed34de4
2021-05-28 16:02:19 +00:00
TreeHugger Robot
2622d36513 Merge "Fix the color problem at top/bottom border when page transition" into sc-dev am: 072bf553fe am: 286ed10432 am: a4391091b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733204

Change-Id: Iedd865095476ddf5ad5c1de546d78f23160a20d1
2021-05-28 04:09:02 +00:00
TreeHugger Robot
a423afc8fa Merge "Hide "Add link" item when have no addable items" into sc-dev am: 7ffd89ed06 am: 7425f30a21 am: 8b201e4d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732238

Change-Id: I1b1cc091befa78e470298940695bf466919cee73
2021-05-28 04:08:57 +00:00
TreeHugger Robot
cbd7b46de8 Merge "Fix NPE at Storage Settings configuration change" into sc-dev am: aab74b24c0 am: faf84a3cd2 am: 033421f680
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733201

Change-Id: I2b34b5ad4f5f092d853121f73826504d239a620c
2021-05-28 04:08:51 +00:00
TreeHugger Robot
af258e57e1 Merge "Shows trash category in Storage Settings" into sc-dev am: 90c29cf014 am: 28544e66b2 am: 704b9458c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702754

Change-Id: I5965168f0d9554c69fe52b19f088a89364af11cc
2021-05-28 04:08:45 +00:00
TreeHugger Robot
5c2312e67e Merge "Fix [AR] - Icons are slightly overlapping adjacent text in the Allow Accessibility demo" into sc-dev am: f2d23213b3 am: 0e03fd2480 am: da3856cf2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733200

Change-Id: Id10d0680a24acc57e9152d90ce44a9eb8af055c4
2021-05-28 04:08:39 +00:00
menghanli
2fc0715b90 Fix Magnification shortcut option content overlap with top and bottom dialog container am: ccc8a93c6c am: 9fadbe0324 am: 4ec5edef67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702393

Change-Id: Id28a68d3e85eb7e56ec3b769d4d8e71481775789
2021-05-28 04:08:33 +00:00
TreeHugger Robot
e4097b8ae9 Merge "Fix LocationSetttingsFooter robotests" into sc-dev am: 2bc0aa5537 am: d5f9f645c3 am: f6bd155c98
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14749031

Change-Id: Ie2532b64ea04b0aab05704fa504b4665ac0307e9
2021-05-28 04:08:28 +00:00
TreeHugger Robot
1d21a839c8 Merge "Fix scrolling issue after MLS switches" into sc-dev am: 2718cea083 am: 1a79c0a26d am: 68fa890bc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14723398

Change-Id: Ied3aa7348f979dbdb8cec00e42dca673d9de56ae
2021-05-28 04:08:21 +00:00
TreeHugger Robot
aa330fdd16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 07b7a97ce8 -s ours am: 00d51f35f2 -s ours am: 606ec1ca33 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14740734

Change-Id: I0a2b33fcd6b95c10fb1ae87fb6873f97700df49f
2021-05-28 04:08:15 +00:00