Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,038 Commits 1 Branch 0 Tags
2b554b0dbbe4580ed9f60a105d66c3d9d5cca62c
Commit Graph

42351 Commits

Author SHA1 Message Date
TreeHugger Robot
66903e1328 Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev am: 3ed73b7b2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131

Change-Id: I2535c12e487cce2beb462995f0abda80415cf626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 09:22:00 +00:00
TreeHugger Robot
ecde21063a Merge changes from topic "presubmit-am-c49a96c26d054adbb0d2e7c248dd53a1" into tm-mainline-prod am: 67b061ae0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131

Change-Id: I36d4b7699e8610f0f8f0073c6f504251a9d98387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-09 09:21:44 +00:00
TreeHugger Robot
3ed73b7b2d Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev 2022-04-09 08:59:05 +00:00
TreeHugger Robot
67b061ae0b Merge changes from topic "presubmit-am-c49a96c26d054adbb0d2e7c248dd53a1" into tm-mainline-prod 
* changes:
  [automerge] Fix unexpected Wi-Fi hotspot shutdown 2p: 6c42636cb8
  Fix unexpected Wi-Fi hotspot shutdown
 2022-04-09 08:59:04 +00:00
Lucas Silva
1333451d6d Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 am: 336f4991af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: I8c5725d8fe6dad32fdeb3fd79658d366fe11bd32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:37:48 +00:00
Lucas Silva
4e8e70869b Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: I2623a62e2b83df6816ada4998951e38a4c8d8f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:15:39 +00:00
Bill Yi
c854c108a2 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:25 +00:00
Lucas Silva
94716a5d58 Always set the customize button in dream settings to not selected. 
This will prevent screen readers from saying the button is selected when
the outer container is selected.

Bug: 227717835
Test: locally on device
Change-Id: Ic7b4a36eb3b79ff847909ab6fcbd984eaf93d618
 2022-04-08 15:34:06 +00:00
Ricky Wai
0cacded5ca Apply enhanced confirmation mode OEM config to Settings 
So Settings app will block user accessing restricted settings
if OEM config is off.

Bug: 217709978
Test: With OEM config on, accessibility page for unknown source app is
disabled by default.
Test: With OEM config off, accessibility page for unknown source app is
not disabled.

Change-Id: Id25e8fd76e6192fd4db64f81903449bb02785b39
 2022-04-08 13:57:02 +00:00
Josh Hou
e3281e01b7 Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: fc0033fa2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Change-Id: I0676a2cd4a37e2c7234bf8428e8c0f6a642d560b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 12:23:10 +00:00
Josh Hou
ffa73fceeb Merge changes from topic "screen_title" into tm-mainline-prod am: 2808fd6a7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Change-Id: Ia79431bb96fa13709352d6a0e13386a9ccf76d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 12:22:43 +00:00
Josh Hou
fc0033fa2e Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev 2022-04-08 11:32:21 +00:00
Josh Hou
2808fd6a7e Merge changes from topic "screen_title" into tm-mainline-prod 
* changes:
  [automerge] [Panlingual] Screen title is displayed incorrectly 2p: 98490cc740
  [Panlingual] Screen title is displayed incorrectly
 2022-04-08 11:32:21 +00:00
Treehugger Robot
d436150433 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca am: c77a56af57 am: b185066a24 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I155c8550894973763080327b3895803aa15d21a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 11:26:11 +00:00
Treehugger Robot
ac4f2642f0 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca am: c77a56af57 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I274b0dd215f7f1baaa1543a327fb0acb539aa843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 11:11:18 +00:00
Treehugger Robot
c77a56af57 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 am: a1e66c3aca 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: Id1f56b98aaf7fc3d076eb56e54f660a50765352d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:55:23 +00:00
Treehugger Robot
a1e66c3aca Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 am: 02701dd8b1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I67259014672c0cac5375b25d6c05a73b5ffc30da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:41:07 +00:00
Treehugger Robot
02701dd8b1 Merge "Settings: Fix sometimes reset progress dialog not dismissed" am: d6d6c5c020 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2049363

Change-Id: I686382ad702fb8e9fc090ea8441f9a1b3cae0716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 10:03:46 +00:00
Treehugger Robot
d6d6c5c020 Merge "Settings: Fix sometimes reset progress dialog not dismissed" 2022-04-08 09:46:39 +00:00
Bonian Chen
db24551d8e Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867 am: ee09af716f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465486

Change-Id: I07a09e66af72da761d9b04b91c4dc0803ccb049f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 08:28:34 +00:00
Bonian Chen
ae4b063bc2 Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev am: 5839607867 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17465486

Change-Id: Ib9d0dd32c1c3c9fbd440abec0ff24eaa8a992dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 08:28:14 +00:00
TreeHugger Robot
ea454bdbcd Merge "Fix keyboard settings crash in multi-user case" into tm-dev am: 897b72eb1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Change-Id: Ic85e2d289ad3955e7d972af830d9e1b2256217a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 08:28:07 +00:00
TreeHugger Robot
c9fa1a0136 Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod am: 485bfa10b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Change-Id: I23cd19c7ba63a21a9530aceb5082d93a821ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 08:27:57 +00:00
Bonian Chen
5839607867 Merge "[Settings] Add null pointer protection for Subscription API" into tm-dev 2022-04-08 08:16:34 +00:00
TreeHugger Robot
897b72eb1b Merge "Fix keyboard settings crash in multi-user case" into tm-dev 2022-04-08 08:03:36 +00:00
TreeHugger Robot
485bfa10b7 Merge changes from topic "presubmit-am-69008cfea6c94780a0c9a9e956ead727" into tm-mainline-prod 
* changes:
  [automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1
  Fix keyboard settings crash in multi-user case
 2022-04-08 08:03:36 +00:00
Mill Chen
a9c43b938d Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79 am: 0a4bbff802 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182074

Change-Id: If75ec07f5896033bef78bb2bb3acff5a01e49498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:27:36 +00:00
Mill Chen
9cbec63704 Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182074

Change-Id: If51dbd3ab6723ff8bc15035118a3bf11d05c8312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 06:13:01 +00:00
Mill Chen
34eecaad79 Merge "Add cache mechanism for secondary users in Storage" into tm-dev 2022-04-08 05:48:45 +00:00
Presubmit Automerger Backend
41704f98b1 [automerge] Fix keyboard settings crash in multi-user case 2p: 237a06e0c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539524

Bug: 216395439
Change-Id: Iac76ec56961b18816d750591654668b95d38e536
 2022-04-08 03:05:40 +00:00
Wilson Wu
237a06e0c1 Fix keyboard settings crash in multi-user case 
We have CL[1] to fix the NPE when keyboard settings
is launched by work app. CL[1] overlooked the work
profile with multi-user case.

Work profile user ID is not available(return null)
when calling Utils#getManagedProfile by work identity.

For work case, distinguish it's running on managed
profile user(launched by work app) or not. And use
corresponding userId as:

-. If it's a managed profile user, use currentUserId.
-. For a owner user, get managed profile userId.

[1]: Iea573922ee789d9932c0de05bf71179c4f005eeb

Bug: 216395439
Test: Manual test with bugs steps
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableVirtualKeyboardFragmentTest
Change-Id: If018d2fddbbcf932927d2235bb8e99393df1e67c
 2022-04-08 11:04:52 +08:00
Bill Yi
35525a5617 Merge SP2A.220405.004 to aosp-master - DO NOT MERGE 
Merged-In: I2a97159d0de32a6262bbace7bb82b09897447bdb
Merged-In: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Change-Id: I593218f8417ab99d88c16705eef2cef705e0fcf7
 2022-04-07 18:41:02 -07:00
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