PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,624 Commits 1 Branch 0 Tags
bed3d381abb7400ff72f8c0849a04cc3db70e85b
Commit Graph

84624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
bed3d381ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours am: cec1d12392 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I579384f64ab19ad324795652e9ad87221631ff3f
 2021-08-28 08:52:58 +00:00
Bill Yi
a61ce89164 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 9b3d8a4629 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic474f6b33acb159f66cdd9d9b2ccee6b504793b1
 2021-08-28 08:52:46 +00:00
Bill Yi
9c4c7980a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 2d8f65e4f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81d7badc620c81a527277b2dfd81cd9a8261d692
 2021-08-28 08:52:31 +00:00
Bill Yi
9b3d8a4629 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d46d4c15e98ede68881bc469ff81d684f3f9205
 2021-08-28 08:37:45 +00:00
Bill Yi
cec1d12392 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifea8261408bf561c44bb36363f8f353b14a870a1
 2021-08-28 08:37:44 +00:00
Bill Yi
2d8f65e4f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I153e392027e665de2af74b3ed332c31e52150a6a
 2021-08-28 08:36:34 +00:00
Bill Yi
3ff9a07c89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If94cc75281d2f0c4876fee80a9673a4da160bd34
 2021-08-28 08:22:40 +00:00
TreeHugger Robot
c11ebc1965 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3575b70b77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I72fa381ace8bbd65b4a49b0d23fd4e0956d23c91
 2021-08-28 08:18:55 +00:00
TreeHugger Robot
db00136fc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 74b4a3c8fb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9260571f24340d07d1e0299aef7ba11739af50fe
 2021-08-28 08:18:41 +00:00
Bill Yi
118a531c2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I474ea1b8a7f6c15b4cd15b46c36202b45b3803ab
 2021-08-28 08:18:16 +00:00
TreeHugger Robot
3575b70b77 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:02:29 +00:00
TreeHugger Robot
74b4a3c8fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:01:49 +00:00
Bill Yi
4f31189088 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5227d933dcb559cb1be8bb5a0bbcce612b0da2a4
 2021-08-27 22:34:10 +00:00
Bill Yi
e3d99cf9c6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I148b65f26df0f4c99f650bad6beef65918ae4870
 2021-08-27 22:20:59 +00:00
Bill Yi
af04cc6ba7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a77348c77e612c03205df8f99434e19242984a1
 2021-08-27 22:14:52 +00:00
Bill Yi
be9d9c91bd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f04d37f7882ae5e9f83a319f940d846c552f820
 2021-08-27 22:00:01 +00:00
Victor Liu
da15cbb50e Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676888

Change-Id: If9a8aba1e56a75422b0c2a453673d0cd873d4aa1
 2021-08-27 02:14:01 +00:00
Victor Liu
1d35b1cd1b Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15676887

Change-Id: Iee67208eb135484aca10ae7c17894713795d1544
 2021-08-27 02:13:58 +00:00
Victor Liu
029b6397a8 Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev 2021-08-27 01:57:14 +00:00
Victor Liu
989edd731d Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev 2021-08-27 01:57:14 +00:00
Android Build Prod User
0b8ff007b7 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15516309

Change-Id: Ie0d087c70691e9363126c096625e9ee4aab44a63
 2021-08-26 21:59:26 +00:00
Android Build Prod User
ca8e67d144 Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15596897

Change-Id: I3d91b11afeb397e7bddea0b82d0cfe4d2faafece
 2021-08-26 21:59:11 +00:00
Android Build Prod User
33af17ff31 Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev 2021-08-26 21:42:36 +00:00
Android Build Prod User
71327943dc Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev 2021-08-26 21:42:27 +00:00
Joy Babafemi
63976c2051 Revert "Revert "UWB: Re-enable UWB toggle"" 
This reverts commit 2e593b3784.

Reason for revert: Root cause b/196317865 fixed

Bug: 197519749
Change-Id: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
Merged-In: Ib0fee46471c7f110b265faedc62a3f66610bf7c2
 2021-08-26 20:27:23 +00:00
Joy Babafemi
14aee30625 Initialize UwbManager only if supported on device. 
Test: Manual
Bug: 197519749
Change-Id: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
Merged-In: I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d
 2021-08-26 20:26:11 +00:00
Betty Chang
7e7b237092 Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15671537

Change-Id: I4bc6a5d4d5eeccaf23d4c7da0314ebdfaf4965e4
 2021-08-26 02:06:50 +00:00
Betty Chang
6a3b697141 Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev 2021-08-26 01:50:56 +00:00
Zoey Chen
e964d73673 Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580670

Change-Id: I8eb97e03575fb7b1d69aac24fecc22bc100cca50
 2021-08-25 06:19:18 +00:00
Zoey Chen
2a87acf247 Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev 2021-08-25 06:04:30 +00:00
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
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