PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,112 Commits 1 Branch 0 Tags
ae26f380b2fba076c7ce0faf2cedaa9ab84daffb
Commit Graph

103112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
99d834b0b8 Merge sc-v2-dev-plus-aosp-without-vendor@8433047 
Bug: 226662282
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
Change-Id: I71459583120f712298f47b4dbd2c791d8ef4e022
 2022-04-18 21:01:08 +00:00
TreeHugger Robot
2902d67c16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours am: 467b85d088 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5cc92c254bb91040742ce55df82ce3088e00ce30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 19:25:02 +00:00
TreeHugger Robot
467b85d088 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 5e411c38cb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4435f6f1918ce336ee104c933f7d040a165f2153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:51:14 +00:00
TreeHugger Robot
61c166f2f4 Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev am: aa1f86f18d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17801765

Change-Id: Ia874c152d0c5ed0757242064c5c6b75c3b845f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:43:56 +00:00
Bill Yi
e46d450ee6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I807cf19714d8b4657a48d4102730fc7b210ebf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:43:55 +00:00
TreeHugger Robot
5e411c38cb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-18 18:14:25 +00:00
TreeHugger Robot
aa1f86f18d Merge changes from topic "presubmit-am-a6d51d83e79d4efb88a3610f5edefa60" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-18 18:14:25 +00:00
Bill Yi
b5d0a278e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic83945030f5218878648f85f28941a80c1a30e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:02:06 +00:00
Peiyong Lin
f71c92bbb6 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

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

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

Change-Id: I5fbaef29db47314d259051001fc284f01b627229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:00:04 +00:00
Peiyong Lin
bd26c3c747 Merge "Clean up extra app info." into tm-dev 2022-04-18 17:37:41 +00:00
Yuri Lin
075dd07035 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: Ib1f6d16868ba3f566993c339cf2fa8899cb512c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 17:23:06 +00:00
Yuri Lin
a73c850aa5 Merge "Special handling for intent coming from "welcome" notification." into tm-dev 2022-04-18 17:09:02 +00:00
Hugh Chen
aadc44ae26 Fix default usb settings will set wrong function when onPause() 
Bug: 229200265
Test: make -j64 RunSettingsRoboTests
Change-Id: Ibee2d39af8b341d03117d96029446ddcd45921fe
 2022-04-18 12:16:57 +00:00
Bill Yi
64a0937f54 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7d7f009e6a1f4698d7d302ce3440b60f679e672
 2022-04-18 10:57:25 +00:00
Bill Yi
442f62eb55 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I69867d36d9dfef29de295def3477ccd9222b24da
 2022-04-18 10:42:59 +00:00
Bill Yi
fc86f72e65 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7d547343a1ce1a358b12ab082db4378d88b67c14
 2022-04-18 10:36:04 +00:00
Bill Yi
fb20f3183b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae 
Blank merge reason: commit message contains skip directive

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

Change-Id: I0c632c34915f66123287353900d59d4e31010a25
 2022-04-18 10:32:54 +00:00
Bill Yi
d5de2ec5ae Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4034c0729c04a0a0dd7a3d3690303c616e67516
 2022-04-18 10:32:41 +00:00
Bill Lin
f5496a99cd Remove redundant margin from SudContentFrame 
Test: make and diff screen
Bug: 229197953
Change-Id: I8d4de113ba69ee72b0eb36ad95ae395afa6eab11
 2022-04-18 17:47:50 +08:00
TreeHugger Robot
f821e55653 Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704

Change-Id: Ib8ed3cab92913d7833ee45da09f0e8f6b889b598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 08:43:19 +00:00
TreeHugger Robot
708c2d2fd5 Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev 2022-04-18 08:20:48 +00:00
Edgar Wang
4b7ecd2a70 Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev am: 4dc79d92f0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799703

Change-Id: I7b78d307b63525cd6c2b214c1bc3d4bb814157e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 07:11:03 +00:00
Edgar Wang
4dc79d92f0 Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev 2022-04-18 06:45:02 +00:00
ykhung
0f8ee91e1e Remove the legacy getReplacingActivity() method from feature provider 
Bug: 195306545
Test: make RunSettingsRoboTests
Change-Id: Ie7ae30ad671ec2ee2659e64ee4f191728edab4e8
 2022-04-18 05:59:58 +00:00
Edgar Wang
ca7f11d965 Adjust the padding between profile tab and app filter spinner 
Bug: 223952727
Test: visual
Change-Id: I88411d554975953d29a24a88b6cf948f7f6d7ac8
 2022-04-18 12:48:35 +08:00
TreeHugger Robot
4827d18f47 Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657

Change-Id: I13259653dbafb92d996ff1b64564d3905ab96883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 04:41:22 +00:00
TreeHugger Robot
edf39d0e45 Merge "Fix sub status of LocationSettings" into tm-dev 2022-04-18 04:20:09 +00:00
Hugh Chen
c9c29e21f7 Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev am: 3c354a2d38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17774547

Change-Id: Ic8233fcbffb4a39ad733bb7fcab2017a8ebf5ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 02:08:56 +00:00
Hugh Chen
3c354a2d38 Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev 2022-04-18 01:50:07 +00:00
ykhung
f76aeea8a3 Use en-dash in the time range instead of a hyphen for different format am: 91adbd3b16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782706

Change-Id: Ia6292dd5db1ada1406687cef6ea9da3272f1bbc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-17 15:22:40 +00:00
ykhung
ecf5574c2d Format BatteryEntry and BatteryDiffEntry class am: b593e00af0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705

Change-Id: I4f50824094d0b508686ab86f10fcec5958b838e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-17 15:22:35 +00:00
Chaohui Wang
37375565e5 Fix sub status of LocationSettings 
Fix the followings:
Recent access apps are not displayed after toggling off/on
"Use location".
When "Use location" is enabled, "Location for work profile" switch is
disable and gray out.

Fix: 227621199
Fix: 227265216
Test: manual
Change-Id: I9f955a381827eb020fbd0d6ebeb9fced3dec1dcf
 2022-04-17 19:38:39 +08:00
ykhung
91adbd3b16 Use en-dash in the time range instead of a hyphen for different format 
Expected format: 00:00–02:00 or (2pm – 4pm)

Screenshots:
https://screenshot.googleplex.com/4RvaovK6RN7kjqo
https://screenshot.googleplex.com/ADZRr2TPuuctFre

Bug: 229264053
Test: make RunSettingsRoboTests
Change-Id: Ifd9bea0ce4525c8b582778e255104e875d365563
 2022-04-17 06:52:24 +00:00
ykhung
b593e00af0 Format BatteryEntry and BatteryDiffEntry class 
Bug: N/A
Test: make RunSettingsRoboTests
Change-Id: I14e2ef4c455209e58edc5ccdbe064f469815cccd
 2022-04-17 06:23:47 +00:00
Bill Yi
afa4a259d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3e709cfb3984b5110869cbedb5d27a43ea7299fb
 2022-04-17 04:36:18 +00:00
Bill Yi
713df54284 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie2f06fafcafd8eb46fd5e53a8b489eb41cca4997
 2022-04-17 04:32:46 +00:00
Bill Yi
02d934fbda Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I836e8d4935ba19b491ebb1f41c6ca351b586c90f
 2022-04-17 04:29:46 +00:00
Bill Yi
8156cb9555 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If527551275eb8fc20bc08cea699b786b52ce97e3
 2022-04-17 04:26:06 +00:00
Peiyong Lin
586bcd69d9 Clean up extra app info. 
Bug: b/224595815, b/229336010
Test: manual
Change-Id: I21cda5a4a5f8f378a532ac0fd4e91c2cc011ed95
 2022-04-16 00:47:05 +00:00
YK Hung
84e451d784 Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656

Change-Id: I0cba8a3bce94abccacae54146411ef6474e2082a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 13:29:16 +00:00
YK Hung
c4801433d9 Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev 2022-04-15 13:06:04 +00:00
TreeHugger Robot
3d851dd1c9 Merge "Remove singeLine attribute in the usage chart divider" into tm-dev am: 36414eab28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17771974

Change-Id: I03c03d46964c01495d4188b1581bc65e8449d67a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 12:21:57 +00:00
TreeHugger Robot
36414eab28 Merge "Remove singeLine attribute in the usage chart divider" into tm-dev 2022-04-15 11:47:55 +00:00
ykhung
1c6695951f Use the custom name in the battery attribution if it is unknown item 
Keep the queried name is null to use the custom provided battery attribution name (avoid to replace it with POWER_COMPONENT_ prefix name), such that we can show "TPU", "GPU" ... attribution.

old screenshot: https://screenshot.googleplex.com/8KGNxW2eHFY85zw
new screenshot: https://screenshot.googleplex.com/8KVj3jBjShfa8wK


Bug: 227749579
Test: make RunSettingsRoboTests
Change-Id: I22fba3c252a92f7d64670ad5d0f6f3548374968a
 2022-04-15 11:20:46 +00:00
Chaohui Wang
d0e84aed9b Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev am: fdc32b765d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17679969

Change-Id: If145441cd05cc9a1b4b98cba4229d1797ea3e141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 10:15:51 +00:00
Chaohui Wang
fdc32b765d Merge "Fix scrolling position not kept in Trusted Credentials" into tm-dev 2022-04-15 09:55:48 +00:00
Hugh Chen
e9864510ab Change "Previously connected devices" string to "Saved devices" 
Bug: 215230194
Test: local test
Change-Id: I0ae7f71b798f5582ff62f20ce639133242c30b3f
 2022-04-15 09:51:30 +00:00
SongFerng Wang
3f701d6924 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: I676f29fb0d25c814f466a9f4fbe8706b12a0e286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 08:56:56 +00:00
SongFerng Wang
9b6c604742 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: I2b87ec33acef3ff86422ac715a30973fa6fd837a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 08:42:48 +00:00