PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,287 Commits 1 Branch 0 Tags
6f48b8c62c4c309d5d5c3f8fc69a7be35fb94e8c
Commit Graph

129287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shivangi Dubey
c06568346c Merge "Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf" into udc-qpr-dev-plus-aosp 2023-09-08 15:13:50 +00:00
Zaiyue Xue
a93fd54d09 Save foreground_service and cached consumed power in battery usage slot datebase. 
Bug: 284893240
Test: manual
Change-Id: Ic09efabb0d93fb4bc7400b9410f32ec2f438dc73
 2023-09-08 20:20:36 +08:00
Bill Yi
e5042752a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours am: 120f89d40f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78be937b26b283dfbe26956346f4bb7e179e0c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:48 +00:00
Bill Yi
98239c5485 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours am: c0e12c874e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3bb432203f06c3cd03c3f28f5193b16abc6b8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:40 +00:00
Bill Yi
a4b436ae78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours am: 610c2167bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie50c201a974840ff5d11b843c3b2f634879fe224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:28 +00:00
Bill Yi
570569b43a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours am: 18f139a3b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d6749a6812566ac286a99fcd80ccca2ca4b267d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:15 +00:00
Bill Yi
14d89bfce8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours am: 97f0fa1142 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I308d3e8482d0b85e70640096411826001f2a9e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:13:12 +00:00
Colin Cross
c2c4d0855b [automerger skipped] Fix kotlin nullable errors in Settings am: 8f7a1e6f53 -s ours 
am skip reason: Merged-In I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0 with SHA-1 753c96133a is already in history

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

Change-Id: I6b882af2fa940af95a2d9a23a9dc6926ab9b1d1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 01:11:39 +00:00
Bill Yi
120f89d40f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours am: 269d31645e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcffc4bd7d291912a665a549f86d472feb5f4435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:35 +00:00
Bill Yi
c0e12c874e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours am: ebfc5128ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iffc5c4dab88234629757813c7ff679c3d6bcf27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:27 +00:00
Bill Yi
610c2167bc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours am: a4a56a7fb3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I270a554be450e56d18e46dd2e6f0f86e89ab0965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:15 +00:00
Bill Yi
18f139a3b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours am: c751e145d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b1cb6160b47ba11735ea45444efecfe9160c218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:36:02 +00:00
Bill Yi
97f0fa1142 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours am: 8128682775 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0476264a7ec431fecb1a7dc47cdb3de4691bd068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-08 00:35:59 +00:00
Bill Yi
269d31645e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 458e8cc311 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If070041457437f16845b2edc8c61516e60fab697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:52 +00:00
Bill Yi
ebfc5128ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0071351cfc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ce07c057e0308c0fa6b40b74e368f64c8324f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:39 +00:00
Bill Yi
a4a56a7fb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future am: 3d0a8354b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a1ff34ef0b4f89c90a36ec50e5f1d2230d5202c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:32 +00:00
Bill Yi
c751e145d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 219f3c68fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I770162694316efb0427b657facf461c3b45800e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:21 +00:00
Bill Yi
8128682775 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0aee5a3e64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37b04d6ebb72c2c2634892fb02908f81f115b95d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-07 23:52:07 +00:00
Bill Yi
458e8cc311 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:06 +00:00
Bill Yi
3d0a8354b3 Merge "Import translations. DO NOT MERGE ANYWHERE" into aosp-main-future 2023-09-07 23:43:06 +00:00
Bill Yi
2527e8855f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-07 22:56:10 +00:00
Bill Yi
95ff1dbb5e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-07 22:56:10 +00:00
Bill Yi
bc882dc6a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-09-07 22:56:10 +00:00
Holly Jiuyu Sun
54f96175a2 Merge "Change feature flag to device config flag." into udc-qpr-dev 2023-09-07 18:47:54 +00:00
Colin Cross
8f7a1e6f53 Fix kotlin nullable errors in Settings 
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.

Bug: 294110802
Test: builds
Change-Id: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
Merged-In: I6aa0516fa4f6443b6d4dff873baf3b08ff9189f0
(cherry picked from commit 84f8961e67)
 2023-09-07 17:11:11 +00:00
Bill Yi
0aee5a3e64 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I07e5e02d38b78617cbe7f8a23053d0c15aedd692
 2023-09-07 04:18:01 -07:00
Bill Yi
0071351cfc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I79f55f0afe719e019225ea96a442a066ab33e4f3
 2023-09-07 04:15:45 -07:00
Bill Yi
219f3c68fa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18aa01b928c2e48302ed95acf15cdeec11c1c3e5
 2023-09-07 04:13:48 -07:00
Jason Chang
f6fdfb0ddc Merge "Fix the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev 2023-09-07 06:20:21 +00:00
Bill Yi
4023686444 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8e3f59a9d566489d8c61d1a3f63cf90574d1940b
 2023-09-06 20:58:06 -07:00
Bill Yi
3152898c4a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8be0bcf8a734144099c330c82f335c145ef974f5
 2023-09-06 20:57:19 -07:00
Bill Yi
bea9c6fffa Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3673e713822da35a1aa64de4aecb0aad5c1d77d2
 2023-09-06 20:56:31 -07:00
Bill Yi
2c4039be6d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1807ea56cbfaa846e77ba40b2c330f931e826715
 2023-09-06 20:53:50 -07:00
Bill Yi
1246d3046b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifb278053057291391b9b2554a487b973470b6713
 2023-09-06 20:52:13 -07:00
Bill Yi
218dd7dcbd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I40cb57285ddab4f4494479eb2da3fc1ac8cfec5c
 2023-09-06 20:50:39 -07:00
Bill Yi
35b82f2c87 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1bc80785e0a6c6d9576749bf5d47f607e5b9ed56
 2023-09-06 20:49:17 -07:00
Shivangi Dubey
00a78fca41 Merge "Refine fold setting" into udc-qpr-dev am: 26e14e09bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24314953

Change-Id: Iaf6c0514a406267de5924672b1e879a4dce3ce4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 15:06:39 +00:00
Shivangi Dubey
26e14e09bf Merge "Refine fold setting" into udc-qpr-dev 2023-09-06 14:28:54 +00:00
dshivangi
7435bbc70a Refine fold setting 
Current fold setting has a toggle button which can enable the “Stay unlocked on fold” setting.
Create a new page for fold setting which will allow us to choose something from three options.(https://screenshot.googleplex.com/6W65aTYtigGpr3v)
 *Always - Front display turns on when you fold your device [Currently available setting]
 *Only games, videos, and more - Front display turns on for apps that stop your screen going idle [Default]
 *Never - Front display locks when you fold your device [New option for user]

Test: atest FoldLockBehaviorSettingsTest FoldLockBehaviorPreferenceControllerTest
*Manual
  Flash the build with these changes
  Manually select options one by one
  Observe the behavior

Fixes: 294194379
Change-Id: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
Merged-In: Ie5b4e1d7560ed645ec2ca5f49cc9715b17d21367
 2023-09-06 10:52:12 +00:00
Graciela Putri
c8bd304d95 Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b419 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24620828

Change-Id: I336e6a719d50ab5bdc841d7e9bb68c6f60e040f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-06 03:19:38 +00:00
Graciela Putri
f7a443b419 Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev 2023-09-06 02:22:01 +00:00
Xin Li
4a46f2bc9b Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11 am: bc31bffab0 am: 21a77533a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146

Change-Id: I5e98258d795c64a3878d52c38e426f38a684d3fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 21:07:25 +00:00
Xin Li
21a77533a7 Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11 am: bc31bffab0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146

Change-Id: I9c3a850fbceb22d7e34601288d470eb4fd037723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 20:34:32 +00:00
Xin Li
bc31bffab0 Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f11 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24623146

Change-Id: If887691054dcfe9746687f7d50986dd2c252633e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 19:45:17 +00:00
Xin Li
770a4e1f11 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:35:36 +00:00
SongFerng Wang
33b6032bb2 Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev am: 60afc1259f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24575008

Change-Id: I2214f91f8f27ab937b2d9b96f62a1fdcdae47072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-05 02:49:28 +00:00
SongFerng Wang
60afc1259f Merge "Skip Data usage in Settings Widgets" into udc-qpr-dev 2023-09-05 01:55:45 +00:00
Treehugger Robot
e4d9d80f15 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9 am: c9e0efd5ba 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Ib944ab2e79ea349791e83a2dc7639920ac76245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 15:38:17 +00:00
Treehugger Robot
c9e0efd5ba Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: I6861bf65677a4d451b53b81993d262230739e482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 15:00:12 +00:00
Treehugger Robot
ed9bbf31c9 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Ia9c6634870b4c1591804153d9da63b6c13e1cf80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-04 14:10:40 +00:00