PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,087 Commits 1 Branch 0 Tags
44f0fd557afa94115bd2393d7627844e2b51a9e8
Commit Graph

92087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
9f06b36b3b Merge "Network selection add NGRAN when device support SA" into sc-dev am: a73d199d5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15210394

Change-Id: I1dfb9507da126f8e25ba12535581d40801837d89
 2021-07-08 08:30:06 +00:00
SongFerng Wang
a73d199d5e Merge "Network selection add NGRAN when device support SA" into sc-dev 2021-07-08 08:17:19 +00:00
Edgar Wang
528228a562 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: cecc33b5c4 am: 11c88ae8de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: Iaaf134e5ff5e22bbba076882783346ea9aa8f3f4
 2021-07-08 07:28:41 +00:00
Edgar Wang
dbab280db4 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: 7458b770f9 am: 40820d2ffe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: Ia5b168b0a19a11269841804139257ed536babee6
 2021-07-08 07:28:04 +00:00
Edgar Wang
11c88ae8de Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: cecc33b5c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I61b2fc5584185a3a0717061355344b647b51b50b
 2021-07-08 07:14:41 +00:00
Edgar Wang
40820d2ffe Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: 7458b770f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I85f81794536854f29613b5d42922b5297c34ec01
 2021-07-08 07:14:33 +00:00
Edgar Wang
4db6c2142f Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 am: 4ecc3f433d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I6811347b998cf658d6f0742f9ea017aaa2c4f60d
 2021-07-08 07:13:48 +00:00
Edgar Wang
7458b770f9 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: I10796c5a289712c8b34a0332ae04d078d1d5e562
 2021-07-08 07:01:01 +00:00
Edgar Wang
cecc33b5c4 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: Iaca806e315ebbd6a7e37daca444ee368b2e79e16
 2021-07-08 07:00:43 +00:00
Edgar Wang
4ecc3f433d Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev am: 723ab59bc0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15219951

Change-Id: Idee77d5fc6c6e174abc32a9ac40e10a71a3bacae
 2021-07-08 07:00:19 +00:00
Edgar Wang
723ab59bc0 Merge "Adjust Seekbar layout to improve scroll ability" into sc-dev 2021-07-08 05:58:30 +00:00
Menghan Li
1212876462 Merge "Provides TC ID for accessibility framework feature for "shortcut" part" into sc-v2-dev am: 2ceb52ea6b am: 2b9a74170f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186114

Change-Id: I6860285c7ba6b49be042ae4bd9984c5ca8eb977c
 2021-07-08 05:40:17 +00:00
Menghan Li
2b9a74170f Merge "Provides TC ID for accessibility framework feature for "shortcut" part" into sc-v2-dev am: 2ceb52ea6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15186114

Change-Id: I2ed1e81347c404b77d8325337396fd6e4d22e170
 2021-07-08 05:28:06 +00:00
Menghan Li
2ceb52ea6b Merge "Provides TC ID for accessibility framework feature for "shortcut" part" into sc-v2-dev 2021-07-08 05:15:27 +00:00
YUKAI HUNG
057fb0f496 Merge "Add new method to get URI to monitor battery history data is updated" into sc-v2-dev am: ff823c65d5 am: 7c1696899b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15218952

Change-Id: I7610e5df1b11750f911c7f9277583d09095f7646
 2021-07-08 03:47:42 +00:00
YUKAI HUNG
7c1696899b Merge "Add new method to get URI to monitor battery history data is updated" into sc-v2-dev am: ff823c65d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15218952

Change-Id: Ib8e91b84726f607d16e1b8dc144d853bf906ecf6
 2021-07-08 03:28:08 +00:00
YUKAI HUNG
ff823c65d5 Merge "Add new method to get URI to monitor battery history data is updated" into sc-v2-dev 2021-07-08 03:15:18 +00:00
Bonian Chen
fcfb4b53ed [Settings] Correct some typo 
Bug: 193026761
Test: build pass
Change-Id: Ic710c84e5aca093381c5e06d4f6e987cf6f729a7
(cherry picked from commit 4c2dfa26e3)
 2021-07-08 01:43:29 +00:00
Bonian Chen
11b2370322 Merge "[Settings] Correct some typo" 2021-07-08 01:43:01 +00:00
Automerger Merge Worker
a4af82718c Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours" into sc-v2-dev-plus-aosp am: 70b22b2b94 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9f03033a230035446845b895597ca1871b29ec47
 2021-07-07 18:15:44 +00:00
TreeHugger Robot
315aa32e38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 20cab601c9 -s ours am: 44b8d2022e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e037030a810bbe76340765dca2068239de1816f
 2021-07-07 18:14:52 +00:00
Automerger Merge Worker
70b22b2b94 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours" into sc-v2-dev-plus-aosp 2021-07-07 17:56:46 +00:00
TreeHugger Robot
f2b4dbf29e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 798d6c5df4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I662fd17708384107c65a2402f9ad0c65c5ac10c6
 2021-07-07 17:56:42 +00:00
TreeHugger Robot
44b8d2022e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 20cab601c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I95d430d8b1cdc25672374cebc59b889d6b5f8fbe
 2021-07-07 17:56:40 +00:00
TreeHugger Robot
55067965c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours am: 44ae675db1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3cd265dfd9028794397b190468dad91f131c98ec
 2021-07-07 17:51:39 +00:00
TreeHugger Robot
20cab601c9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9d29403c7efa123b5040bd7e83565463eee25b9
 2021-07-07 17:38:03 +00:00
TreeHugger Robot
798d6c5df4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51f5acdf164503eb543183299dc235e26a9e5c8e
 2021-07-07 17:36:56 +00:00
TreeHugger Robot
44ae675db1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b65883e22f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2df4befebd851e5c14d24c1b9f0d00a684555671
 2021-07-07 17:36:47 +00:00
Guojing Yuan
d91fc88b4b Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: fbce4ec0e8 am: 0cf54d33f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I65cdc4cd5adf80b412c1f07a345b366c85709496
 2021-07-07 17:27:29 +00:00
TreeHugger Robot
b65883e22f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-07 17:25:11 +00:00
Guojing Yuan
0cf54d33f2 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: fbce4ec0e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Id7b35be4f8a8713afa551723302fb35a097bebf9
 2021-07-07 17:24:05 +00:00
Guojing Yuan
93f5e31873 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e4b60e48de am: 785acda6d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I74a48f7f1e2a890cb7aff9681ab9cef860e1c0ea
 2021-07-07 17:23:56 +00:00
Guojing Yuan
785acda6d8 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e4b60e48de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I966d7f664c72a5ce5234bcf7426afe38fa3d7795
 2021-07-07 17:15:08 +00:00
Guojing Yuan
c042096214 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f am: e28bdeaf85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I16e0f9566e32a4b3e6e42e92ca66ad7b98fa142d
 2021-07-07 17:14:17 +00:00
Guojing Yuan
fbce4ec0e8 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Ic31e9b879e36f0a84c0b735015f8dd93207549ff
 2021-07-07 17:01:30 +00:00
Guojing Yuan
e28bdeaf85 Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: I5881acc04a189a0fe2de7dcf2532a706fa0966b2
 2021-07-07 17:00:45 +00:00
Guojing Yuan
e4b60e48de Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev am: 40dc9d519f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15191229

Change-Id: Ia1d8ab6f0fd5e71545bccb67985a9186adb29ef0
 2021-07-07 17:00:39 +00:00
Guojing Yuan
40dc9d519f Merge "[CDM] Remove CDM companion apps from Connected Devices detail Settings" into sc-dev 2021-07-07 16:50:01 +00:00
ykhung
70304cff07 Add new method to get URI to monitor battery history data is updated 
we will reload the database battery history data if its content is changed, which can be done through monitored the database content observer (a part of this patch cl/383366685)

Bug: 192613268
Test: make SettingsRoboTests
Change-Id: I24ab154b1dfa00ca4bf4e6f7b308f5061578bcb5
 2021-07-07 16:22:37 +00:00
Bonian Chen
4c2dfa26e3 [Settings] Correct some typo 
Bug: 193026761
Test: build pass
Change-Id: Ic710c84e5aca093381c5e06d4f6e987cf6f729a7
 2021-07-07 23:44:04 +08:00
Bill Yi
a9f95702cd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f1183b81613d68b64ae7069a571150a634ceead
 2021-07-07 15:24:28 +00:00
Marie Matheson
d488fa4147 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 7ec590a5a1 am: 1d0ed65b74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I183ecf26980465d263a03057dbeca14c29168798
 2021-07-07 12:14:36 +00:00
Marie Matheson
9527cc88e4 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 5023e5613b am: 701bd282da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I5a94388fe863fa2558ff3af3fc71f4dcbd8e78d6
 2021-07-07 12:14:23 +00:00
Marie Matheson
1d0ed65b74 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 7ec590a5a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I3be513c16a88c1cdfaa596f9963bdbcabac27f92
 2021-07-07 11:57:09 +00:00
Marie Matheson
701bd282da Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 5023e5613b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: Ie1750933714536ce74a3ad79ed4c40e6268d6650
 2021-07-07 11:56:45 +00:00
Marie Matheson
6d2b782514 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e am: 8b8ddb89e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: Ic3abb93f3e2bdce1bb04dcb806b49c3233c07665
 2021-07-07 11:55:55 +00:00
Marie Matheson
5023e5613b Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: If2147c505c13263f6799d250d70cc437ff0a1c95
 2021-07-07 11:40:14 +00:00
Marie Matheson
8b8ddb89e6 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: Ibb671b4ef501681f80aa9fafee7b02716b269179
 2021-07-07 11:39:21 +00:00
Marie Matheson
7ec590a5a1 Merge "Move work profile security settings to bottom of list" into sc-dev am: 67c5c5a58e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15216010

Change-Id: I2a5163c23c36b1a6804e3953f505d6f86c0fb5ac
 2021-07-07 11:39:18 +00:00
Marie Matheson
67c5c5a58e Merge "Move work profile security settings to bottom of list" into sc-dev 2021-07-07 11:29:22 +00:00