PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,258 Commits 1 Branch 0 Tags
db0fae9678a11a3461b52bbf8881d8e2857a78d0
Commit Graph

42970 Commits

Author SHA1 Message Date
Michael Wright
36611bc07d Merge "Use more unique ids for safety sources" into tm-dev am: b111d233cd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17538685

Change-Id: Ic63a911f31ce2f690fc73c192dcff1a4098154a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 23:55:43 +00:00
Michael Wright
b111d233cd Merge "Use more unique ids for safety sources" into tm-dev 2022-04-07 23:44:31 +00:00
Weng Su
a0e05a271d [automerge] Fix unexpected Wi-Fi hotspot shutdown 2p: 6c42636cb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131

Bug: 227719584
Change-Id: Icc8a154a06170a321c848578797c6a8c823cc845
 2022-04-07 21:37:05 +00:00
Weng Su
6c42636cb8 Fix unexpected Wi-Fi hotspot shutdown 
- Filter out unnecessary onSwitchChanged callbacks when the switch is
  disabled, which should not be triggered by user input.

- Refine the state handling function to avoid unnecessary
  onSwitchChanged callback.

- Refine the error handling of isHotspotPasswordValid function.

Bug: 227719584
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest

Change-Id: If62aaadc8ddb214769b1367d7801b6125bb5377c
 2022-04-08 05:35:14 +08:00
Chaohui Wang
0bee8b57c4 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee am: 1aebd5fb02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: Ia850d51dec2cc813a65928ef12c6edcccfbe245b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 18:11:25 +00:00
TreeHugger Robot
df06dcecbe Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev 2022-04-07 18:08:21 +00:00
Peiyong Lin
8e23b02de5 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: If856da79393481c5c5d4fbddfd966a2f9d0879f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:55:54 +00:00
Chaohui Wang
2e5180884a Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I10e8e4a64531f5e4b8340b98ab3783f516b8c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:55:08 +00:00
Chaohui Wang
1aebd5fb02 Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I9a02fa61cf65039e905b98a25e5510ae2e7c262d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:54:53 +00:00
Peiyong Lin
7ef70db34d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev 2022-04-07 17:48:18 +00:00
Peiyong Lin
a4f590f1f1 Merge changes from topic "remove_game_dashboard" 
* changes:
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 2p: f621f13d83
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
  Remove GameSettings and ExtraAppInfo.
 2022-04-07 17:48:18 +00:00
Peiyong Lin
c3ce36da27 Merge changes from topic "remove_game_dashboard" into tm-mainline-prod 
* changes:
  [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9
  Remove GameSettings and ExtraAppInfo.
 2022-04-07 17:48:18 +00:00
Chaohui Wang
f2178a48ee Merge "Clean up unused Sliceable.copy()" into tm-dev 2022-04-07 17:31:08 +00:00
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
e406597fe2 Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: I2b91d4ac1320ce79037c073f913800f0f0ca785c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 11:54:52 +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
TreeHugger Robot
739b57cf0e Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Change-Id: Ieebd00482a3532bae1b12546b2ec45d2dc9300ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 09:55:33 +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
e82ca817a1 Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Change-Id: Id9675919d94a715e77c930f79ba5f471c467ba4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:10:44 +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
TreeHugger Robot
cd10b0552e Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: I0ec167e7c12e1f3f22811c239644985f863c06ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:54:57 +00: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
da1f3d6d37 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: I15b857b5bd7688aef3926d2049f2d7d2b0876aeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:09:04 +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
3a23af64cd Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I83e7923119669ea604bdd72f121d3182bf2dd550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:00:32 +00:00
Chaohui Wang
631c56fc20 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: Ic18c24b08b00ea8a20877fe2d9e9fc2b8e51ad07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:00:17 +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
715ebf4705 [Pnalingual] Resolve code conflict. am: 6436a5aa6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Change-Id: I9e1316234f825ab3cd92fc8e395dbffe82448dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 11:48:43 +00:00