PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,819 Commits 1 Branch 0 Tags
e7ebddb87d937d8d24f2321c41230e8ab87f3721
Commit Graph

87819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ykhung
0ab0a3af56 Refactor BatteryOptimizeUtils from enum to @IntDef 
Based on the Android API Council guideline, we should avoid using the
Enum structure to define the constant definition.
go/android-api-guidelines#avoid-enum

Bug: 197595292
Test: make SettingsRoboTests
Change-Id: I4b22f0abde7f4ce2c3a0b076db786e619783d93e
Merged-In: I4b22f0abde7f4ce2c3a0b076db786e619783d93e
 2021-08-24 12:04:31 +00:00
TreeHugger Robot
bdbe97f958 Merge "Import the window extension libary in the Settings app" into sc-v2-dev am: a1b8347ae4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15595088

Change-Id: I4064c73828fa62f5f895111a38ee143f6d9a27df
 2021-08-24 05:26:51 +00:00
TreeHugger Robot
a1b8347ae4 Merge "Import the window extension libary in the Settings app" into sc-v2-dev 2021-08-24 05:19:07 +00:00
Tsung-Mao Fang
c6e44c0e89 Import the window extension libary in the Settings app 
Test: Rebuilt apk and run apk successfully.
Fix: 196939216
Change-Id: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
Merged-In: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
 2021-08-24 12:01:35 +08:00
Zoey Chen
5c8a325f23 [automerger skipped] Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea am: 3d7b3abff5 -s ours 
am skip reason: Merged-In Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7 with SHA-1 3043c87f98 is already in history

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

Change-Id: I2ee0110135bc002a5521a560fb2f8d26c50a8811
 2021-08-24 03:17:19 +00:00
changbetty
77c8a960a0 [automerger skipped] Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95 am: 15cf976b48 -s ours 
am skip reason: Merged-In I1acdfb09393163bb94824fe2b3bad0391ba4fb53 with SHA-1 6871807a95 is already in history

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

Change-Id: I92ef1f758bfe8a97acc0a396a0d85858c1879cd2
 2021-08-24 03:17:17 +00:00
Zoey Chen
b4ebc1c059 Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea am: 5d3e33badf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202

Change-Id: I9fd80cfe34f34ba99e35e3c6c5d1da411caf2668
 2021-08-24 03:16:57 +00:00
changbetty
95f566beed Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95 am: 17f06cc0ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496

Change-Id: I622330aa4b5448d6f3165a388ca6a7cee1c2ca1b
 2021-08-24 03:16:56 +00:00
Zoey Chen
5d3e33badf Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202

Change-Id: I9a75c6a772c6033ce5d949eddccd66bf7cf9dacd
 2021-08-24 03:01:16 +00:00
Zoey Chen
3d7b3abff5 Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev am: 8c5611a7ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15582202

Change-Id: I3ccb6d5f0a4131707cc1fa9f53da93eb78c28e8f
 2021-08-24 03:01:16 +00:00
changbetty
15cf976b48 Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496

Change-Id: I9abdd46b7af650435bf07a0487d45468e0ded874
 2021-08-24 03:01:15 +00:00
changbetty
17f06cc0ed Set the attribute of the dialog window for overlay QS internet panel am: 6871807a95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580496

Change-Id: I49b6bd849d70f57ab3699b771cca36309e935c75
 2021-08-24 03:01:15 +00:00
Zoey Chen
8c5611a7ea Merge changes Ia8ce6cfa,I1acdfb09 into sc-qpr1-dev 
* changes:
  Remove some attributes to move the dialog window up
  Set the attribute of the dialog window for overlay QS internet panel
 2021-08-24 02:47:23 +00:00
TreeHugger Robot
4af312f397 Merge "Update Memory progressbar style in Developer options" into sc-v2-dev am: 2919585538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605517

Change-Id: Ice9b8dcd8c0499752b38358ec5f8705718338483
 2021-08-23 18:22:21 +00:00
TreeHugger Robot
2919585538 Merge "Update Memory progressbar style in Developer options" into sc-v2-dev 2021-08-23 18:00:58 +00:00
TreeHugger Robot
c4cc6c4b20 [automerger skipped] Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4 am: a980758c5c -s ours 
am skip reason: Merged-In I4314802840a4952acf7f090d81ca19ec28b793b2 with SHA-1 f982f286a2 is already in history

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

Change-Id: Ie4b7af4386190e4506d123d7f6457c2bfa3ac944
 2021-08-23 17:54:39 +00:00
TreeHugger Robot
7ea24a57b3 [automerger skipped] Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0 am: 289bdbe53a -s ours 
am skip reason: Merged-In I022253efbe0ea25f11d5ac6c2b3b0fcd1d9f54aa with SHA-1 95bcd7cb23 is already in history

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

Change-Id: I28851130a68e4bd4a2bbff6881769bf1c205ebf0
 2021-08-23 17:54:34 +00:00
TreeHugger Robot
bb0cd8b022 Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4 am: e1a95327ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132

Change-Id: I77bf0ed763930b139f6d9ee329421b7a306d154f
 2021-08-23 17:54:17 +00:00
TreeHugger Robot
127550a3cf Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0 am: 9436706f92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135

Change-Id: I148ce6409006fd2a4eb7f1489ff81d322071bc66
 2021-08-23 17:54:08 +00:00
TreeHugger Robot
a980758c5c Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132

Change-Id: I046e1e97d1f195147c65b7676326afd5e1121fb0
 2021-08-23 17:43:14 +00:00
TreeHugger Robot
289bdbe53a Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135

Change-Id: I5e5a9a901e0da15da23e1bd5137a84a3ffa0a331
 2021-08-23 17:42:56 +00:00
TreeHugger Robot
e1a95327ea Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev am: 8e98df31a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542132

Change-Id: I96c1c2cf4ae52d9fad6c0cdf7d4d20cba013e700
 2021-08-23 17:42:50 +00:00
TreeHugger Robot
9436706f92 Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev am: 0fa8c951e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542135

Change-Id: Ib777e0648e8b8ca63eb9ac7ca11b34f3ae3408fd
 2021-08-23 17:42:33 +00:00
TreeHugger Robot
8e98df31a4 Merge "[Povider Model] Fix string in SIMs" into sc-qpr1-dev 2021-08-23 17:28:43 +00:00
TreeHugger Robot
0fa8c951e0 Merge "[Settings] Fix RTL issue of Calls and SMS" into sc-qpr1-dev 2021-08-23 17:24:38 +00:00
TreeHugger Robot
083d5cc2ff [automerger skipped] Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: f88ab5986b -s ours 
am skip reason: Merged-In I506ee81985158b8992529440a31d2d5cfe81f441 with SHA-1 fb29dc8a51 is already in history

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

Change-Id: Ic438d4c1b11114640dc76df6e25f66143f71340c
 2021-08-23 16:43:14 +00:00
TreeHugger Robot
9fbd0387b7 [automerger skipped] Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: a327c5bad7 -s ours 
am skip reason: Merged-In I488327a01f5e539ecbe315b7016f65084dfd59a1 with SHA-1 c7c7a813fb is already in history

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

Change-Id: Ie10ebbcc2b2626847b0c295c579044421ec089d3
 2021-08-23 16:43:10 +00:00
TreeHugger Robot
c15f3731c9 Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 am: a0c8d6d6aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: I159426b4f45334e39843a900a7d812db7ea988e1
 2021-08-23 16:42:55 +00:00
TreeHugger Robot
789d19af4c Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd am: 0050cbc711 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527

Change-Id: I45ccbbd89109ec984d21ec552105d8975d03538e
 2021-08-23 16:42:45 +00:00
TreeHugger Robot
f88ab5986b Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: If6e011d144dfaa3c9c337538aaea04d5482de2dd
 2021-08-23 16:28:51 +00:00
TreeHugger Robot
a0c8d6d6aa Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: Id846fe391823dbfbb8dae0ea40c369d6bb8c92c8
 2021-08-23 16:28:07 +00:00
TreeHugger Robot
a327c5bad7 Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527

Change-Id: If32d2dcc40d134c20560aa43da7c276afc9520a9
 2021-08-23 16:28:07 +00:00
TreeHugger Robot
0050cbc711 Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527

Change-Id: I669f6f8e4c6501d6bd59e96369e5b9dd8ab6f6e0
 2021-08-23 16:27:52 +00:00
Jack Yu
d2ca4038ce Support multi-users for NFC payments 
Configure nfc payment settings based on different users.

Bug: 191851086
Bug: 191845397
Bug: 192994529
Test: nfc payment with 2nd user
      make RunSettingsRoboTests
      ROBOTEST_FILTER=DefaultPaymentSettingsPreferenceControllerTest
Change-Id: I52440e77b6b5837b978b381e1c1694d2b29f048e
 2021-08-23 16:18:08 +00:00
TreeHugger Robot
fae29c6b33 Merge "Fix Settings crash issue" into sc-qpr1-dev 2021-08-23 16:12:13 +00:00
TreeHugger Robot
eef01580fd Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev 2021-08-23 16:11:50 +00:00
TreeHugger Robot
0249ae9582 Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev am: c63c0d4370 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635264

Change-Id: I37bb45745519e35fff18f8d2e7668a5e5d4aa182
 2021-08-23 05:45:32 +00:00
TreeHugger Robot
c63c0d4370 Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev 2021-08-23 05:33:00 +00:00
Automerger Merge Worker
54e1722352 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp am: 21893b0972 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idc0f038e3fc2cdaed9115191f8320995be7700cf
 2021-08-23 04:59:38 +00:00
Bill Yi
34cb659f7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: e8eeb4a1ec -s ours am: 07249babd3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85d7a92415862194e9aa5920241326ed95fb9641
 2021-08-23 04:59:21 +00:00
Automerger Merge Worker
f894aafdaf Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp am: d084b97e00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I9a9559de212682587b0c2cfead275649674e600b
 2021-08-23 04:58:52 +00:00
Bill Yi
6fe86554e2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: 89adb1b207 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id4d16013ce3b99e07aa4209516d3baeda6fa953b
 2021-08-23 04:58:51 +00:00
Bill Yi
a25aeb69f4 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp am: a536531bd9 am: 3d504a87f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: Ibfc44b107ba264cb14497f96b5b986ef039031e3
 2021-08-23 04:58:29 +00:00
Bill Yi
64fe24ebc2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0af7a53e0a -s ours am: 22b2889345 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cb1f74574a87c71ac1c28ebd0ae26e2f9df2b08
 2021-08-23 04:58:27 +00:00
Bill Yi
31506a0c66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours am: b5074981a1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie68c733550db98226b62bbf1c8cbf9cc17facf6b
 2021-08-23 04:57:29 +00:00
Bill Yi
360df88c4b Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3 am: 0be19629e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I2f6233e6507fe9c568e11eca144ebbbba0af2cd2
 2021-08-23 04:57:14 +00:00
Bill Yi
db7d449225 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: b06fcc8fb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie64f700de06257f243b64b79a64259c81f76ea1b
 2021-08-23 04:57:12 +00:00
Bill Yi
b5074981a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6cf59ad347789416e5b96e51e2170203da21a84
 2021-08-23 04:38:52 +00:00
Automerger Merge Worker
21893b0972 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-23 04:38:50 +00:00
Bill Yi
e943d5a0a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6374278799610f2626a00d6fe3db434b8ade4524
 2021-08-23 04:38:48 +00:00