Arc Wang
e0983d4920
[automerge] Hide non-system overlay window on ActivityPicker 2p: 877a41b054
am: 2315d0f20e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091
Change-Id: I0b1c44dec3dd3d22f487fff825d383b2a5ee8536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 09:54:03 +00:00
Arc Wang
2315d0f20e
[automerge] Hide non-system overlay window on ActivityPicker 2p: 877a41b054
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091
Bug: 181962311
Change-Id: Ia9438766ed1f6651b52f6e604a243d2be433eb45
2022-04-07 03:20:31 +00:00
Tom Hsu
27b82ddc9b
Merge changes from topic "presubmit-am-f6b1787fd0f3424db0a7a4bb5c8bd472" into tm-mainline-prod am: 94b0789323
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237
Change-Id: I94465169345e13cc62c5eeb2109a9bf989c18cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-07 03:04:03 +00:00
Arc Wang
877a41b054
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
2022-04-07 10:39:13 +08:00
tom hsu
0ce8355c63
[automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237
Bug: 226894999
Change-Id: I81b99b74f45acdd9f7073aea1d4f5bebd1cd13b1
2022-04-06 15:37:24 +00:00
tom hsu
c0214ff9f3
[Panlingual] Fix the back button press
...
Bug: 226894999
Test: local
Change-Id: I81e6408ebf2587bd023a13dbbdfa97e38efd8c31
2022-04-06 23:28:17 +08:00
TreeHugger Robot
69204aeff6
Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21"
...
* changes:
[automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c
2p: d36ff21fb1
[automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c
[Panlingual] Fix settings crash from rotation.
2022-04-06 15:15:37 +00:00
TreeHugger Robot
8f16b0cd5b
Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod
...
* changes:
[automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c
[Panlingual] Fix settings crash from rotation.
2022-04-06 15:15:37 +00:00
Xiaowen Lei
15c0ac2279
Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3
am: 16cbd39800
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375
Change-Id: Ia2e146c40554829dcced34fe207c393fd785521e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-06 15:08:58 +00:00
Xiaowen Lei
8708bbd8b3
Merge "Update the function used to log the dream picking events." into tm-dev
2022-04-06 15:04:57 +00:00
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
TreeHugger Robot
d23aa91e8b
Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev
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
9c6249a04f
Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev
2022-04-06 14:35:51 +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
072510b144
[automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c
2p: d36ff21fb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231
Bug: 228126890
Change-Id: I98aa625c53af24db93a5388e77714e01deeb56bd
2022-04-06 11:34:07 +00:00
tom hsu
19bd21d96c
[Panlingual] Fix settings crash from rotation.
...
- View may not create in time when add view of fragment.
Bug: 228126890
Test: local test.
Change-Id: Idce63dc9d39de09ff1ee684881ea6cb90637ee22
2022-04-06 19:32:36 +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
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