PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,147 Commits 1 Branch 0 Tags
824f21616b70ffca9b3ce9a613f2902c5246fdbc
Commit Graph

85147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
a2e975064e Merge "PaymentDefaultDialog Could be Overlaid" into sc-dev 2021-09-30 18:51:47 +00:00
Bill Yi
2c7cd22dee Merge changes from topic "presubmit-am-a06c7bd415ae40e4af4a40c0d99cecd7" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:57 +00:00
Xin Li
dc818b7b1f [automerger skipped] Merge SP1A.210812.016 am: 8aa74d1ad4 -s ours 
am skip reason: Merged-In Ie9cea79f825b78495b1f93527f3fa980f9b975e3 with SHA-1 11655705db is already in history

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

Change-Id: I8efcd178648ac15b8a32e75f7481c5943af94af4
 2021-09-29 05:38:41 +00:00
Xin Li
8aa74d1ad4 Merge SP1A.210812.016 
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
 2021-09-28 19:39:58 +00:00
Xin Li
7a7b87716f DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: c41a577e37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15930864

Change-Id: I9ed0817f2ef9449e472476dfd5ed54b4e126bd5d
 2021-09-28 14:43:13 +00:00
Bill Yi
43b9cb669c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3769790fed 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iea597fedb4bf06eae6760f6d313bc8f7909f2077
 2021-09-28 09:01:34 +00:00
Bill Yi
3769790fed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5cf6feb89d6b5418866abcb32e14d00eaaae73ef
 2021-09-28 09:01:22 +00:00
Xin Li
c41a577e37 DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged 
Merged-In: Ibe8d1224361b31f6dfb782b5400d3ff6aad5e77f
Change-Id: I90b2538fb0737a35170b87864c776d94f575418f
 2021-09-28 07:55:18 +00:00
Bill Yi
7245d9f02a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b 
Blank merge reason: commit message contains skip directive

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

Change-Id: I8aef99f96568cb302d895a18e5a1806da044701f
 2021-09-26 04:35:06 +00:00
Bill Yi
92e5e1d54b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I116288a1e6ca78f8cd87f40b7a83de262b7b4449
 2021-09-26 04:34:53 +00:00
Bill Yi
b01a8ddd0f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b040c3b7f9c49990ca50381233325f96db54357
 2021-09-24 17:25:53 +00:00
Bill Yi
17eccfd048 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ac01c58e94e4bc8e8a03400112049bc06cf0c01
 2021-09-24 17:25:28 +00:00
Bill Yi
d43653e80d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:13:34 +00:00
Bill Yi
93e7956a7e Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 17:13:34 +00:00
Bill Yi
ffa2c65c22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 17:10:56 +00:00
Bill Yi
3d46803aee Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 17:10:56 +00:00
TreeHugger Robot
58a441f611 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours am: 85214e918e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2f43424484cec92cc2fb2fa481162bc3a3b6db8
 2021-09-24 17:00:54 +00:00
Bill Yi
7f395f18b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours am: 78abb83343 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0ff01146a726074ee24afd7c141df16750ec611f
 2021-09-24 17:00:07 +00:00
TreeHugger Robot
85214e918e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86e538594b008a280a542665306978afaba1e771
 2021-09-24 16:45:20 +00:00
Bill Yi
78abb83343 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37b3fc803bb1b033f24467dc54f43a8d7e1f4cb1
 2021-09-24 16:44:26 +00:00
TreeHugger Robot
416206347b Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-24 16:32:30 +00:00
Treehugger Robot
da36a07df1 Merge "[Settings] backport missing CL" am: a8ee80e95a am: 15c0678ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I687c80bc2f50b242151edffdb8ab97307d08b9d9
 2021-09-24 10:40:36 +00:00
Treehugger Robot
15c0678ca8 Merge "[Settings] backport missing CL" am: a8ee80e95a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1836333

Change-Id: I09f384d8d7073270d4bf460e91a52021a69e3e19
 2021-09-24 10:24:31 +00:00
Treehugger Robot
a8ee80e95a Merge "[Settings] backport missing CL" 2021-09-24 10:10:37 +00:00
Bonian Chen
dc3c1e8a4b [Settings] backport missing CL 
aosp/1258356 got missing when merging several CLs of refactor code in
aosp/1281915.

Bug: 186543910
Test: local
Change-Id: I34287b22fec4da660c7b44b5953eb16591cfb2d7
 2021-09-24 15:45:30 +08:00
Bill Yi
fab8681446 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163 
Blank merge reason: commit message contains skip directive

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

Change-Id: Idb4c5c7f1df3f9cf8ae49ec0aecea50d5e954187
 2021-09-23 18:05:42 +00:00
Bill Yi
2ac6a59163 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0697c6a68834ab937fd502189296b32de96d917c
 2021-09-23 18:05:26 +00:00
Bill Yi
2175bf57c6 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib8ed72738e0fcea0b63dc3e7ebb9d1f305e807f9
 2021-09-23 17:54:54 +00:00
Bill Yi
464f75c26f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7f6ce2ff37cea9e6f452bebb92b9cb78b844f3aa
 2021-09-23 17:54:22 +00:00
Bill Yi
20df40e783 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia87ff5a7993ad94c6b9e910380d5b758dfb6363e
 2021-09-23 17:49:59 +00:00
Bill Yi
6d56b2dce8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id60fd628884560576a270ab93f49a235cfc8b932
 2021-09-23 17:46:38 +00:00
vichang
b9bebd5bd9 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd am: e6bf1a83d8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: If94d8a65c9902180466481f157224a5389d9b117
 2021-09-21 11:06:23 +00:00
vichang
e6bf1a83d8 Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" am: 3166166bdd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1831314

Change-Id: I458bf767bbea8b5921f00afae884d309d270f7b0
 2021-09-21 10:52:53 +00:00
vichang
3166166bdd Merge "Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest" 2021-09-21 10:42:27 +00:00
Victor Chang
fc4589448b Replace @CorePlatformApi APIs usages in TimeZoneInfoPreferenceControllerTest 
The time zone transitions can be obtained via the public API
ZoneId.getRules() instead.

Bug: 119751170
Test: atest SettingsRoboTests
     com.android.settings.datetime.timezone.TimeZoneInfoPreferenceControllerTest passes
Change-Id: I2c7864580b2a36b725ee250253e97f6cc86d72a4
 2021-09-20 15:57:42 +01:00
TreeHugger Robot
3fa671bab4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours am: 8fc132c073 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadbd3da5a10bed29a0988acf9c64fbb54614b451
 2021-09-20 14:29:18 +00:00
Bill Yi
6280ce466c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours am: 977610714f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02500142f53249a3f17b775d14baca98c3c60a14
 2021-09-20 14:28:32 +00:00
TreeHugger Robot
8fc132c073 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 7a8b043da7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If21bd8380189f5615c8531bab311cbb7847742d7
 2021-09-20 14:16:53 +00:00
Bill Yi
977610714f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b93c3ea98 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc00c683438341c8024aa8050982745a71f32840
 2021-09-20 14:16:34 +00:00
TreeHugger Robot
7a8b043da7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-20 14:04:47 +00:00
Bill Yi
2cf7817de7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 66375d4530 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89cb67f37af3095da61f90fe665e6814bd592dfe
 2021-09-20 13:27:54 +00:00
Bill Yi
66375d4530 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-20 13:13:42 +00:00
Bill Yi
6bff29a287 Merge changes from topic "presubmit-am-f4a22fc756fd412c9bdad419f7d5a958" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-20 13:13:42 +00:00
Bill Yi
15c729b335 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 47ea4adaed 
Blank merge reason: commit message contains skip directive

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

Change-Id: I1e2d0d4f545ec2d4bf09ae29ecbd96baae53a432
 2021-09-18 17:21:27 +00:00
Bill Yi
47ea4adaed Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac26620cda40d2696577626befff4c5d811d35b7
 2021-09-18 17:21:13 +00:00
Bill Yi
6c50635319 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc5e2f9643 
Blank merge reason: commit message contains skip directive

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

Change-Id: If6b26166c7bc75f1879cd1cb5c34641732aa7a2e
 2021-09-18 17:10:55 +00:00
Bill Yi
cc5e2f9643 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1b3e386baf72d68cdbb895055f61ed1f54817389
 2021-09-18 17:10:42 +00:00
Bill Yi
7b93c3ea98 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaa16a73368d1b88512291d10b9c46abd127ab62e
 2021-09-18 17:06:21 +00:00
Bill Yi
57b68bafb9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I78923511c8cd2c48b25e2105d234d4b510b5fe6b
 2021-09-18 17:02:50 +00:00
Alisher Alikhodjaev
b2c03474c4 PaymentDefaultDialog Could be Overlaid 
Settings#PaymentDefaultDialog Could be Overlaid to Trick User into
Updating Default Payment App

Bug: 180104327
Test: build ok
Change-Id: Ia7786d05aae8e38a11bd73d02200640cb614e88a
 2021-09-13 17:00:30 -07:00