Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,478 Commits 1 Branch 0 Tags
73e2d7966e016991643202ebcf995e32ad3476df
Commit Graph

122478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
73e2d7966e Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d am: b33294a11d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252

Change-Id: I07f8ae6e4db1dd9ff8d939af794d2c77fa8b7f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:10:06 +00:00
TreeHugger Robot
b2c6748179 Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821 am: c321d9f1ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564

Change-Id: I03ad67b4989bfa9ee3d8cf3bdfa42497117f7906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:09:52 +00:00
TreeHugger Robot
c5e120ff80 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18 am: a18d8913c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477

Change-Id: Idb9cf25d9c7cc484d9f1afb83bc416f075e291b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:09:18 +00:00
TreeHugger Robot
bf52934fe2 Merge "Remove unused listener" into udc-dev am: a99c64dfde am: 9a0c0d7a82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: I3b627dc32e633776350f292c2bd1333bb96f894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:07:16 +00:00
TreeHugger Robot
b33294a11d Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev am: 3d548d2f2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21618252

Change-Id: I32587c2a97c0487da46aac1b96d6bdc689db1322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:41:12 +00:00
TreeHugger Robot
c321d9f1ea Merge "Fix checkcolor_hook error of Settings" into udc-dev am: 535fe83821 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347564

Change-Id: I6a59a7c1ea69576296c84759522965a3dda26e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:23 +00:00
TreeHugger Robot
a18d8913c7 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev am: d79985af18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22323477

Change-Id: I53382574cf5b7196dad573c91f70f791efcdc026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:12 +00:00
TreeHugger Robot
9a0c0d7a82 Merge "Remove unused listener" into udc-dev am: a99c64dfde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339269

Change-Id: Iea5199833d7ad7ae89c743371e420b70aa295ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:40:01 +00:00
TreeHugger Robot
98017dea10 Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb am: 0edd4e2b9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: Id3163694efeb7f8778553e23ddff56268e0e354a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:39:54 +00:00
Bill Yi
c73b300ae0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours am: 5caf2a7e4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8518d345206546f3bd3a95d7c9e130e6779b302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:39:45 +00:00
TreeHugger Robot
aa3c7af656 Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 am: 2094e9d0c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I19bf2120bbb2dde29ebecd34059466168a5fef92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:16:06 +00:00
Bill Yi
d21633c3b7 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours am: 8452984341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb6dd926cd9da9f3c7f29a62b64f27627d5a185e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:15:59 +00:00
TreeHugger Robot
4c5038ef03 Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb am: bd81231f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I2391b8895ce25181c1aa4072a978aa715151dcd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:13:31 +00:00
Bill Yi
489004128e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours am: 093609c5d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibc4f70fa7e64359b98efeb67e6d197b217572e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:13:19 +00:00
TreeHugger Robot
f27536a5cb Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 am: f7050b25ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: Ia44fc21e0cde0436206314ff6cbcb92213a5c9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:10:10 +00:00
Bill Yi
75f8001b89 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours am: 232d836205 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dfd1d7dd8d5c981329c7a9617e7f3d3d8b387ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:10:02 +00:00
TreeHugger Robot
bd81231f46 Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I40a13c28ce829406bd361c1d7fbcd23f288a46ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:00:03 +00:00
Bill Yi
093609c5d9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb4554d64f6344c701c109c3cb62d598891914c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:59:53 +00:00
TreeHugger Robot
0edd4e2b9a Merge changes from topic "tc_change_23032907_22" into udc-dev am: 925fabe0fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324311

Change-Id: I3a41df3de7c9766aa1acf631e8db07dcfc823938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:45:13 +00:00
Bill Yi
5caf2a7e4e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a am: ace08d1f77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99c5dff5d265acbfead5690311b9bfc3475a6679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:44:59 +00:00
TreeHugger Robot
f7050b25ee Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I234c37cf039b6ea2283ecb3275aa783a4213d205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:34:53 +00:00
Bill Yi
232d836205 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff384be9146717a2d09643aede4e40fc550f3f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:34:48 +00:00
TreeHugger Robot
89cc577adf Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499 am: bc1ae98aaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: I90357816d0ea18c8042e6e9f8602c2c3f7fc0c7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:27:55 +00:00
TreeHugger Robot
2094e9d0c2 Merge changes from topic "tc_change_23032907_23" into udc-dev am: a6b4086da5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22324312

Change-Id: I9d53109132363f5f8bcb3289461efb5abe79f413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:10:32 +00:00
Bill Yi
8452984341 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e am: feb063c3b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7d4c3dfad42abb3a98bf9001cccef5f7766dc9ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 18:10:30 +00:00
TreeHugger Robot
bc1ae98aaf Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: Icfb9ff53a6d6acf61c2303be1019e48d2ce84d4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:29:29 +00:00
TreeHugger Robot
285dadae4e Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499 am: 374d72f70c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: I1cc98a22f1b881bd87662b24a5c1201595bda9a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:57:21 +00:00
TreeHugger Robot
374d72f70c Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev am: 785cdf5499 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22322810

Change-Id: Ia488c31773954f0bcbcc1a691ef303058e40ba12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:27:58 +00:00
TreeHugger Robot
3d548d2f2d Merge "Exclude screen on time in battery usage page when the device is in charging." into udc-dev 2023-03-30 15:01:42 +00:00
TreeHugger Robot
535fe83821 Merge "Fix checkcolor_hook error of Settings" into udc-dev 2023-03-30 14:18:11 +00:00
Yanting Yang
705872ada6 Fix checkcolor_hook error of Settings 
Bug: 276273674
Test: verify with repo upload
Change-Id: Ia5ba89bb1b491785b953ba7909b3fa7528a0a636
 2023-03-30 20:51:09 +08:00
TreeHugger Robot
d79985af18 Merge "Unify Tick Preference from Physic keyboard and Regional preference" into udc-dev 2023-03-30 12:39:25 +00:00
Zaiyue Xue
ff11b8e307 Exclude screen on time in battery usage page when the device is in charging. 
Bug: 265751163
Fix: 265751163
Test: manual
Change-Id: I4ed71e1d6fad56a7cbfc9cd47ed4d791f45261ce
 2023-03-30 20:23:33 +08:00
tom hsu
23359bc0e9 Unify Tick Preference from Physic keyboard and Regional preference 
- Also change icon color from colorAccentPrimaryVarient to colorAccentPrimary

Bug: b/272398108
Bug: b/264476709
Test: Manual test.
Change-Id: Ide602c6fb9501b832df646692ec618be8a76e7b9
 2023-03-30 18:52:23 +08:00
TreeHugger Robot
a99c64dfde Merge "Remove unused listener" into udc-dev 2023-03-30 09:12:48 +00:00
TreeHugger Robot
925fabe0fb Merge changes from topic "tc_change_23032907_22" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-30 06:57:34 +00:00
TreeHugger Robot
a6b4086da5 Merge changes from topic "tc_change_23032907_23" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e
  Import translations. DO NOT MERGE ANYWHERE
 2023-03-30 05:49:47 +00:00
Wesley Wang
7effe64c18 Remove unused listener 
- Remove OnMainSwitchChangeListener and it's interface since the
   callback will duplicate with setCheck() method, cause the toggle on
   event come with twice while on and off, in futher to casue some
   duplicate work or error metrics logging

Bug: 218405966
Test: make SettingsRoboTests
Change-Id: If20ed6488d21443b9c623e8fe4de383a84ea673a
 2023-03-30 12:14:05 +08:00
TreeHugger Robot
785cdf5499 Merge "chore(#AlaysOnMagnifier): update feature Settings label and description" into udc-dev 2023-03-29 18:05:59 +00:00
Roy Chou
7dbfbd73d6 chore(#AlaysOnMagnifier): update feature Settings label and description 
Update strings based on b/275635152.

Bug: 275635152
Test: manually
Change-Id: Ia00bb87282d4a00518e216079a16fe71ffe32e1f
 2023-03-29 16:32:38 +00:00
Bill Yi
ace08d1f77 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac1796011a 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ia6f166fc4c7df9015e0e6607c4fe8d542fc892bc
 2023-03-29 14:12:36 +00:00
Bill Yi
feb063c3b6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 71ac923b9e 
Blank merge reason: commit message contains skip directive

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

Change-Id: I9b924aee32e04adeddef0d2043ff4880ccbcbd30
 2023-03-29 14:12:33 +00:00
Jigar Thakkar
57fa683c80 Merge "Fix user starts by using startProfile" into udc-dev am: e78b3d3f7e am: 5babf17c07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22225682

Change-Id: I3759ed5bc103e38c5f6fa5b38f3701a895ae9e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 13:47:45 +00:00
Jigar Thakkar
4e5736f5e9 Merge "Fix user starts by using startProfile" into udc-dev am: e78b3d3f7e am: e6e9d18833 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22225682

Change-Id: I5cd54a34def16b8bd6fc25fe54795c3032b3cdd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 13:47:20 +00:00
Jigar Thakkar
e6e9d18833 Merge "Fix user starts by using startProfile" into udc-dev am: e78b3d3f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22225682

Change-Id: Icb8d32be637445cf8b9adf22755e02e085daf815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 13:21:09 +00:00
Jigar Thakkar
5babf17c07 Merge "Fix user starts by using startProfile" into udc-dev am: e78b3d3f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22225682

Change-Id: I734046dd9ac0c3580bcad43ad017feae5f6b04f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 13:20:40 +00:00
Jigar Thakkar
e78b3d3f7e Merge "Fix user starts by using startProfile" into udc-dev 2023-03-29 12:45:50 +00:00
Alexander Milantev
81b008d7e4 Merge "Avoid activity embedding if the activity is already embedded" into udc-dev am: b8beeb1cda am: c3b4794c9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071824

Change-Id: I8ef138667a969b80a04ebeb90f83e7a3eb6204d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 12:37:36 +00:00
Alexander Milantev
496c4d6dbd Merge "Avoid activity embedding if the activity is already embedded" into udc-dev am: b8beeb1cda am: e0f5d68f1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071824

Change-Id: Ideddf2293fd9eacf23853798ab48d55be3559d03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 12:35:52 +00:00
Alexander Milantev
c3b4794c9f Merge "Avoid activity embedding if the activity is already embedded" into udc-dev am: b8beeb1cda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22071824

Change-Id: Iacad07f090ec6075bbd47ef6f4276b1f43cf5a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-29 12:08:28 +00:00