Jason Chiu
e623f69f29
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792
Change-Id: Iaa2d45ff44dbf212886085bcee4433b7e4402886
2020-06-18 11:23:49 +00:00
Jason Chiu
251b98492f
Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev
2020-06-18 11:06:42 +00:00
Jeffrey Carlyle
4e2071ae78
Add BatteryStatusFeatureProvider
...
This allows the battery header status line to be overridden.
Bug: 150239363
Test: implemented provider and changed status line text
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com >
Change-Id: I05bedbee641f087de5ee1b25a00724ce2de51f87
2020-06-18 01:50:36 -07:00
Jason Chiu
0625bb4815
Fix the overlapping problem of the burst of slice updates
...
Implement a throttle in SliceBackgroundWorker to control slice updates.
Test: robotest
Fixes: 152366832
Change-Id: I8b65d1b57973e036b932172627aca506f4fae3a4
2020-06-18 02:18:38 +08:00
TreeHugger Robot
dc841d4f80
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
am: f6afc2658f
am: 6a7a3b70b9
am: 00b3b49673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: I20f60a71a7c43dfd55cf91f096b6388a74c0b2f7
2020-06-17 12:53:17 +00:00
TreeHugger Robot
6a7a3b70b9
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
am: f6afc2658f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: I7a61c3d9e51062a3ed4779517573960c4fd1ee95
2020-06-17 12:27:07 +00:00
TreeHugger Robot
f6afc2658f
Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609
Change-Id: Id5ec044f6f29ecee29e9efad075eeeaa38d7fa10
2020-06-17 12:14:51 +00:00
TreeHugger Robot
16e1cd296a
Merge "Add new Always on display slice" into rvc-dev
2020-06-17 12:04:21 +00:00
Edgar Wang
e1186254d4
Add new Always on display slice
...
Currently we create Always on Display slice through
AmbientDisplayAlwaysOnPreferenceController. However, as the Always on
Display is merged into Idle lock screen, the conversion won't work
properly anymore when devices support the aware sensor.
Hence, we create another custom slice for this purpose.
Bug: 145920511
Test: manual & robotest
Change-Id: Ifd90e2de5219bd4e97aa13b5855fdab95ff6c4d0
2020-06-17 07:52:01 +00:00
Mark Chien
b727c6d9af
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
am: 9b626fce11
am: 56b98ca21e
am: 7248e67343
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: Ie8a8cd56a93b19313f87377bf5ba600e66cd6b4e
2020-06-17 07:02:13 +00:00
Mark Chien
56b98ca21e
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
am: 9b626fce11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: I292081bbb95489c9210a037842ca820b649ad168
2020-06-17 06:37:33 +00:00
Mark Chien
9b626fce11
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: I496104d3aff4f6937cf4445c7b0eef272d12e5df
2020-06-17 06:24:22 +00:00
Mark Chien
481816a97d
Merge "Get entitlement configuration from intent extra" into rvc-dev
2020-06-17 06:07:52 +00:00
markchien
e22bd7a2e8
Get entitlement configuration from intent extra
...
Tethering resource configuration is move from framwork to tethering
module. The resource would not be accessible from outside of tethering
module.
List the replacements of framework resources usage and intent extra:
1. R.string.config_mobile_hotspot_provision_response
--> android.net.extra.TETHER_PROVISIONING_RESPONSE.
2. R.string.config_mobile_hotspot_provision_app_no_ui
--> android.net.extra.TETHER_UI_PROVISIONING_APP_NAME
3. R.array.config_mobile_hotspot_provision_app
--> android.net.extra.TETHER_SILENT_PROVISIONING_ACTION
Besides, the current active subId would put in
android.net.extra.TETHER_SUBID
Note: They are not APIs because of API freeze. Now both tethering module
and Settings define these strings independently. Will replace hard code
string as tethering module-lib APIs in b/159085857.
Also move the entitlement response intent registeration from onCreated
to onStartCommand, this can avoid wrong intent registeration if subId
changed between onCreate and when the intent arrived.
Bug: 146918263
Test: atest TetherServiceTest
atest TetherProvisioningActivityTest
Change-Id: I3d06df01302a9c1f0893712d9250fe394dc66588
2020-06-17 05:47:17 +00:00
Automerger Merge Worker
f880829325
Merge "Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2" into rvc-d1-dev-plus-aosp am: efa8cb6206
am: 2a33b85f57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I5f66d25e41a8c484f65861109482b0c9e56b249c
2020-06-15 09:34:17 +00:00
Amy Hsu
ae9df5d621
Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
am: 156d912ce2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I3b2cc86858be209e64c8da37dd1b37552146cfd7
2020-06-15 09:00:03 +00:00
Amy Hsu
12471d9484
Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I06f91490e2adea3e9e3347790036730eec4a3ace
2020-06-15 08:46:02 +00:00
Amy Hsu
156d912ce2
Merge "Add Smooth Display option to developer in Settings" into rvc-dev am: f9a021511e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11544217
Change-Id: I1a3e8410a9e31ab3fa1e324cfe6d8759ba8515c2
2020-06-15 08:45:50 +00:00
Amy Hsu
f9a021511e
Merge "Add Smooth Display option to developer in Settings" into rvc-dev
2020-06-15 08:39:26 +00:00
Automerger Merge Worker
b312f2af4b
Merge "Merge "Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 52a3551a7a" into rvc-d1-dev-plus-aosp am: ac3266b1be" into rvc-qpr-dev-plus-aosp am: 8152e9d40f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I145def075a545a397ce7e631175a5f4e9ada9330
2020-06-15 07:20:58 +00:00
Mark Chien
75b2a75ccd
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: 10ef08d80f
am: 78b4bc6020
am: 1912ee3e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I78a0a2d461fd96f2af1850c74d78cd34060e66cc
2020-06-15 07:20:22 +00:00
Mark Chien
77fb97f1dc
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
am: 52a3551a7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I7042245d05b956b28cb08aced653afaf845e77b2
2020-06-15 06:55:23 +00:00
Mark Chien
78b4bc6020
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
am: 10ef08d80f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I38b762a4ad65059c737b962e87944b5f99ffc377
2020-06-15 06:55:17 +00:00
Mark Chien
969648b937
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: Ideb30fac609a33accdf40e949b63cc53ba05dfd3
2020-06-15 06:40:11 +00:00
Mark Chien
52a3551a7a
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev am: 2aa2b0a2f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11770823
Change-Id: I50a9ff0710db37ae8513afbf876b3e7ca83fa787
2020-06-15 06:40:10 +00:00
Mark Chien
10ef08d80f
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I4e08cfb19cf7600ed8bdd42675152e518446e541
2020-06-15 06:39:59 +00:00
Mark Chien
ccdefc1ea5
Merge "Remove schedule recheck logic from TetherService" into rvc-dev am: 49b74e24d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524846
Change-Id: I8800bc4ae09b3ce8d318a81dbeee9afe17e57b8f
2020-06-15 06:39:57 +00:00
Mark Chien
2aa2b0a2f8
Merge "Replace ConnectivityManager as TetheringManager" into rvc-dev
2020-06-15 06:23:28 +00:00
Mark Chien
49b74e24d6
Merge "Remove schedule recheck logic from TetherService" into rvc-dev
2020-06-15 06:23:11 +00:00
SongFerng Wang
832a6e54af
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
am: c2f0ab12d8
am: 86aa01ea4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Iefd7c8b53d1b57ecaafde5d9c4756d4f5338cfd4
2020-06-15 03:44:07 +00:00
Yanting Yang
3fc7639cee
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
am: c75c3ce3b3
am: be4dbdbea4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: Id7f84e04a85a1c00c5fd172d451d140769008b8c
2020-06-15 03:43:43 +00:00
SongFerng Wang
86aa01ea4f
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
am: c2f0ab12d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Ibd93f92445af453f6e01aafcb9a7d5531b0cdf5d
2020-06-15 03:31:15 +00:00
Yanting Yang
be4dbdbea4
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
am: c75c3ce3b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: Id210b618f8febff7f3be3dc85681adfde580087a
2020-06-15 03:30:59 +00:00
SongFerng Wang
24d6bb3ed0
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
am: d32cb38e45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: Ie3b090330bc2114a67e9229060ba5c6e23b74347
2020-06-15 03:18:41 +00:00
Yanting Yang
70a20ad328
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
am: 14da7dd1fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: I9e15289b31778b138f1668bcf556e650635c621e
2020-06-15 03:18:31 +00:00
TreeHugger Robot
9cc918849c
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
am: 051df5910e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: Ie3357deaaa46e7a2172f9760b77321bd3705bc83
2020-06-15 03:18:21 +00:00
SongFerng Wang
58d36c2d48
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: If6fbc2d5b6e82fedbb3f41ce7c11301491fd0c70
2020-06-15 03:12:27 +00:00
SongFerng Wang
d32cb38e45
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev am: 518ffd7c76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837795
Change-Id: I8de7097200c087bac8cf74001000b96712f370d7
2020-06-15 03:11:50 +00:00
SongFerng Wang
518ffd7c76
Merge "Revert "Mainline: removed legacy UI for network selection mode."" into rvc-dev
2020-06-15 03:09:21 +00:00
Yanting Yang
14da7dd1fa
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: Ia4f89a44ef37dc53ac32e25a2ee7757e652d3c1f
2020-06-15 03:07:05 +00:00
Yanting Yang
af13156dea
Merge "Update App info behavior for mainline module" into rvc-dev am: 8357871465
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11822585
Change-Id: I5852891ae326e0e88c184f94b46f5d9ff9134aa1
2020-06-15 03:07:05 +00:00
TreeHugger Robot
d452bfdfdc
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: I95f0cda2c92101ea746916cee813f0a2d56d2ac2
2020-06-15 03:06:26 +00:00
TreeHugger Robot
051df5910e
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev am: eac45c6a89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11852224
Change-Id: Ibe7a5bfe717c511c585eb651c3ba7cc0a412a3a9
2020-06-15 03:06:16 +00:00
Yanting Yang
8357871465
Merge "Update App info behavior for mainline module" into rvc-dev
2020-06-15 02:59:13 +00:00
TreeHugger Robot
eac45c6a89
Merge "NetworkRequestDialog: Exit the dialog on connect failure" into rvc-dev
2020-06-15 02:52:27 +00:00
Roshan Pius
924e9e39c1
NetworkRequestDialog: Exit the dialog on connect failure
...
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.
Bug: 158844146
Bug: 158616070
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.
Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
Merged-In: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-14 15:19:30 +00:00
Roshan Pius
81f9391105
NetworkRequestDialog: Exit the dialog on connect failure
...
Connection failure (similar to connection success) is the end of the
processng of a request. We should dismiss the dialog on connection
failure.
Bug: 158844146
Test: Manual tests - Simulate connection failure and ensure that the
dialog vanishes with a toast.
Change-Id: I625ca76298ed549dbed76d398aea0c957c9102fc
2020-06-12 19:28:16 +00:00
TreeHugger Robot
0ca5c9526b
Merge "[Wi-Fi] Add WifiNetworkDetailsFragment2 unit test cases"
2020-06-12 12:58:04 +00:00
Jason Chiu
f5eb561872
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
am: e6eb3775ac
am: 963ab5d9c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I5d1d72d381234a45c48146cf398e44039f09e0fd
2020-06-12 12:32:50 +00:00
Jason Chiu
963ab5d9c5
Merge "Fix Slice not pinned error" into rvc-dev am: 8cbee49d28
am: 7b40a59fd1
am: e6eb3775ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11833849
Change-Id: I08c7a4dc4c024044442cd1ea63e5885ce63e05b7
2020-06-12 12:21:32 +00:00