PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,348 Commits 1 Branch 0 Tags
a74527da3db0cf672f7e3c76bee70d1cf93b012c
Commit Graph

124348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
9f7e3227bb 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: I61e584359b1205b5f5b484561c84e5a073d166ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:38:04 +00:00
Zaiyue Xue
d71ead4afb Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997 am: 8892fd48ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: I20a63b7ebaa4eb61b1dfac97c95096641a5ea176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:37:29 +00:00
Zaiyue Xue
86389502e6 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: I9c7e21607e8175f14248b963c5067455c47d8b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:36:02 +00:00
Zoey Chen
ea0f1b4bc6 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 am: c28a5c3431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

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

Change-Id: Ic6853f25c0ac65a0a31114dcd65c0047f0ff0550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:33:22 +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
Zaiyue Xue
a795d58ace 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: Ifd0c2667a42bd3c47b27749092009d6786499052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:22:02 +00:00
Zoey Chen
d14da56ab6 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: I014bf4cec4f4599a486bb365c9b492a1d7c01bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:15:05 +00:00
Treehugger Robot
9b25f5ac88 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: Ia19da83e61ec2bfbfbbb61110c605c401dd0295e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:12:11 +00:00
Zoey Chen
b37a320ed8 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: I62c12474a027b6a363dc2d280846507c610bed91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 04:09:13 +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
796c2ef5ca 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: I6a72fe235b10dccd92cc56be7cf4e5f5e7a170f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:49:44 +00:00
Zaiyue Xue
8892fd48ca 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: Ic49b7f1c2382914ac42bd213629150f7dfc35dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:49:13 +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
Treehugger Robot
5f160e1562 Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: ed9f22b78a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: Id9f3db103c4b552b029fa5cd260aeb3a2a1f4965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:29:20 +00:00
Bill Yi
37fab052e0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 0a2936d879 -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: I2b02d784210c68cbeb7209f50d6c0385c0f31360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:28:54 +00:00
Zoey Chen
c28a5c3431 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: I08689116c085fd322166bf2ef817a961b42a4cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:28:02 +00:00
Zoey Chen
609b91c715 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: I82ededa655a73151d1b5a837426bd02c11cbdcd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 03:27:38 +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
4c78f9cdf7 Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: 26adf38f78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I2e0fdeb0b1ab5e53dd797dcf305cc8ed3ba3c49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:56:06 +00:00
Automerger Merge Worker
294c5a72bd Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours" into udc-dev-plus-aosp am: 5e3e804b39 -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: I8436defb2dbb3ca43c8461b8d02f51d71693da21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:44:00 +00:00
Bill Yi
4d378ddc21 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 27bc142960 -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: If582596e076b37f138b6d635327f93e0ff635101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:43:57 +00:00
Fangqiu Su
0f1ca5b569 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e am: 6b6044bedb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: If1833c5dfb653dd2ef40ee62e04ad9e306865b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:41:54 +00:00
Treehugger Robot
b687c3a6cd Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f3e am: 8b449fadde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22794712

Change-Id: I209ba5c63bb902b6dfce9dffe4a63b5294cd7489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:38:06 +00:00
Bill Yi
b309f2e56a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c am: c4649b3ede -s ours am: 17062daad3 -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: Ie205872d85766da26eb8c851bbd8f772563f5c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:37:42 +00:00
Treehugger Robot
ed9f22b78a 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: I968e42bdcd64a2325105458eedf106e389bde932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:21:06 +00:00
Bill Yi
0a2936d879 [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: I46369b2d98f829b295f9164f8a7069a7ce71a799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 02:20:45 +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
Treehugger Robot
8b449fadde 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: Id57aada77bbc1ce4ee7d84256bfcb915f9af33d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:56:47 +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
Bill Yi
17062daad3 [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: I1763d407c3b0072264da6f75641aa6c0798dbab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:55:07 +00:00
Chaohui Wang
cf47befb50 Merge "Fix EID dialog related issues" into udc-dev am: 56f2c894d8 am: 5fba57460c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789357

Change-Id: I11a266a7000eea7ecc37e215dadfc46fb3710249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:40:40 +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
Treehugger Robot
c55501f7c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 646e95241d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3f7058db327485df5c868928e4432ddee24728e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:18:28 +00:00
Bill Yi
9a68370305 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4b01e8c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I50e67b0274381606cbd63fde1d2cd1ece4568e9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:18:12 +00:00
Treehugger Robot
d704607b35 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 103dfefdad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f6df8b433437086b9fd763301054a6ec9e76e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:17:58 +00:00
Bill Yi
cacff81257 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c43541f1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06b797760dc58a9987bdcab19ea9a4674913b16c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:16:32 +00:00
Treehugger Robot
3d3dcbab25 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-25 01:16:30 +00:00
Treehugger Robot
1ca7987d8e Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-25 01:16:30 +00:00
Treehugger Robot
3f8ee137f2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-25 01:16:30 +00:00
Treehugger Robot
9baf7e3fca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 29ba678514 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a71119fd44db4ccc23c66361820e0a5c876939f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:16:29 +00:00
Bill Yi
1920f8aa93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f92177ec1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f59c629429a0c350c533662b8ec4a1371b270a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 01:14:55 +00:00