PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,494 Commits 1 Branch 0 Tags
b7c7115afd81d0ffd5148ea2ac7d59a8d6876e41
Commit Graph

123494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
b7c7115afd Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp am: a27aa2d884 am: 5c6f4e143f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I10d7aaf2f3ed89062ed3fcedf06eca43babcfa71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:04:32 +00:00
Bill Yi
719673d6c2 Merge changes from topic "tc_change_2305100725_44" into udc-dev-plus-aosp am: 325045641d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I665e1edb81e020c7a2260e5de4eb198ea9c51b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:59:33 +00:00
Bill Yi
0fb22d1d70 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb 2p: 7e3f3fd34d am: 4782cd97ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I859a9b80d7b64a66e3170f80d34928db27db8ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:59:02 +00:00
Bill Yi
033c9f300b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours am: cd8e1c9e26 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94bd2f1f6f0f60a10d1c0f3e12367d59329c6885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:18:18 +00:00
Bill Yi
f316e8121d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb -s ours am: 1f9dab1c8c -s ours am: 129296ea28 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48d1b67db29fe53c142d55f3751008743a02d3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:18:06 +00:00
Bill Yi
cd8e1c9e26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours am: b71dd78a86 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1b46599d1c51218c3a69feaea77fe2f44675f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:01:18 +00:00
Bill Yi
129296ea28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb -s ours am: 1f9dab1c8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08a29821315d8db74e21e17e6b6abda42d173d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:01:07 +00:00
Bill Yi
5c6f4e143f Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp am: a27aa2d884 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671

Change-Id: I9ea15478cc4c3a9e2d2ec15e28b88f8ca045678d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 22:58:43 +00:00
Bill Yi
b71dd78a86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icf8cbaa14ca3034efad8ddc0138e394114c6245d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 22:57:32 +00:00
Bill Yi
1f9dab1c8c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6985ef37fb219639b4b32a8767908285219a6f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 22:57:10 +00:00
Bill Yi
325045641d Merge changes from topic "tc_change_2305100725_44" into udc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb 2p: 7e3f3fd34d
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-12 22:29:01 +00:00
Bill Yi
a27aa2d884 Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
  Import translations. DO NOT MERGE ANYWHERE
 2023-05-12 22:29:01 +00:00
Bill Yi
efe3ce5660 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-12 22:29:00 +00:00
Becca Hughes
794fe3e41c Merge "Add extra null checks" into udc-dev am: 598ff21b78 am: 75466c4eb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: Iee58140eabae769075432804947c65ce10ee0f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 21:55:09 +00:00
Becca Hughes
557b140873 Merge "Add extra null checks" into udc-dev am: 598ff21b78 am: 93c340780f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: I5afa2a97f895505572c024ce294d9785b4fb38f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 21:50:31 +00:00
Becca Hughes
93c340780f Merge "Add extra null checks" into udc-dev am: 598ff21b78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: I5081a13eed1790c1093348faf06a7d311e4e0da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 21:13:35 +00:00
Becca Hughes
75466c4eb1 Merge "Add extra null checks" into udc-dev am: 598ff21b78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: I9946b03d5a92b8a8328c4ffd3bb9d78eebbd81d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 21:07:53 +00:00
Becca Hughes
598ff21b78 Merge "Add extra null checks" into udc-dev 2023-05-12 20:40:56 +00:00
Chris Antol
ceda4cc281 Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 am: 8a7fdc628f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: I293845133628c1773ef0724576fd167b5b10cf66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 19:26:50 +00:00
Chris Antol
1cb9857c7a Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 am: 701babd574 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: Ied4ec5973e0a1c963be8b3b4e1e88e87f4874116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 19:21:28 +00:00
Chris Antol
701babd574 Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: Ib283b390ae0fa591fa8c97d550731464b3d9ab3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 18:42:20 +00:00
Chris Antol
8a7fdc628f Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: I0a8ec6179e87ca56765103df17df03f9438b90c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 18:39:28 +00:00
Chris Antol
9567bd4a50 Merge "Remove SPA gating from App Cloning click ingress" into udc-dev 2023-05-12 17:56:05 +00:00
Roy Chou
613128210d Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 am: f482ff63b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I071888c1a8027be3e8d687af311d421812fc2816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:36:12 +00:00
Avinash Vadlamudi
95ebc801b1 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 am: 071db861a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I51b2ca94834d52e65f3453160bdcd406990044e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:36:01 +00:00
Roy Chou
e3e8c9b464 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 am: 0bdc6ad2a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I4b6f189fb36ca1158bea5a62616a580507bf46db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:24:14 +00:00
Avinash Vadlamudi
bf3c9ee918 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 am: 0cf38ac8e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I06af187b9469a427aaac7e0843891afbaa592046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:24:05 +00:00
Roy Chou
f482ff63b9 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I23d2fec9ab12741fd35ca1ff130e8ec8a97f58e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:23:24 +00:00
Avinash Vadlamudi
071db861a2 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I293ee9f3f23ac0a49cce228e3febf3475f86282e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:22:44 +00:00
Roy Chou
0bdc6ad2a3 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I5da848212d422435a6976798d203fc03ee3eb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:16:25 +00:00
Avinash Vadlamudi
0cf38ac8e0 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172

Change-Id: I6d9a618e64a45b1c1fb203a92b7867349a7ca9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 17:12:52 +00:00
Roy Chou
412c248c10 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev 2023-05-12 16:59:26 +00:00
Peter Zhang
521e527edd Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: Idc8edb4b38ee723e23f8b0460050c0b9fa41c447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:52:48 +00:00
Becca Hughes
400e5491a3 Add extra null checks 
Test: ondevice
Bug: 281047738
Change-Id: I07ced78af5da086433aa4288949673161bfe4f20
 2023-05-12 16:46:30 +00:00
Avinash Vadlamudi
28cf617ca2 Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev 2023-05-12 16:34:26 +00:00
Peter Zhang
60069d3039 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev 2023-05-12 16:22:38 +00:00
Peter Zhang
4d0120712f Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: Id6b3de9b4ea52e3f039d963a8c048f1c5096cf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 16:12:51 +00:00
Peter Zhang
04545138c7 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev 2023-05-12 16:09:34 +00:00
Roy Chou
0aa67ede68 chore(#AlwaysOnMagnification): hardcode the feature flag default true 
Set the feature flag getter default return value to be true to rollout to public. We keep the checking code so that it's still remote controllable.

Bug: 281788002
Test: manually test with adb command
Change-Id: Ie7f32721cf99d8a97c11f0f9c6d0d466c083d668
 2023-05-12 15:57:56 +00:00
Jason Hsu
c92052d2c3 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c504d93894 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I6555b7ba78411bb3d6c0d8188f27a7ab3e52d981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:11:14 +00:00
Jason Hsu
7eacba1d46 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 4ea92477bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I3fddce5cfa38058b277ba75c9518ae9e9291c2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:10:49 +00:00
Jason Hsu
9a4c3228a3 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: Ic76821969c0e5fd06c294e4e4763867a648a77c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 15:00:28 +00:00
Jason Hsu
97d7422278 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I0513903c35e63f962a0cb4720f5f766062a1d101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:54:48 +00:00
Jason Hsu
c504d93894 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I122a929ee4ddfc9981dc492a4b209b78422c5bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:51:26 +00:00
SongFerng Wang
f7b152e9f3 Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 5c64b78f4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: I6bb6d3d1368a7e324a48a63e93a51c7e0cf88033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:48:27 +00:00
Chaohui Wang
8296309b46 Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 45c2a27149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: I73a602f1b5ba43e45644bba997eeed15722192ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:48:17 +00:00
Jason Hsu
4ea92477bb Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I4032413c971afa68b665e3cc1448dafad0bfcb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:45:18 +00:00
Jason Hsu
c77fb81017 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I5ec6ad97a9a479fa5299f664c2ce29ac5578bbfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:23:35 +00:00
Jason Hsu
782ad66ab1 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I1abbb60af43135718426d349427738d95808ff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:23:10 +00:00
Jason Hsu
0c57f69f60 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev 2023-05-12 14:20:54 +00:00