Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,693 Commits 1 Branch 0 Tags
8554aa1f6ced95cb02c7e193a808dbc5ba58e67e
Commit Graph

41951 Commits

Author SHA1 Message Date
TreeHugger Robot
8554aa1f6c Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" 
* changes:
  [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 2p: e6f28fbd49
  [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2
  Fixes 'learn more' link in ScreenTimeoutSettings
 2022-04-06 15:00:11 +00:00
Chaohui Wang
c92af2b605 Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod am: 2caba70028 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: I453111dade7866a70c02cd9da7175ce112903e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 14:59:34 +00:00
Chaohui Wang
2caba70028 Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod 
* changes:
  [automerge] Fix the flow for ZenCustomRuleSettingsBase 2p: 3b3e66c780
  Fix the flow for ZenCustomRuleSettingsBase
 2022-04-06 14:35:51 +00: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
Tom Hsu
444c4868ee Merge "[Pnalingual] Resolve code conflict." 2022-04-06 10:38:08 +00:00
tom hsu
aac21a59aa [Pnalingual] Resolve code conflict. 
Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
 2022-04-06 10:31:34 +00:00
Cn Chen
55aef08432 Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a am: 87b8c8d107 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536304

Change-Id: I66c0b7194513efdf36123dfde17712e50c6de043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:45:20 +00:00
Chaohui Wang
2646ea3180 [automerge] Fix the flow for ZenCustomRuleSettingsBase 2p: 3b3e66c780 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Bug: 226523115
Change-Id: If37ebc4a3eaec779ddad315789ebd858aec684f0
 2022-04-06 09:22:39 +00:00
Chaohui Wang
3b3e66c780 Fix the flow for ZenCustomRuleSettingsBase 
updateRule() should be called before super.onResume() because rule will
be used in updatePreferenceStates() in super.onResume().

This is follow up of Change: Ief9963091847d58654f26851616563ae910716a5

Bug: 226523115
Test: manual
Change-Id: I2fe0cfb2b4a76273283bb2d3aca629b5d647db91
 2022-04-06 17:22:12 +08: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
7e3ac66bc6 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 am: 1f75850e11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17462163

Change-Id: I49413190190e30abb9d360f24405de710fb2ebe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 08:50:26 +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
Yi Jiang
4652097173 [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 2p: e6f28fbd49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Bug: 227292811
Change-Id: I47f32600feffd755dccad876f2cf5bb7b68c8c6d
 2022-04-06 06:49:40 +00:00
Yi Jiang
e6f28fbd49 [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Bug: 227292811
Change-Id: Ibab34cc241b50c473e6951d46f6be1697bfadb03
 2022-04-06 06:49:32 +00:00
Yi Jiang
284cb1c2b2 Fixes 'learn more' link in ScreenTimeoutSettings 
Bug: 227292811
Test: make RunSettingsRoboTests

Change-Id: I0e5678e6760ebd590dfd526f362207776ece3a70
 2022-04-06 06:49:19 +00:00
Kedar Chitnis
1149c12949 Merge "Guest mode UX flow updates to user settings" 2022-04-06 04:18:05 +00:00
TreeHugger Robot
4eedbed2f4 Merge "Added test for FP Enroll vibration" into tm-d1-dev am: f733c0d7c9 am: b9128f28f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17606348

Change-Id: I127f181f8d00443fac9efa49446eb28f13954df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 01:51:53 +00:00
TreeHugger Robot
f733c0d7c9 Merge "Added test for FP Enroll vibration" into tm-d1-dev 2022-04-06 01:04:47 +00:00
Joshua McCloskey
2a05de0df1 Added test for FP Enroll vibration 
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 222593183
Change-Id: I18ba2471c506c9a34151dc34c5f5f423db478c06
 2022-04-05 23:28:14 +00:00
Lucas Silva
44a4e905e7 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 am: 2ec4bc0b5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17574303

Change-Id: I16fbcd81c9656c4f37ff5d4380ba9db0d7312045
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 15:33:20 +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
Chaohui Wang
65c610c2ab Merge "Fix cannot add language" into tm-dev 2022-04-05 11:04:10 +00:00
Chaohui Wang
63ddb79c0d Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d am: 9734698f71 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483

Change-Id: I45fa8dca8c1f449741876191f62727de3040925b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:51: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
109d101511 Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: e2dd5d9fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393

Change-Id: I1ad92f2bc0c0cd807061bc6598e773c6b2f5a767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 11:15:46 +00: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
Kedar Chitnis
fa49a4f111 Guest mode UX flow updates to user settings 
- Add option in user settings to enable/disable ephemeral
  mode for guest user
- Update user settings to show exit guest and reset guest preferences
- Update user settings to show guest related preferences grouped together

Bug: 214031645, 175795666
Screenshots: go/ephemeral-guest-b-214031645-ux
Test: Manual test on sunfish, atest SystemUITests, atest SettingsRoboTests

Relands ag/16544951 after fixing post submit issues

Revert "Revert "Guest mode UX flow updates to user settings""

This reverts commit ed45e8c56a.

Change-Id: I54583f9021171ae523ff40d4f63835f1cb486e35
 2022-04-04 05:28:21 +00:00
Chaohui Wang
f03f79b145 Fix cannot add language 
Fix: 227972634
Test: manual
Change-Id: I3382879e51238be55687072eeb07bb553dafc952
 2022-04-04 11:26:55 +08: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
TreeHugger Robot
542d772b1b Merge "Warnings at top of per-app settings page" into tm-dev am: 52ea95aa55 am: 2571882ab4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17518134

Change-Id: I5e6bce9dd2f4a2d18fd3916636293b8173f7da54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 18:12:07 +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
PETER LIANG
05da36b217 Merge "Update the preview of the conversation message in the "Display size and text" page." into tm-dev am: 93d4886297 am: e9d9fe62ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17400625

Change-Id: Ia7656b566a7930fc132a49d06d0d2f47289c53f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 16:44:01 +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
1fb5ca07b0 Merge "Turn off Fast Pair MainSwitch" into tm-dev am: a809f491e5 am: 8020b80e8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17532006

Change-Id: Ib6f89dc61057cbdedaff662afcffef72ad597e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 15:41:42 +00:00
Xinyi Zhou
a809f491e5 Merge "Turn off Fast Pair MainSwitch" into tm-dev 2022-04-01 15:13:09 +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
TreeHugger Robot
bdfb7f8ddf Merge "Fine tune background color for dual pane in homepage" into tm-dev am: 046d174a55 am: 261dd1c821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465487

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

Change-Id: I364fb8f0a45839ce8a7b14dee7de0c2b120eca95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 09:48:05 +00: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
Tom Hsu
aaac7dd777 Merge "[Panlingual] Add error message on per-app language page." 2022-04-01 09:20:10 +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
Treehugger Robot
8339d051b0 Merge "Settings: Fix cellular internet option Not seen after internet reset" am: 0159ca5d9c am: a1a5091f12 am: 3fb5213538 am: 973031b290 am: babd81d61c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2033445

Change-Id: Ia9d800a7681ddb35741839eb224d290ab1a2bdee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 08:16:17 +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