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

104564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
cba3a3003c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9be756fd4 -s ours am: a719bfa0b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I275b1f9f67500410bf3f52b5eb32a5008463eda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:46:29 +00:00
Bill Yi
6d3ad361d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: fa0b661076 -s ours am: c71203f16d -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: Ie2e87185cc108d4cc457d3090a38110e37c2a3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:46:21 +00:00
Peiyong Lin
aab9e76cf6 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0 am: fa6ecc7857 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

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

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

Change-Id: I892b308850183401f240d915e6dd41f509bff424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:57 +00:00
Bill Yi
c71203f16d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: fa0b661076 -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: Ie1afc461ae8f3561b19c88807d093bb7911ff557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:51 +00:00
Peiyong Lin
fa6ecc7857 Merge "Clean up extra app info." into tm-dev am: bd26c3c747 am: fceaaa80a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17757962

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

Change-Id: Ifdfea8109bde0cf137f0fdbfa1aac200e438485f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:36 +00:00
Bill Yi
8b3b3c9ae4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d5de2ec5ae am: fb20f3183b -s ours am: e46d450ee6 -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: I01ca3f5f120a61bcea210e0c0da86d936960132e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:35 +00:00
Bill Yi
10f7d518e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fc86f72e65 -s ours am: 6c46c20518 -s ours am: b5d0a278e4 -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: Ib6041642f5d398c3057a7520e3bfd275ec29c547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-18 18:44:27 +00:00
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
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
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
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
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
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
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
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
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
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
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