PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,595 Commits 1 Branch 0 Tags
b4f80d69f3926ac944f109bf45ca0d1e663b7935
Commit Graph

100595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Liu
b4f80d69f3 Merge "Home Controls: Update subtitle for setting." into tm-dev am: b5fe96719c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16991603

Change-Id: I6d463669c7108abe80ec4341e7ac0936dbc72b9e
 2022-03-03 22:25:51 +00:00
Aaron Liu
b5fe96719c Merge "Home Controls: Update subtitle for setting." into tm-dev 2022-03-03 22:20:54 +00:00
Menghan Li
3ac2e14863 Merge "Polish humanize strings for one-handed mode page" into tm-dev am: c5e6cfdc17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16932279

Change-Id: I55f37f5514185ef3e1715acb83ae8ab4ca9bc1c9
 2022-03-03 22:14:52 +00:00
Menghan Li
c5e6cfdc17 Merge "Polish humanize strings for one-handed mode page" into tm-dev 2022-03-03 21:25:02 +00:00
Karishma Vakil
bc84aad406 Merge "[SafetyCenter] Update Settings to align with renamed SafetyCenterManager APIs" into tm-mainline-prod 2022-03-03 20:09:15 +00:00
Aaron Liu
ea34e9ab42 Home Controls: Update subtitle for setting. 
Change subtitle for device controls setting to be less generic. Need to address merge conflicts here.

Bug: 216110204
Test: Manual
Change-Id: I848d052461f412c51109c39b811252c64b19440a
(cherry picked from commit d0b77425a3)
 2022-03-03 19:56:57 +00:00
TreeHugger Robot
3dc1a0a3b7 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev am: 02589e8b66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17069323

Change-Id: Ic144b00f6dcd546e3a51e6d99c4f45ee8ce8fd35
 2022-03-03 16:40:03 +00:00
TreeHugger Robot
02589e8b66 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev 2022-03-03 16:17:25 +00:00
PETER LIANG
5f0fe18050 Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev am: eb0a69cfcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050387

Change-Id: I435d1bde06f082e133519554d0910e72fa3fd78e
 2022-03-03 15:46:35 +00:00
PETER LIANG
eb0a69cfcc Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev 2022-03-03 15:25:44 +00:00
Menghan Li
357a64ddb2 Merge "Remove font size & screen size setup flow instance" into tm-dev am: d3ec64104d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049975

Change-Id: I783bc27f99f3233bbd4cd42ec6e017fb741d677c
 2022-03-03 15:12:16 +00:00
Menghan Li
5da531f442 Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev am: 4c167c01c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046369

Change-Id: Ia1631734c9d74e297bd46efe42ff69d3ee040b84
 2022-03-03 15:11:53 +00:00
Menghan Li
2519cdea5c Merge "Apply Glif theme before using dynamic color." into tm-dev am: 57ced74d51 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17033479

Change-Id: I0b1d895aa36ec3222742a118065b65c6c089a708
 2022-03-03 15:11:45 +00:00
Menghan Li
d3ec64104d Merge "Remove font size & screen size setup flow instance" into tm-dev 2022-03-03 14:40:17 +00:00
Menghan Li
4c167c01c7 Merge "Show different tooltips for QS features auto-added and non-auto-added" into tm-dev 2022-03-03 14:39:55 +00:00
Menghan Li
57ced74d51 Merge "Apply Glif theme before using dynamic color." into tm-dev 2022-03-03 14:39:34 +00:00
Edgar Wang
0dba77bc2f Ignore test case of SetupSkipDialogTest 
Bug: 222467830
Test: robotest
Change-Id: I5a4c2de830b90c3d7e83b751f09114b4ce2737fd
 2022-03-03 21:53:02 +08:00
SongFerng Wang
aecc64d135 Merge "[MEP] The condition of "null point check" is wrong" into tm-dev am: cdb08ee92a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049216

Change-Id: Ifc4ed5aed400fa414a5bb6babbf7dd689275d0f4
 2022-03-03 12:54:47 +00:00
SongFerng Wang
13ed847fb4 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev am: 9ca62b2290 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049215

Change-Id: I11a7df9bad11d3324ff62e4710ce050ca4275e3a
 2022-03-03 12:54:40 +00:00
SongFerng Wang
110236db44 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev am: 822d099412 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17066725

Change-Id: Ic101b56aea5e44cf6ad3f191f299d04d386fd2a9
 2022-03-03 12:54:27 +00:00
SongFerng Wang
cdb08ee92a Merge "[MEP] The condition of "null point check" is wrong" into tm-dev 2022-03-03 12:36:59 +00:00
SongFerng Wang
9ca62b2290 Merge "Fix the settings crash when SimDialogActivity is null" into tm-dev 2022-03-03 12:36:43 +00:00
SongFerng Wang
822d099412 Merge "[MEP] The subscriptionInfo's getSimSlotIndex is logical slotId" into tm-dev 2022-03-03 12:36:20 +00:00
Edgar Wang
3dc5c139cc Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052927

Change-Id: I7388330cc386f34ea14bba40fe9b2770b456fc35
 2022-03-03 12:19:41 +00:00
Edgar Wang
f0a675f07d Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev 2022-03-03 11:56:54 +00:00
Tom Hsu
0249c0aff4 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049211

Change-Id: Ib503c69b72bb7a757bc74b5c8904a157d517abc3
 2022-03-03 11:47:24 +00:00
Bill Yi
44b4adcb04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours am: 18a9ad3101 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d8f732beb6e20657f47c32a26919f430d1db8d7
 2022-03-03 11:46:43 +00:00
Tom Hsu
f966c34a41 Merge "[Panlingual] Improve UI can not show on at first." into tm-dev 2022-03-03 11:36:08 +00:00
Bill Yi
18a9ad3101 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours am: 702e26be61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40ac285e6b052159ede32d3ff07f8f900d8ec406
 2022-03-03 11:27:15 +00:00
Bill Yi
702e26be61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours am: 8f3d7d5a77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f28b44ef8df97b7a8378a6406ea002ba6314aa6
 2022-03-03 10:51:36 +00:00
Bill Yi
8f3d7d5a77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours am: 40e23845e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie77cff6452d3575640d7a610febe563736e4dd22
 2022-03-03 10:31:28 +00:00
TreeHugger Robot
2ac592070e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I9d3c8b4a0f6a31a603e16e440d77974b538b7db3
 2022-03-03 10:18:56 +00:00
TreeHugger Robot
5a5bfcf48d Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I02091b9fa75c14c15da42fd83e1aeb10391b92d6
 2022-03-03 10:08:36 +00:00
Bill Yi
40e23845e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ba7f57217 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife884fc14969c0babdd6948edff1781a75e6cfb6
 2022-03-03 10:08:18 +00:00
Bill Yi
73f7e22809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours am: baecf5a51e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f9d6abecd5421bd8feac731cdc43b48025f328d
 2022-03-03 09:59:36 +00:00
Bill Yi
d529bb6864 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours am: 01f5ecdb4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ed395fb5c77ab3d5fc130e2c6dfb9d68639ca17
 2022-03-03 09:58:57 +00:00
TreeHugger Robot
aa7bb23dd7 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev am: 8f84e7a9e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I332e83fafd33d8be9f8b564275635b43f9c1103b
 2022-03-03 09:58:19 +00:00
Bill Yi
7e5988a9b3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6 am: 0bfea8be54 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7717bb6d4c020f1961dfd62be5090db8df2568b
 2022-03-03 09:58:18 +00:00
TreeHugger Robot
1cda28b22c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 76d6cbc7b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f370fcb8b39cec5fcb45fba89eb47a9dc5a2573
 2022-03-03 09:58:05 +00:00
Bill Yi
71ea2a5db3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48fce57d2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5bb2b62408df5cd9ef900d688a0eeee98334d0a2
 2022-03-03 09:58:03 +00:00
TreeHugger Robot
7202ce3d9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 088bb2a3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a0b99ba69dc098105754b02d63a4ab0952ea68e
 2022-03-03 09:57:16 +00:00
Bill Yi
722677a2c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0a5c4fc117 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68de70d7b107222aa4d5778ff391202206568ef7
 2022-03-03 09:57:11 +00:00
Bill Yi
baecf5a51e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a9e8ee6e40 -s ours am: d6e99b7741 -s ours am: a6545359b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1138abe17216c8a1528e39a7e062a8fbc64fe794
 2022-03-03 09:56:29 +00:00
Bill Yi
01f5ecdb4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ad345144ed -s ours am: a93e2d89ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icdd3b6d272a62082e2cd40e715cb20704f1ba625
 2022-03-03 09:55:56 +00:00
SongFerngWang
e90d80cc52 [MEP] The subscriptionInfo's getSimSlotIndex is logical slotId 
1. The subscriptionInfo's getSimSlotIndex is logical slotId. The code
   should compare it with uiccSlotMapping.getLogicalSlotIndex()
2. Rename the parameters for the readability.
3. The mobile network selection dialog did not be closed after user clicked.

Bug: 219951253
Test: manual test.
Change-Id: I7fef78547f4e6283791cd15a03275eaefeb50e3c
(cherry picked from commit 181f8179f1)
 2022-03-03 09:31:47 +00:00
TreeHugger Robot
57ff9d215e Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 09:26:19 +00:00
TreeHugger Robot
8f84e7a9e7 Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217 2p: 651ff7ece6
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ba7f57217
  Import translations. DO NOT MERGE ANYWHERE
 2022-03-03 09:26:19 +00:00
SongFerngWang
ce8232d0a4 [MEP] The condition of "null point check" is wrong 
The condition of "null point check" is wrong at the
SimSlotChangeHandler.

Bug: 222035986
Test: Build pass. maunal test.
Change-Id: I1b81faf082163643c1d17eae2f66d75b450288fe
(cherry picked from commit f64b2c09c0)
 2022-03-03 09:18:53 +00:00
SongFerngWang
a3b98f5d04 Fix the settings crash when SimDialogActivity is null 
The PreferredSimDialogFragment did updateDialog after SimDialogActivity
was finished. It caused the settings crash. This is similar to b/184899699

Bug: 220803944
Test: build pass
Change-Id: I9a5964400a63053e362632944b9e7aa8ec1bbea8
(cherry picked from commit 70bf76a436)
 2022-03-03 09:18:39 +00:00
TreeHugger Robot
76d6cbc7b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-03 09:15:36 +00:00