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

103052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TreeHugger Robot
e6a5247285 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-18 18:11:44 +00:00
TreeHugger Robot
8e461aef7b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-18 18:11:41 +00:00
Bill Yi
fa0b661076 [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: Ic7bc9652b1eb3b9a7ebe16cb21a1f548c280f815
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:01:32 +00:00
Peiyong Lin
fceaaa80a0 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: I717aff5f945e5ddae382d0c09b7185f03be522e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:00:09 +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
Yuri Lin
d6dc2708c7 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: d21ef57315 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I67ea5071f8d033af594467c0903f442916cc79e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 17:52:45 +00:00
Peiyong Lin
bd26c3c747 Merge "Clean up extra app info." into tm-dev 2022-04-18 17:37:41 +00:00
Yuri Lin
d21ef57315 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: I4e88828a7d398b014be9313bf59819a3edf9322f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 17:24:04 +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
Lucas Silva
28b4fe2363 Update dream settings strings with sensible char limits. 
Also removes some unused strings

Bug: 228790933
Test: n/a
Change-Id: I42fd1954242dc12370982bfbc0e18389e9a7c3dc
 2022-04-18 17:00:50 +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
c9be756fd4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I75dfdb75599cc9562f58c1ee8e38c5f528865e99
 2022-04-18 10:53:47 +00:00
Bill Yi
6a213caba0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie017d40261040bacdef409075dfb26bc91d9229a
 2022-04-18 10:49:51 +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
1f48173940 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie1d8ab7bb37e96ef5c233a16a2b1f225810279d0
 2022-04-18 10:41:37 +00:00
Bill Yi
15d7ac7c5b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idfd65d3cc38d8d694a05b62bef198f1bed2d4415
 2022-04-18 10:40:02 +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
2c1171000f Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5 am: d9db15cd77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704

Change-Id: I0306a9b7d37caaba971c167500b731180ce0316f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 09:02:22 +00:00
TreeHugger Robot
d9db15cd77 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: Ifa16e70b61a75252c8a5ba9f6fc25f7786be8349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 08:44:14 +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
45603532b0 Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev am: 4dc79d92f0 am: 4d63cf51b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799703

Change-Id: I6942517ab8e6d6732f0cfd454f5ae98e034971e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 07:35:36 +00:00
Edgar Wang
4d63cf51b0 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: I0b82a1fc8f57cd969185f746e85b6b33469ddbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 07:12:08 +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
Kedar Chitnis
ba15580112 Merge "Guest mode UX flow updates to user settings" into tm-qpr-dev 2022-04-18 05:34:56 +00:00
TreeHugger Robot
35f7037272 Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45 am: eec3d74bba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657

Change-Id: I2a5fa158c213c3292ac073867bbb27f613b7d272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 04:56:47 +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
eec3d74bba 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: I7fed1181a83f6a6246bba3edb5e7be59d98f0263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 04:42:15 +00:00
TreeHugger Robot
edf39d0e45 Merge "Fix sub status of LocationSettings" into tm-dev 2022-04-18 04:20:09 +00:00
Hugh Chen
7fdda75184 Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev am: 3c354a2d38 am: e16da63b95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17774547

Change-Id: I2ec548308ce469e0c720a5288c343133b4cf8664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 02:26:50 +00:00
Hugh Chen
e16da63b95 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: I12c700ace3faca6c3688de630f9dedf787075f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 02:09: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
07ffd41883 Use en-dash in the time range instead of a hyphen for different format am: 91adbd3b16 am: 24707ec043 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782706

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

Change-Id: I88423fb9f773122310449b590942ddd0497a3982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-17 15:38:23 +00:00
ykhung
24707ec043 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: I4616826eb10441dd13c2eeec9c09262d86e23bcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-17 15:23:35 +00:00
ykhung
83a47bfa33 Format BatteryEntry and BatteryDiffEntry class am: b593e00af0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705

Change-Id: I1193e3e0638dab1b35865f8523cf08764fb0d58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-17 15:23:29 +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
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
a219fa179b Merge "Use the custom name in the battery attribution if it is unknown item" into tm-dev am: c4801433d9 am: 7511d1ed16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730656

Change-Id: I58362e6e9ac5a07d582e9c43e7b10da116d02bae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 14:13:19 +00:00
YK Hung
7511d1ed16 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: I3b891f73ada7ec1e53d7e0fe1c7ade81cc23fe0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 13:30:12 +00:00