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

85578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zoey Chen
5c49db8d8b Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev am: 538af552c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15544646

Change-Id: Iaae85f03949e22b76390956de127513c2b806863
 2021-08-25 04:54:20 +00:00
Zoey Chen
538af552c0 Merge "[Provider Model] Redirect Settings Internet panel request to SystemUI." into sc-qpr1-dev 2021-08-25 04:29:12 +00:00
changbetty
b1b2da9aca Change the Network preference summary for wifi option 
Bug:192987269
Test: Manual test
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
Merged-In: I3892386f8fe2e5c3e29cd7e91f88db65c3693990
 2021-08-25 02:55:38 +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
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
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
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
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
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
Bill Yi
07249babd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: e8eeb4a1ec -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: Ib8154aa2eb17d7fa41b71a9d5a1d6a34c842d0bb
 2021-08-23 04:38:46 +00:00
Automerger Merge Worker
d084b97e00 Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp 
* changes:
  Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours
 2021-08-23 04:38:11 +00:00
Bill Yi
3d504a87f6 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp am: a536531bd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

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

Change-Id: I8723dc14c877e14d0ec1252bff2e57e67ccc8b46
 2021-08-23 04:38:09 +00:00
Bill Yi
22b2889345 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0af7a53e0a -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: I40eed7a068e8eab4f1afdc6a258541d3896c8f61
 2021-08-23 04:38:08 +00:00
Bill Yi
89adb1b207 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -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: I05af183d8c7ea560a95a35a95d08e5a1a8e0cf54
 2021-08-23 04:38:08 +00:00
Bill Yi
1a5b010e20 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -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: If8b78b2722decc2a182fbded4f594db881eaf9ee
 2021-08-23 04:38:06 +00:00
Bill Yi
e8eeb4a1ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -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: Ie84b2cd119dc71eea967c30a3c522aaf86f3ddb2
 2021-08-23 04:37:03 +00:00
Bill Yi
46902bd366 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-23 04:21:54 +00:00
Bill Yi
a536531bd9 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-23 04:21:54 +00:00
Bill Yi
38f55441d3 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-23 04:21:54 +00:00
Bill Yi
ac54544c91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours am: 3ed7097ead -s ours am: a09970a7c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I170f5b1ce0c25079b8f405bbe297a8f93a7429c6
 2021-08-22 18:33:20 +00:00
Bill Yi
1b5eff63fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours am: 7643d374b5 -s ours am: c4934a29a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifbe1ff8d2d75aa39b46e505cce5c68c5c7b05c35
 2021-08-22 18:33:01 +00:00
Bill Yi
f51eb39d65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours am: 3ed7097ead -s ours am: 75efc0cd4b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifea626a170c56f11c32e5e84de3956d2c3c355e0
 2021-08-22 18:26:58 +00:00
Bill Yi
63aecef661 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours am: 7643d374b5 -s ours am: d66da997ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I78d1728d3d22007702de625ec1d6b773139afe68
 2021-08-22 18:26:41 +00:00
Bill Yi
a09970a7c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours am: 3ed7097ead -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75a2d2ff05cb9fd3c74bd16aa06a0893dcf7dd2a
 2021-08-22 18:18:05 +00:00
Bill Yi
c4934a29a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours am: 7643d374b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e63f46f668fab0c59ad240d952d0dc2d63fe09c
 2021-08-22 18:17:53 +00:00
Bill Yi
75efc0cd4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours am: 3ed7097ead -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib34afcfdd9953968c0e2b13cf454e3e9173c2b18
 2021-08-22 18:17:18 +00:00
Bill Yi
d66da997ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours am: 7643d374b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60c3c3b85e60b3afeb4a8767852c5f3fc745880e
 2021-08-22 18:16:59 +00:00
Bill Yi
3ed7097ead [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccc05891ae6764d10ebfef8e47ac43ffa07956ac
 2021-08-22 18:07:39 +00:00
Bill Yi
7643d374b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic0611b0fd5f645d0c69ee539ebc746fddd4d59be
 2021-08-22 18:02:27 +00:00
TreeHugger Robot
7d5abfaa04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52fcb21da4f94243efbe577308f08eb5474fdbd3
 2021-08-22 18:02:21 +00:00
TreeHugger Robot
2bd8661d40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-22 17:45:19 +00:00
Bill Yi
0f61194307 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3ea6d77ccace207249eef5d86fc331f22db54dac
 2021-08-21 10:49:31 +00:00
Bill Yi
0af7a53e0a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b 
Blank merge reason: commit message contains skip directive

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

Change-Id: Idd26c421684f3173fd30b8b0cef50812cf918165
 2021-08-21 10:46:13 +00:00
Bill Yi
0f5c1fd924 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b 
Blank merge reason: commit message contains skip directive

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

Change-Id: I0498edec2d10fdf5864be81d71cf0e23c109717b
 2021-08-21 10:46:13 +00:00
Bill Yi
93eb76377b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4c088fc157f34994615725c8c2e9815e174a6508
 2021-08-21 10:45:59 +00:00
Bill Yi
70b0c311a5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I53bc4eea899bfa40183a478e99878438c78f2d7b
 2021-08-21 10:31:37 +00:00
Bill Yi
b762f335e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieab1a39a1764ced3fe6dce11e5e8f9aa2b12498b
 2021-08-21 10:17:34 +00:00
Joe Bolinger
f78cec292c Remove sliceable attribute from biometric preference controllers. 
This removes the top-level UI switch on some of the boolean preference settings.

Bug: 193438173
Test: atest com.android.settings.biometrics
Change-Id: If1cd2cb9ae456021fcdf0efc5002db4a083b9689
 2021-08-20 18:42:50 +00:00
Govinda Wasserman
26f121b673 Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673

Change-Id: Ib92603ae0210aaa025f722d0d734b11e6030386c
 2021-08-20 17:31:29 +00:00
Govinda Wasserman
8351a9a504 Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev 2021-08-20 17:15:31 +00:00
Govinda Wasserman
3869aac6d3 Revert "Revert "Add sensitivity configuration to long press power dialog"" 
This reverts commit c4084d4141.

Reason for revert: Dependant change has now successfully been propagated to sc-v2-dev child graphs

Change-Id: I1f6126a423c72540d219b99e20b464b51ef65923
 2021-08-20 17:06:40 +00:00