PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,997 Commits 1 Branch 0 Tags
2d1fa25f98215a91597803492b1968e4dd832008
Commit Graph

42092 Commits

Author SHA1 Message Date
Giulio Fiscella
431acd9dcf Merge "Use more unique ids for safety sources" into tm-mainline-prod am: 416e5d6f9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17570476

Change-Id: I7cbbedd6757f8af4c33a4e86c4c00f05cd2ef8f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 14:40:25 +00:00
Giulio Fiscella
416e5d6f9b Merge "Use more unique ids for safety sources" into tm-mainline-prod 2022-04-07 14:17:11 +00:00
TreeHugger Robot
59c849da4d Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev 2022-04-07 11:47:51 +00:00
TreeHugger Robot
3081690749 Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8" 
* changes:
  [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 2p: e1705a25b4
  [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
  Restrict Wi-Fi toggle in Internet Settings
 2022-04-07 11:47:51 +00:00
TreeHugger Robot
faad3dfd0d Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8" into tm-mainline-prod 
* changes:
  [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1
  Restrict Wi-Fi toggle in Internet Settings
 2022-04-07 11:47:51 +00:00
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
TreeHugger Robot
746502e98c Merge "Hide non-system overlay window on ActivityPicker" into tm-dev 2022-04-07 06:51:35 +00:00
Josh Hou
98490cc740 [Panlingual] Screen title is displayed incorrectly 
Fix the issue that the screen title name of the app language page is displayed incorrectly

Bug: 227285277
Test: Verify the issue by testing between the system language and app
language page

Change-Id: I5dbb10763bd5cc346bff9c270b14b945eb499273
 2022-04-07 14:02:22 +08:00
Presubmit Automerger Backend
b2b0822ee9 [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 2p: e1705a25b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Bug: 203168097
Change-Id: I6be138b4f338e0e3a8c255e4a3d2d02bfb23253b
 2022-04-07 04:08:28 +00:00
Presubmit Automerger Backend
e1705a25b4 [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Bug: 203168097
Change-Id: I461037a25eddce597752cc085a8f9ef3942a2767
 2022-04-07 04:08:20 +00:00
Weng Su
22c8bf81e1 Restrict Wi-Fi toggle in Internet Settings 
- Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state.

- Show restriction message in Wi-Fi toggle summary.

- See the result screenshot in b/203168097#comment24

Bug: 203168097
Test: manual test
atest -c WifiSwitchPreferenceControllerTest

Change-Id: I3cfe2f4f0e855dde91a82babe3a03005c3985d59
 2022-04-07 12:06:13 +08:00
Arc Wang
1c8edd20a3 [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628095

Bug: 181962311
Change-Id: I7f99b94832948db188ddd45fd5e2a87ebc28af6f
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:35:48 +00:00
Arc Wang
b95bd5b449 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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 11:33:54 +08: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
Tom Hsu
a9d7aae694 Merge "[Panlingual] Fix the back button press" into tm-dev 2022-04-07 02:52:23 +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
e0f6939c4c Merge "[Panlingual] Fix settings crash from rotation." into tm-dev 2022-04-06 15:15:37 +00: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
Edgar Wang
6622811a75 [automerge] Fix LaunchAnyWhere in AppRestrictionsFragment 2p: 90e095dbe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614846

Bug: 223578534
Change-Id: Ie4e4825ea8c9020986f59d59c31f40765e5d92a7
 2022-04-06 10:02:31 +00:00
Edgar Wang
90e095dbe3 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
 2022-04-06 17:51:07 +08: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
Peiyong Lin
c858e7e18e [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 2p: f621f13d83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I26779ff68346f089155d4d0f15e2afd5b351a234
 2022-04-05 21:52:06 +00:00