PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,211 Commits 1 Branch 0 Tags
c0214ff9f3d5c6e7f4ca820c749b75a9a1536f16
Commit Graph

101211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tom hsu
c0214ff9f3 [Panlingual] Fix the back button press 
Bug: 226894999
Test: local
Change-Id: I81e6408ebf2587bd023a13dbbdfa97e38efd8c31
 2022-04-06 23:28:17 +08:00
tom hsu
6436a5aa6f [Pnalingual] Resolve code conflict. 
Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
(cherry picked from commit aac21a59aa)
 2022-04-06 11:07:22 +00:00
Jan Tomljanovic
a926f6ddbc Merge "Update framework strings for the security page." into tm-dev 2022-04-06 09:25:15 +00:00
Cn Chen
8b6bbda28a Merge "Properly apply the SUW dynamic color theme" into tm-dev 2022-04-06 08:55:48 +00:00
TreeHugger Robot
6d0b9c7bd4 Merge "Add work profile badge for icon of free up space" into tm-dev 2022-04-06 08:05:10 +00:00
Lucas Silva
ab8467e872 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev 2022-04-05 14:42:41 +00:00
Jan Tomljanovic
b8187256eb Update framework strings for the security page. 
Test: manual
Bug: 226098547
Change-Id: Idf31853fc65aaef241de1bbcabc33fceabe2fd3a
 2022-04-05 15:20:46 +01:00
Chaohui Wang
65c610c2ab Merge "Fix cannot add language" into tm-dev 2022-04-05 11:04:10 +00:00
Lucas Silva
f7a95e4b5d Fix bug where not all views are getting disabled alpha applied. 
This ensures that we apply the alpha recursively to all views when the
item is disabled/enabled.

Bug: 226573932
Test: locally on device
Change-Id: I28ee1a21227706d01a6e4f6284871bf78af983f5
 2022-04-04 17:32:05 -04:00
Chaohui Wang
bab799899d Fix Flicker for ZenCustomRuleSettingsBase 
Fix the following flicker on pages under:
Notifications -> Do Not Disturb -> Schedules -> [One Schedule]

1. Do Not Disturb behavior
2. (1) -> Create custom settings for this schedule
3. (2) -> Calls
4. (2) -> Messages
5. (2) -> Display options for hidden notifications
6. (4) -> custom

Fix: 226523115
Test: On Pixel Phone
Change-Id: Ief9963091847d58654f26851616563ae910716a5
 2022-04-04 22:22:10 +08:00
Yuri Ufimtsev
d191a16c54 Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev 2022-04-04 10:33:09 +00:00
Chaohui Wang
f03f79b145 Fix cannot add language 
Fix: 227972634
Test: manual
Change-Id: I3382879e51238be55687072eeb07bb553dafc952
 2022-04-04 11:26:55 +08:00
Xin Li
444e9d38f6 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

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

Change-Id: I590cbcebf55205c055cc235d52247e1903fab8a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:43:39 +00:00
Xin Li
35cf5330a9 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

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

Change-Id: I28301ae9c1fc09fe18a0d0ce0e2eaa9586f04657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:11:38 +00:00
Yuri Ufimtsev
d16c12b9ac Set up correct ComponentName for test mode of Parental Controls 
Test: manual

Bug: 222339681
Change-Id: I9c141b8f04a69c914a55ed176c2f1c101d22a34c
 2022-04-01 21:28:07 +00:00
Xin Li
e75d9ee3e9 Merge Android 12 QPR3 ab/8391262 
Bug: 226662282
Merged-In: I50e3649c21bb83ee9130fa98a71560fe261198a9
Change-Id: I2a97159d0de32a6262bbace7bb82b09897447bdb
 2022-04-01 20:32:46 +00:00
TreeHugger Robot
cf96e65a6f [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours am: b3e3a33a3e -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I7bac3a571de92ee247cbdc6dc60454da472175c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:18:35 +00:00
TreeHugger Robot
b3e3a33a3e [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours am: 6d9631779d -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I45a103b233c117cd88564ff7c7dc594d446e6cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:02:55 +00:00
TreeHugger Robot
6d9631779d [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: 8eacc8a8dc -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I19f3ca5069da1b3bcce1e50583b06f5f6e0d2fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:41:57 +00:00
TreeHugger Robot
d3fdbf5def [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours am: b41a74c1a9 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I171f729159e3093bb8d317feaab681c889fc0db3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:41:55 +00:00
TreeHugger Robot
8eacc8a8dc [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I8a0e31ec51c4a133b2f4842d47f818461f9e712b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:27:04 +00:00
TreeHugger Robot
b41a74c1a9 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours am: 7bd23716c3 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I6b0a4bc63732cb838bac6d6d16625ca44f6ba4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:26:08 +00:00
TreeHugger Robot
7bd23716c3 [automerger skipped] [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd am: 0b507f0203 -s ours 
am skip reason: Merged-In I15e15ad88b768a5b679de32c5429d921d850a3cb with SHA-1 2ac45dd49e is already in history

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

Change-Id: I3f91cd3600b1b581beac0b262a35cbf66fed209e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:03:28 +00:00
TreeHugger Robot
0b507f0203 [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 am: ed29b05dcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17540383

Change-Id: I03622a4803112de1f7b2f2fb3000b007444bc19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 17:48:29 +00:00
TreeHugger Robot
52ea95aa55 Merge "Warnings at top of per-app settings page" into tm-dev 2022-04-01 17:40:09 +00:00
TreeHugger Robot
ed29b05dcd [conflict] Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 am: e6e739d8b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629

Change-Id: I8bba0ed0611a7cef34b210e7e7553de70dbf9aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
 2022-04-01 16:13:50 +00:00
PETER LIANG
93d4886297 Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev 2022-04-01 16:03:10 +00:00
danielwbhuang
baa59815d8 Warnings at top of per-app settings page 
1. Check getInstallPackageName() and isSystemApp()
2. Link to play store

Bug: 221164159
Test: local
Change-Id: I5727a4b99d945ae5c1b517020026654796a34d98
 2022-04-01 23:41:56 +08:00
Xinyi Zhou
a809f491e5 Merge "Turn off Fast Pair MainSwitch" into tm-dev 2022-04-01 15:13:09 +00:00
TreeHugger Robot
e6e739d8b0 Merge "Prevent exfiltration of system files via user image settings." into qt-dev am: 74ff164972 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17003629

Change-Id: I5ebae8947d883130b93c9a82d087656dab41498a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 12:58:31 +00:00
TreeHugger Robot
74ff164972 Merge "Prevent exfiltration of system files via user image settings." into qt-dev 2022-04-01 12:42:31 +00:00
TreeHugger Robot
ba1f3dc8df Merge "[Panlingual] Add error message on per-app language page." into tm-dev 2022-04-01 12:04:17 +00:00
Peter_Liang
454f21cb21 Update the preview of the conversation message in the "Display size and text" page. 
Bug: 227076211
Test: manual test
Change-Id: Ie83f95ba223a42f596c2a4ef68f33f4152a2cc07
 2022-04-01 18:09:28 +08:00
Arc Wang
b7409f8b39 Add work profile badge for icon of free up space 
- Get badged icon from target app.
- Add card_preference layout file to align icon & text
  with other Preference.

Bug: 192555970
Test: manual visual
Change-Id: Id98d05e8871032ad61627783b8e47bfee1363448
 2022-04-01 17:41:08 +08:00
TreeHugger Robot
046d174a55 Merge "Fine tune background color for dual pane in homepage" into tm-dev 2022-04-01 09:34:07 +00:00
tom hsu
40a6de1ec4 [Panlingual] Add error message on per-app language page. 
Bug: 226032712
Test: local
Change-Id: I12aae66116cc8c00fa7c6b0ba256d4726620ea4c
(cherry picked from commit a9184f43c5)
 2022-04-01 09:28:01 +00:00
TreeHugger Robot
91be4fbe35 Merge "Fine tune Select time zone Settings UI" into tm-dev 2022-04-01 09:18:05 +00:00
Weng Su
9ed56d081c Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a am: c422d95147 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I71a0799dd5561b069d587491f78957e48fa87541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 09:06:51 +00:00
Weng Su
c422d95147 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 am: ec1b6c308a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: I7ba4a451a493b9d4df278f7aee6bfbacc9bf2322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:47:33 +00:00
Weng Su
ec1b6c308a Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" am: c68e241fa6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1989236

Change-Id: Ib5462706a20ca6565144faae9c5009939bf2eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:28:28 +00:00
Weng Su
c68e241fa6 Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation" 2022-04-01 08:08:51 +00:00
Tom Hsu
84f78bc493 Merge "Fix System language option missing and locale region missing issue" into tm-dev 2022-04-01 07:52:52 +00:00
Treehugger Robot
973031b290 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: I3e34f4f6ef32064e7de1ca0a9aee94c02f94e7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 07:49:23 +00:00
Josh Hou
6ead6df534 Merge "[Panlingual] Fix the app language is shown incorrectly in the work profile" into tm-dev 2022-04-01 07:38:00 +00:00
Treehugger Robot
3fb5213538 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: Ida0dd5521a0bf94599315658b70c14a058295585
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 07:36:46 +00:00
Treehugger Robot
a1a5091f12 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: I854bc6abd439b952f15627ea1859176c4b0665aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 07:13:19 +00:00
cnchen
27536c8333 Properly apply the SUW dynamic color theme 
Activity should apply a base theme before apply dynamic color theme

Bug: 225800660
Test: Manual testing
Change-Id: Iad6e03b1750e1a4bd29878c9eb88e8c4a08a867f
 2022-04-01 14:57:58 +08:00
Treehugger Robot
0159ca5d9c Merge "Settings: Fix cellular internet option Not seen after internet reset" 2022-04-01 06:52:44 +00:00
Menghan Li
1031406227 Merge "Remove dependency of SudGlifTheme from SettingsTheme" into tm-dev 2022-04-01 05:56:13 +00:00
Tsung-Mao Fang
f4514b9fbf Fine tune background color for dual pane in homepage 
Follow the spec and change the background color.

Test: See the screen
Bug: 223329504
Change-Id: Ibcbf0e898ae949e1354f5af810a2347eba42b508
 2022-04-01 13:35:17 +08:00