PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
137,751 Commits 1 Branch 0 Tags
ed3d2f91713af15521fa8db8e30c6c20bff3dd1d
Commit Graph

137751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chun-Ku Lin
ed3d2f9171 Implemented nested scrolling parent in TextReadingPreviewPager 
Flag: N/A
Bug: 317947238
Test: manual

Change-Id: I173881b84d5c5ff81c15a80a4de65fda59f5bf65
 2024-01-08 22:07:56 +00:00
Sunny Shao
946f52b2a1 Merge "Revert "Nullability Annotations replacement"" into main 2023-12-29 03:18:24 +00:00
Sunny Shao
19d1d3d15d Revert "Nullability Annotations replacement" 
This reverts commit cf0501e4d7.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
 2023-12-29 02:28:24 +00:00
Julia Reynolds
2d2fc79edd Merge "Hide spinner options for locked users" into main 2023-12-28 14:59:15 +00:00
Julia Reynolds
2890ac7101 Hide spinner options for locked users 
'Most Recent' and 'Most Frequent' depend on usagestats data, which
is only available for unlocked users. Hide them if the user is
currently locked

Test: turn off work profile and view app notification list, primary &
work
Test: turn on work profile and view app notifications list, primary &
work
Fixes: 195092949
Flag: none

Change-Id: Ia87b2b64824dff645286ea8910bcd2c412d070ae
 2023-12-28 14:11:27 +00:00
Chaohui Wang
b26ae73c39 Merge changes from topic "AutoSelectPreferenceController" into main 
* changes:
  Clean up ServiceStateStatus
  Improve AutoSelectPreferenceController
 2023-12-28 10:41:10 +00:00
SongFerng Wang
19dbb00acb Merge "Using carrier config for hiding 3G item at preferred network mode" into main 2023-12-28 09:40:26 +00:00
Chaohui Wang
851996d01c Clean up ServiceStateStatus 
And LifecycleCallback*, which is no longer used.

Bug: 299068234
Test: m Settings
Change-Id: I29ce5609db2a4b249477da1bcbb0502fa04902fa
 2023-12-28 16:58:42 +08:00
Chaohui Wang
2ec3840987 Improve AutoSelectPreferenceController 
Deprecate ServiceStateStatus (which could produce wrong value),
and replaced with serviceStateFlow.

Fix: 299068234
Test: manual - turn auto select off and on
Test: unit test
Change-Id: I42fe160500c68cc9ee0fe383121f64146ddbb7f2
 2023-12-28 16:58:42 +08:00
SongFerng Wang
ce45ac011d Using carrier config for hiding 3G item at preferred network mode 
Bug: 310639009
Bug: 301214162
Change-Id: Id3a85f46954311ff668f7175b672ac954a6e984e
Test: build pass. local test. atest EnabledNetworkModePreferenceControllerTest
 2023-12-28 08:28:17 +00:00
Allen Su
87f76d1c32 Merge "Add locale recommendation metrics" into main 2023-12-28 06:47:22 +00:00
Fan Wu
ec244f2f9c Merge "Ignore failing GraphicsDriverAppPreferenceControllerTest" into main 2023-12-28 05:05:52 +00:00
Fan Wu
c714de120b Ignore failing GraphicsDriverAppPreferenceControllerTest 
Bug:317934814

Test: Existing tests are not impacted
Change-Id: I3688ee6ee03f2b40f9b455eb7ec3f1049744c7a9
 2023-12-28 03:36:56 +00:00
YK Hung
2f18d1f4c4 Merge "Refine the DynamicDenylistManager dump() data format" into main 2023-12-28 03:19:36 +00:00
ykhung
e69d57cfd6 Refine the DynamicDenylistManager dump() data format 
Dump of DynamicDenylistManager:
      	ManualDenylist:
      	DynamicDenylist:
      		com.android.managedprovisioning
      		com.android.chrome

Bug: 306329984
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.fuelgauge.datasaver"
Change-Id: If5eb8919ee8dc222692b7435f9670d861253be12
 2023-12-28 02:37:47 +00:00
Bill Yi
ddeb73ee89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2a63e773ce -s ours am: 2b402bdd2c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754875

Change-Id: I26497f4d28a9c7fe41ab81ef3b4a1b602c1602d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:43:58 +00:00
Bill Yi
602ca1c6cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d62083085 -s ours am: 451f6817e1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754875

Change-Id: I4f3d7627cd5e390864a2f07359da9a99166c46d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:43:54 +00:00
Bill Yi
1fb4db4b0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2b26b470ec -s ours am: c2702b560b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754578

Change-Id: I9d907f4f34c01bf907d11fa3cf6055b006fb7892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:43:49 +00:00
Bill Yi
36742be845 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa1bfc7d04 -s ours am: 96dc00525b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754578

Change-Id: I4c9dcc376bd0e5aea19ec748e4c6e3479c005b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:43:40 +00:00
Bill Yi
09ff779c87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7af5937f90 -s ours am: d2b4db0ac5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754576

Change-Id: I683a5c8c65503dad60a148ff07873bb86a0de843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:43:23 +00:00
Bill Yi
2b402bdd2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2a63e773ce -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754875

Change-Id: I0322b8315d89bac557b7547fd15d106bf6f41db0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:40 +00:00
Bill Yi
451f6817e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d62083085 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754875

Change-Id: I75b61ec0bd8d8b376b61223b6a42a192766b590f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:36 +00:00
Bill Yi
c2702b560b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 2b26b470ec -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754578

Change-Id: I44d559aa0103827ec78fa37a9116b0365c4a28d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:32 +00:00
Bill Yi
96dc00525b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa1bfc7d04 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754578

Change-Id: I4c6e569abc2d5ac5eef6d2e331e33bc14d129e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:22 +00:00
Bill Yi
d2b4db0ac5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7af5937f90 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754576

Change-Id: I271fb4a230c55266fa8ce4b09c52fb1d295ad025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 23:02:05 +00:00
Varun Somani
d2876dd13c Merge "ARC++ PH: Location UI Changes" into main 2023-12-27 22:41:00 +00:00
Bill Yi
2a63e773ce Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-12-27 22:26:10 +00:00
Bill Yi
2b26b470ec Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-12-27 22:26:10 +00:00
Varun Somani
e69e72b1e4 ARC++ PH: Location UI Changes 
UI changes for privacy hub to disable location settings if setting is
managed by Chrome and feature is turned on.

Bug: 265471993
Test: Manual

Change-Id: I55ba35493d27a8a545765c5602a76dc124c24d98
(cherry picked from commit 1795f20cc54528a11fd0f2f72a9f782c64245eb0)
 2023-12-27 19:37:51 +00:00
Treehugger Robot
0e06ac3b9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 705aa21688 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754408

Change-Id: Iebbdfc85a28d5211300202f3ac744915d41c0690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 19:28:50 +00:00
Bill Yi
9ce50f7404 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bfec86e15b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754408

Change-Id: I481f145e0337fb3e695412ba8b8a463ef8bf2331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 19:28:39 +00:00
Bill Yi
8b3613a562 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b53e8a13c -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25754869

Change-Id: I06ef3eb6cda5a85e3bcfed41cc4ebc69011c0172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-27 19:27:06 +00:00
Treehugger Robot
705aa21688 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-12-27 18:50:52 +00:00
Bill Yi
6c5d56fe64 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-12-27 18:46:44 +00:00
Bill Yi
60ef28393b Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-12-27 18:46:44 +00:00
Bill Yi
ccbfb77a03 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-12-27 18:46:44 +00:00
Manish Singh
dbb2337ce0 Fix title for work and private profiles 
For some languages UserManager#getBadgedLabelForUser does not return
the correct string for the context.

Bug: 315082416
Test: manual
Change-Id: I376d1ad4eafd1ba5f3db2c32c9fddb81bbde2dd2
 2023-12-27 10:43:23 +00:00
mxyyiyi
06fa244255 Update action log metircs of app optimize mode. 
Bug: 317329360
Test: manual
Change-Id: Id4cd610a5bcc7988ecbd4545f5ef77a5253aac33
 2023-12-27 14:13:25 +08:00
Bill Yi
7d62083085 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idf84f378f3b906951a36c3c61ef7e9da9dbd9092
 2023-12-26 16:29:46 -08:00
Bill Yi
37f457001c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I152d4e5cc4c13435d6d03413e6410770c156274a
 2023-12-26 16:28:57 -08:00
Bill Yi
fa1bfc7d04 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If2aa5e6d3d7c3c72f973ab142ac09dccfa4703ef
 2023-12-26 16:26:50 -08:00
Bill Yi
da78fd0ede Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I80aae354efe89ddafc6fe9c901ef5b35e8d3b02c
 2023-12-26 16:25:02 -08:00
Bill Yi
7af5937f90 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I21ddd8b4ba7ef60791f304d38a466d80d6ec3073
 2023-12-26 16:23:29 -08:00
Bill Yi
2974a8bbb3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id4a99ed0d563a8ea6bbd76e183be6651253bbce4
 2023-12-26 16:22:41 -08:00
Bill Yi
2b53e8a13c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3ab35e8d02e94b217517dd2d47b271bdb5930e78
 2023-12-26 16:21:12 -08:00
Bill Yi
bfec86e15b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I37390918141b3ea7ed34c6f7b0c7fd7d6081536b
 2023-12-26 16:19:43 -08:00
Varun Somani
a579912892 Merge changes from topic "cherrypicker-L33700000962584268:N96700001396822390" into main 
* changes:
  ARC: Follow-up fix AndroidLint error
  ARC: Show location services setting in ARC-T
 2023-12-26 20:26:40 +00:00
Jason Chiu
ced0c1d038 [automerger skipped] Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23 am: 36dc648ca5 am: 2a29d67710 -s ours 
am skip reason: Merged-In Iddcba1652060d755693dd20d0e350e3d6c1ae138 with SHA-1 5a305645c1 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507

Change-Id: I010788bde2323fa5df9a92f135d6caae6111c11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-26 09:52:27 +00:00
Jason Chiu
2a29d67710 Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23 am: 36dc648ca5 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507

Change-Id: If9497561d0efa2311a18886105a1ce02709373be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-26 09:18:32 +00:00
Jason Chiu
36dc648ca5 Merge "Finish HomepageActivity when it's not the root of a task and not singleTask." into main am: 4f4bb89a23 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2884507

Change-Id: I5b61af6e8d265bc62603554ff0236a62ba7f94a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-26 08:48:01 +00:00