Commit Graph

85815 Commits

Author SHA1 Message Date
Menghan Li
af6acd38a5 Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121 am: 2f9ec68cbf am: caac0d6c6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240

Change-Id: I067415587bc8bf01932e6efd8145b03ba185cca5
2021-05-31 03:07:40 +00:00
TreeHugger Robot
219e128775 Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f am: 13c9e78d57 am: e24f7faeab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: I2ab5421015a41652bab78075dbe534974b6105cf
2021-05-31 03:07:23 +00:00
TreeHugger Robot
132acb43aa Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c am: 3127f05be9 am: c3cc642534
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192

Change-Id: Ida67a4838be73176d792e9edae1f10610c29a1aa
2021-05-31 03:06:52 +00:00
TreeHugger Robot
ae12fa6ae5 Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f am: 4d1c81ac07 am: 79d458d3f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: Ida36c97d256803b6e2b7cdf03872e766c1ed4850
2021-05-31 03:05:24 +00:00
Menghan Li
caac0d6c6c Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121 am: 2f9ec68cbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240

Change-Id: Ie5b5a1d52acc1fd21f9613ac6af4947aa8f7bfb3
2021-05-31 02:55:38 +00:00
TreeHugger Robot
e24f7faeab Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f am: 13c9e78d57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: I3d717162274583eb24cdaa49fbb97ae6df4ed6a8
2021-05-31 02:54:39 +00:00
Menghan Li
2f9ec68cbf Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev am: 302fb36121
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732240

Change-Id: I214a693021cdd4f090048e3905d8a8c56b931233
2021-05-31 02:48:39 +00:00
TreeHugger Robot
c3cc642534 Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c am: 3127f05be9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192

Change-Id: I87ade63d05a3ceca810d0c6d804034aaf24454ca
2021-05-31 02:45:56 +00:00
TreeHugger Robot
79d458d3f5 Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f am: 4d1c81ac07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: I9baa4f92386b3ea7ce57fbd4a5c57dc5c79c81e7
2021-05-31 02:44:50 +00:00
Menghan Li
302fb36121 Merge "Fix dialog when turn on Magnification shortcut doesn't apply GS family" into sc-dev 2021-05-31 02:44:12 +00:00
TreeHugger Robot
3127f05be9 Merge "Update Policy transparency dialog layout" into sc-dev am: 88346ce71c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733192

Change-Id: I5ca9dd413db7d8254b80e33a99fdefba9e1f264d
2021-05-31 02:42:02 +00:00
TreeHugger Robot
13c9e78d57 Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: I40825b1b3dec4e50ecd0ef8974835f25e389cffa
2021-05-31 02:32:16 +00:00
TreeHugger Robot
88346ce71c Merge "Update Policy transparency dialog layout" into sc-dev 2021-05-31 02:29:53 +00:00
TreeHugger Robot
4d1c81ac07 Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198

Change-Id: I44e3d8aced8c47621931bd7185632cc4527d29b2
2021-05-31 02:25:56 +00:00
TreeHugger Robot
bc587c4d1f Merge "Fix bluetooth pairing notification could not be removed" into sc-dev 2021-05-31 02:07:17 +00:00
TreeHugger Robot
1fe6fe444d Merge "Fix the background color of the homepage." into sc-dev am: a7c0036a8c am: 3900eda7ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432402

Change-Id: Iae80976e44705fc10e1a6dc51d7ace2c4e0da7eb
2021-05-29 14:51:18 +00:00
TreeHugger Robot
5fb0416418 Merge "Fix the transition of the up-button." into sc-dev am: 20fa1428bc am: 94fb328182
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432390

Change-Id: I6d55e6e359148815b3d3221ef2acaff3724f5c34
2021-05-29 14:51:11 +00:00
TreeHugger Robot
4da52adb8d [automerger skipped] Merge "The UI is not immediately updated" into sc-dev am: e7515466ea am: 3cd7740b4b -s ours
am skip reason: Merged-In I692209035332bfd463537988f4e3ce166414031e with SHA-1 c0b8f62b57 is already in history

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

Change-Id: Idf58bd6a692b2017681c22355c74c3e94039829e
2021-05-29 14:51:05 +00:00
TreeHugger Robot
97cc6e213e Merge "[Provider Model] Dynamically update the Internet Panel title" into sc-dev am: 097361797a am: 73048864be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13425388

Change-Id: Ib0854059f9c8e4ed3546615a4e18c097250582d8
2021-05-29 14:50:57 +00:00
TreeHugger Robot
9b2423f823 Merge "Hide esos setting if no app provides esos functionality" into sc-dev am: 16fa77369f am: 7bf50ea180
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13428621

Change-Id: I0934d53983b114348d1bb6b6ee0ffdc547988690
2021-05-29 14:50:50 +00:00
Yanting Yang
65cb9f0dbf Merge "Update the homepage icons" into sc-dev am: 1e1c813354 am: 75fc9068d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13413819

Change-Id: Ifd1acc3191d04701021b9003b25ead1ad6693288
2021-05-29 14:50:43 +00:00
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