PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,544 Commits 1 Branch 0 Tags
9709e05a664ff8545df3d5b9d7e5c22a538d0db5
Commit Graph

104544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peiyong Lin
9709e05a66 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: f71c92bbb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

Change-Id: Ib6e82ca9a61dd489737f7044bd09c37ddc436861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:20 +00:00
Yuri Lin
5efac57e33 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: d21ef57315 am: d6dc2708c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I4c4416803023ca2090e6eff9e0f069503fb99a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:43:40 +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
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
52b7e8ced6 Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5 am: 075dd07035 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955

Change-Id: I76b9cc331e0af9d874d241c6d2c1c97b7997a04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 17:23:40 +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
TreeHugger Robot
22df4a76e3 Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5 am: d9db15cd77 am: 2c1171000f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704

Change-Id: I20b9f6e4be4c19e03f0347194fd905d72b2abc2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 09:24:43 +00: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
71ec7bc229 Merge "Remove the legacy getReplacingActivity() method from feature provider" into tm-dev am: 708c2d2fd5 am: f821e55653 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799704

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

Change-Id: I468fc0e8196043e2a16398c00fa3e6cb1c0346ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 07:51:06 +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
be2c91fdfa Merge "Adjust the padding between profile tab and app filter spinner" into tm-dev am: 4dc79d92f0 am: 4b7ecd2a70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799703

Change-Id: Ie0190c5ceca8afcb26a9ebb5e0b5ce11a00ae495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 07:35:05 +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
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
Kedar Chitnis
90ff9da160 [automerger skipped] Merge "Guest mode UX flow updates to user settings" into tm-qpr-dev am: ba15580112 -s ours 
am skip reason: Merged-In I54583f9021171ae523ff40d4f63835f1cb486e35 with SHA-1 fa49a4f111 is already in history

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

Change-Id: Iea0a62b5aa0b2fb646ce1deb7a1f29546f68d1be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 06:05:25 +00:00
Kedar Chitnis
129b8d6100 [automerger skipped] Guest mode UX flow updates to user settings am: a1fbad7dd8 -s ours 
am skip reason: Merged-In I54583f9021171ae523ff40d4f63835f1cb486e35 with SHA-1 fa49a4f111 is already in history

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

Change-Id: Ibfd41684c2b06130a5490ee3a65281b7198ed494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 06:05:24 +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
840c78dca8 Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45 am: eec3d74bba am: 35f7037272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657

Change-Id: I74bb8a827dd9412c7a877185c9a81cae297ed54f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 05:10:11 +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
TreeHugger Robot
fcc6398b78 Merge "Fix sub status of LocationSettings" into tm-dev am: edf39d0e45 am: 4827d18f47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17730657

Change-Id: I85fe2faa11b976c18bc6868893a4ca77acbc08c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 04:56:13 +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
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
b2d0d629a6 Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev am: 3c354a2d38 am: e16da63b95 am: 7fdda75184 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17774547

Change-Id: I231bd418affdc42cc82f15acf9d5812f351a66d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 02:48:03 +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
1e98d3d49a Merge "Change "Previously connected devices" string to "Saved devices"" into tm-dev am: 3c354a2d38 am: c9c29e21f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17774547

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

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

Change-Id: I686ae1a29f0c0d1fe0220673f84498197ab33a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-17 15:56:23 +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
12a191a3b8 Use en-dash in the time range instead of a hyphen for different format am: 91adbd3b16 am: f76aeea8a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782706

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

Change-Id: I8b03fcb6cc727360f7a5f9c72852117a3a060439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-17 15:37:56 +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
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