Zoey Chen
9e1720d5c9
[automerger skipped] Merge "Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-qpr1-dev am: 2a87acf247
-s ours
...
am skip reason: Merged-In Id2fd8c9b3b113ffbb49168305b05c67392fa4d87 with SHA-1 29f4a35dea
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15580670
Change-Id: I299e82f613ee4af87b01a68c6e78492bba2c38f2
2021-08-26 11:07:28 +00:00
Zoey Chen
8df2fccba8
Merge "[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings" into sc-v2-dev
2021-08-26 10:58:40 +00:00
Weng Su
29f4a35dea
[RESTRICT AUTOMERGE] Add new ACTION_WIFI_DETAILS_SETTINGS to Settings
...
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.
- Rename WifiNetworkDetailsFragment.class
Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
SettingsUnitTests:com.android.settings.network
Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80
)
2021-08-26 04:24:39 +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
ykhung
a90496e92e
[B&R] ignore backup system app or default app optimization modes
...
Avoid backup system app or default app optimization modes, since all of
them are using the MODE_UNRESTRICTED in default, and the system or
default apps may be different in the different devices.
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I0862ee31fcfa3bece15c2d4fdef5b0ea70235967
2021-08-25 15:01:52 +00:00
Zoey Chen
8b3bb01ca8
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: I57e5c0f9abf213026d67cdfed8acfccff46084a8
2021-08-25 14:20:17 +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
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
ykhung
935a9321b5
[B&R] notify BackupManager when app optimization mode is changed
...
Invoke BackupManager.dataChanged() when app optimization mode is changed
to notify BackupManager to execute Settings agent to backup data in the
next backup session, when performing the partial backup event.
Bug: 192523697
Bug: 197608038
Bug: 194633034
Test: make SettingsRoboTests
Change-Id: I456acc2594d22503763e4ce286435148ae0644a4
2021-08-25 02:21:16 +00:00
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
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
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
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
2919585538
Merge "Update Memory progressbar style in Developer options" into sc-v2-dev
2021-08-23 18:00:58 +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
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
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
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
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
c63c0d4370
Merge "[B&R] backup the battery optimization mode for installed apps" into sc-v2-dev
2021-08-23 05:33:00 +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
Bill Yi
0be19629e3
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: I96b6102d076f0158306830c3990c24037d84127b
2021-08-23 04:38:11 +00:00
Bill Yi
b06fcc8fb4
[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: I7a7ccaf8808bf6aae1cfd9750117e0588ea47486
2021-08-23 04:38:10 +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
ykhung
37ddf4bc3e
[B&R] backup the battery optimization mode for installed apps
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I4671e48a9d3b315362b451384db637d5cae36a4d
2021-08-23 12:32:07 +08:00
Bill Yi
46902bd366
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
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
7e20c76c5e
[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: I878bdc4a465b24c6757c64d5cdd9b9757a55fca7
2021-08-22 18:33:28 +00:00
Bill Yi
27583c0a16
[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: I3d317d20fc66adfb85a64cd03b897cfb40e59064
2021-08-22 18:33:00 +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
TreeHugger Robot
cea531d25f
[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: I82aa3df4489ad5f788a10cf1bfafbef3a986fae5
2021-08-22 18:08:15 +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
2bd8661d40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-22 17:45:19 +00:00
TreeHugger Robot
e8da5d2aed
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-22 17:45:11 +00:00
Bill Yi
1ef7828194
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie6d3fb138bd7d064ad0892b666cf9d22a7dab2c9
2021-08-21 10:53:24 +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
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
Menghan Li
f7db8d7ee4
Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev
2021-08-20 21:05:44 +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