PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,869 Commits 1 Branch 0 Tags
77d967d71338c1558032ceac5cfdbf074ba1e5cc
Commit Graph

121869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matías Hernández
cb13bd964d Merge "Tweak refresh of notification channel group preferences" into udc-dev am: c49cb1014c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22761580

Change-Id: I889dff9b16777539e8e8d9775c7ae3fe0bf462e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 14:37:35 +00:00
Matías Hernández
c49cb1014c Merge "Tweak refresh of notification channel group preferences" into udc-dev 2023-04-25 14:00:14 +00:00
danielwbhuang
077293b72d [UI][Modifier key remapping] Use new color token. 
Chnage materialColorPrimaryContainer to materialColorPrimary
Change materialColorSurfaceContainerHigh to
materialColorSurfaceContainerHighest

Bug: 277712746
Test: manual
Change-Id: I7b23850a24718d28020f6a7b13119c69f50861b1
 2023-04-25 09:58:21 +00:00
Marcello Galhardo
0061d4093a Create the Note Task shortcut using the SystemUI Context 
By using the SystemUI Context to create the shortcut, we allow SystemUI to manipulate the shortcut and apply updates such as enabling or disabling the shortcut, or even updating the app badge override package.

Test: manual

Fixes: b/278724068
Change-Id: I926a775923528aacfaf9b62141234b770f381c79
 2023-04-25 09:49:40 +00:00
Wesley Wang
a4bafafb21 Fix Settings app crash cause by BadParcelableException 
Bug: 279391146
Test: make SettingsLibRoboTests
Change-Id: I32dd0aa87c405786fe28b15721e4edbcb4d73a98
 2023-04-25 17:49:12 +08:00
Fangqiu Su
064c80b470 Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb am: 378e7af38e am: 5ce99863ea 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I62bb7a4c90c78cf5631bdd933f8f6e0e9f64797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:59:00 +00:00
Fangqiu Su
29f3d022f7 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 am: 8d16e20d78 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I932c3dfca81798867d20625d7cc7007dabbec0f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:07:10 +00:00
SongFerngWang
eea3722ae7 Replace the SlicePreference with Preference am: 794fc58235 am: c054498357 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I23f42053cfeb5de0c55ae83aa9a0ec37b94db49d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:05:42 +00:00
Fangqiu Su
5ce99863ea Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb am: 378e7af38e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I5ddfb48e1809ce7c51163d30c0e283c3b3bc5c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:05:33 +00:00
SongFerng Wang
f929dc6dea Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp am: b0f9c2deae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I25f24e707f42147d28101ed00da233b37218865e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:47:35 +00:00
Fangqiu Su
8d16e20d78 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" am: 2fba2c2316 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558350

Change-Id: I03bf08855b17f3a9d95fe00b4de68e97a62f4101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:24:07 +00:00
Fangqiu Su
378e7af38e Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" am: 68903eb9cb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558450

Change-Id: I5e1a6f87cc9f32c18ce84fe4d2d5a3f95ff52f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:23:50 +00:00
SongFerngWang
c054498357 Replace the SlicePreference with Preference am: 794fc58235 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22755956

Change-Id: I5e9032624347b27acb02eafd28002744d92b5f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 06:23:25 +00:00
SongFerng Wang
b0f9c2deae Merge changes from topic "presubmit-am-58603bfd39e0474b9e10a90af62fa3f5" into tm-qpr-dev-plus-aosp 
* changes:
  [automerge] Replace the SlicePreference with Preference 2p: 794fc58235
  Replace the SlicePreference with Preference
 2023-04-25 05:52:54 +00:00
Fangqiu Su
2fba2c2316 Merge "Update uiautomator references in packages/apps/Settings/tests/perftests" 2023-04-25 05:48:52 +00:00
Fangqiu Su
68903eb9cb Merge "Update uiautomator references in packages/apps/Settings/tests/uitests" 2023-04-25 05:47:24 +00:00
Treehugger Robot
885801abc2 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev am: ea3a970826 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779519

Change-Id: I934ee99c2e09b21e9a9c032111dbbf169bb533b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:29:03 +00:00
Treehugger Robot
ea3a970826 Merge "Fix b/279120121: Unplug 100% Pixel phone won't reset the battery usage data when the phone is just started." into udc-dev 2023-04-25 03:59:03 +00:00
Zaiyue Xue
43ea982e9e Merge "Replace Screen system component time with device screen on time" into udc-dev am: f3a3634aa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22809776

Change-Id: Ieef0738903ed0528826866b4539f3ee521e8e800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:45:31 +00:00
Zaiyue Xue
65347f07ce Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: I41b385d28c5df0d83c6962bc297e28da5e61e26c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:44:43 +00:00
Zaiyue Xue
f3a3634aa5 Merge "Replace Screen system component time with device screen on time" into udc-dev 2023-04-25 03:32:02 +00:00
Zaiyue Xue
cfa374f997 Merge "Combine screen on time map into battery usage map" into udc-dev 2023-04-25 03:31:39 +00:00
Zoey Chen
d014b55e01 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: Id22c108a702b279e8348f81fb6d84e7dd97501d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:25:49 +00:00
Zoey Chen
221a58918c Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: I10c1d03beb08f2425de8552a7a8d6697ed3b873d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:23:46 +00:00
Zoey Chen
c31cf3d3b4 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev 2023-04-25 03:00:20 +00:00
Zoey Chen
1d74998647 Merge changes from topic "regional_preference_metrics" into udc-dev 
* changes:
  [Regional Pref] Remove Calendar controller and related Fragement
  [Regional Pref] 1. Add metrics for user changes the First day of week 2. Refactor to Settings design
  [Regional Pref] 1. Add metrics for user changes the Temperature unit 2. Refactor to Settings design
 2023-04-25 02:59:27 +00:00
Treehugger Robot
26adf38f78 Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: Ided95afc058f53d9753dea764c947cb473380ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:59:00 +00:00
Automerger Merge Worker
5e3e804b39 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours" into udc-dev-plus-aosp 2023-04-25 01:58:05 +00:00
Bill Yi
27bc142960 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I046aa9989a367373ce08cd7da6251c7160c93640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:55:41 +00:00
Fangqiu Su
6b6044bedb Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ic9bd09f06a4cf29e220b9516846ead6b0e2e634e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:55:20 +00:00
Treehugger Robot
ef196f7f3e Merge changes from topic "tc_change_23042206_47" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-25 01:26:27 +00:00
Fangqiu Su
5ed8e6bc0e Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: I2eaa42894698dd627630aba0480046e81fb31b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:11:31 +00:00
Fangqiu Su
a176782c18 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 00:27:13 +00:00
Chaohui Wang
5fba57460c Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I89ef02b853287ce35d1feb7bd0c6abeccdfdbc61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 00:24:45 +00:00
Chaohui Wang
56f2c894d8 Merge "Fix EID dialog related issues" into udc-dev 2023-04-24 23:46:42 +00:00
Fangqiu Su
233c708436 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" 2023-04-24 23:46:23 +00:00
Bill Yi
f9392111bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d9d0f1a19122f51fcc8cce15cb4c0c0e76fd933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:16:26 +00:00
Bill Yi
19a53a5241 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25aaf4e993f96b9247b1efb8bd273a029378d576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:16:18 +00:00
Bill Yi
bcafcba421 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie4c3ace854f36107dbd35398697545dde1bd3152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:16:15 +00:00
Bill Yi
f0911b2572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I517f2084707e439e43271a2e9f17e0ddc3850b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:16:11 +00:00
Bill Yi
ec6a532d98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f3ad8a6d69d07f56c8255e14f2f9c6555e2c1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:15:57 +00:00
Bill Yi
7218d10694 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3a73e2fef1e079f3dca4794a41f45f46e1be4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 22:15:22 +00:00
Bill Yi
eb6de672dc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Bill Yi
ae1b6f1e35 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Bill Yi
ef269038ef Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Randy Pfohl
a8e19402ab Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788321

Change-Id: Icdc5a9074af0a09d5b0a5a366761e1eb37d27a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 18:28:31 +00:00
Randy Pfohl
a4e868af0d Merge "Ensure we launch gesture tutorial as new task" into udc-dev 2023-04-24 18:16:08 +00:00
Fangqiu Su
828f2fcec9 Update uiautomator references in packages/apps/Settings/tests/unit 
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I55c2d77b0bcd3b673de5a0b42170414de5fc3baf
 2023-04-24 18:07:07 +00:00
Fangqiu Su
643e908ec4 Update uiautomator references in packages/apps/Settings/tests/uitests 
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I216758dc3898875c41f865f5aa25d20bf0386aed
 2023-04-24 18:03:02 +00:00
Fangqiu Su
61c93dc8c3 Update uiautomator references in packages/apps/Settings/tests/perftests 
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I19484ff3b0c7f9db24534b175c2d321ac5a30909
 2023-04-24 17:49:02 +00:00