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

100834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
8ff5207e55 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev am: 02589e8b66 am: 3dc1a0a3b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17069323

Change-Id: I374542ed9704bf0947f9d0bf28fa37fce3b8ca33
 2022-03-03 17:01:26 +00:00
TreeHugger Robot
a59b484e77 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: I2fdb2beb2caa99feeae13574c4269f96b0e0f76f
 2022-03-03 16:41:19 +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
PETER LIANG
a65aba376c Merge "Polish and humanize the summaries for "Remove animations" and "Large mouse pointer"." into tm-dev am: eb0a69cfcc am: 5f0fe18050 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17050387

Change-Id: I6afb6d42ff693484d4a8d79b3c568cc1deefce69
 2022-03-03 16:20:56 +00:00
TreeHugger Robot
02589e8b66 Merge "Ignore test case of SetupSkipDialogTest" into tm-dev 2022-03-03 16:17:25 +00:00
PETER LIANG
5d210e13b6 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: Ieeeeba6e07bd1641ec6cb0a05bf6fcb31e6b2fb1
 2022-03-03 15:47:50 +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
Menghan Li
cd2b14d0b1 Merge "Remove font size & screen size setup flow instance" into tm-dev am: d3ec64104d am: 357a64ddb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049975

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

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

Change-Id: I8b1a1b2b19940039e323f54039dee91568455d8d
 2022-03-03 15:36:25 +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
5658c482a2 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: I9f2fe85a7ddd78bc093878f8ad81ac19083d2735
 2022-03-03 15:12:06 +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
d2287c0bfe 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: I22321fb553136fa40e56699f2b91e656f509fc2a
 2022-03-03 15:11:41 +00:00
Menghan Li
57a77e263f 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: I1fb81f95f3b41ee6ec15d7187f219991aa38006b
 2022-03-03 15:11:32 +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
08ad4181c8 Merge "[MEP] The condition of "null point check" is wrong" into tm-dev am: cdb08ee92a am: aecc64d135 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17049216

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

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

Change-Id: I6fb25caf51bbd5a5492305a8a9cd1ee0e2739a00
 2022-03-03 13:16:58 +00: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
2ea4a2ced2 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: Iefca187313b82a977d0aecae73f3ad3379880d47
 2022-03-03 12:54:40 +00:00
SongFerng Wang
c4d72fbb00 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: Iee325f7f38f362a717b4e5cc609d6c171c8f6fc9
 2022-03-03 12:54:32 +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
41838c76ec 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: I592ee8336be5549464915c0d357e71f97ea1bc15
 2022-03-03 12:54:22 +00:00
Edgar Wang
95c0e790ef Merge "Use android.app.AlertDialog in SetupChooseLockGeneric" into tm-dev am: f0a675f07d am: 3dc5c139cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17052927

Change-Id: If73c56407e00388ec976f8898dae2c57d121591c
 2022-03-03 12:43:56 +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
b8c9fa79dd 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: I7233aaf17296847ac5a9b817120f2f90f92511e7
 2022-03-03 12:20:55 +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
Tom Hsu
2abc341ea9 [automerger skipped] Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 am: 0249c0aff4 -s ours 
am skip reason: Merged-In Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 with SHA-1 ea9e627c1c is already in history

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

Change-Id: I172856dc26dfd476be49acfa96519ccc1055a721
 2022-03-03 12:11:15 +00:00
Bill Yi
827d66d74c [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: 44b4adcb04 -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: I33ce247d6b630b5d4419b2deb76f7355caa1e7a0
 2022-03-03 12:09:40 +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
532ddbe4e1 [automerger skipped] Merge "[Panlingual] Improve UI can not show on at first." into tm-dev am: f966c34a41 -s ours 
am skip reason: Merged-In Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 with SHA-1 cae20ce2f7 is already in history

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

Change-Id: I267b3e851d0bf14e5196cfca73b1baeb4682d84f
 2022-03-03 11:49:20 +00:00
tom hsu
3bae17e403 [automerger skipped] [Panlingual] Improve UI can not show on at first. am: ea9e627c1c -s ours 
am skip reason: Merged-In Ibfb91f0bb8d8ff54cadd041250b3cff252dbe591 with SHA-1 cae20ce2f7 is already in history

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

Change-Id: Ic30d16970c7bfce6750b9bd90c00ffcb5f086ff7
 2022-03-03 11:49:19 +00:00
Bill Yi
6bc8179be4 [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: Id593e10a9322b5d1e9670f50941014707191307c
 2022-03-03 11:48:05 +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
613a20b60b Merge changes from topic "presubmit-am-1f038a1ece89425e91664d179fc43556" into sc-mainline-prod am: 57ff9d215e am: 5a5bfcf48d am: 2ac592070e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17055774

Change-Id: I7e0985fc314757b8fd6038bbaeca703dec98d911
 2022-03-03 10:21:55 +00:00
Bill Yi
4737c96916 [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: 73f7e22809 -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: Id7389eeca0c9d899530d206767802029ba6d6a23
 2022-03-03 10:21:49 +00:00