Commit Graph

12573 Commits

Author SHA1 Message Date
Beth Thibodeau
0b152c29d0 Merge "[DO NOT MERGE] Add toggle for media resumption" into rvc-dev 2020-06-19 22:26:59 +00:00
markchien
77c297df4f Remove unused resource from TetherServiceTest
TetherService is no longer query resource by itself after ag/11524847.
That CL miss to remove unused getResources code.
Now remove unused resource in this change.

Bug: 146918263
Test: atest TetherServiceTest
Change-Id: I3b0da2672246997aee16b11576ce5ae9bfe596dc
Merged-In: I3b0da2672246997aee16b11576ce5ae9bfe596dc
2020-06-19 23:23:02 +08:00
markchien
6d2c010891 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
Merged-In: I3d06df01302a9c1f0893712d9250fe394dc66588
2020-06-19 23:21:17 +08:00
markchien
dfd8d235a1 Replace ConnectivityManager as TetheringManager
Tethering APIs are all move to TetheringManager from Android R.
1. Replace ConnectivityManager tethering API usage as TetheringManager.
2. Use TetheringManager#stopTethering to disable usb tethering instead
of using deprecated ConnectivityService#setUsbTethering
3. Use TetheringManager#stopTethering to disable bluetooth tethering
instead of directly use BluetoothPan#setBlueoothTethering. So bluetooth
getProfileProxy is not needed in TetherService because tethering would
do that when calling #stopTethering.
4. Also support TETHERING_ETHERNET entitlement check that
TETHERING_ETHERNET is new added from Android R.

Bug: 146918263
Test: atest TetherServiceTest
Change-Id: Id969f29d7210f2ee32719c76439049bbc86cd4f6
Merged-In: Id969f29d7210f2ee32719c76439049bbc86cd4f6
2020-06-19 23:05:27 +08:00
markchien
500ce1d4c8 Remove schedule recheck logic from TetherService
This change just remove unused code.
Tethering no longer ask TetherService to schedule recheck
(use #EXTRA_SET_ALARM) from Android Q. Intead Tethering
(EntitlementManager) would schedule the recheck by itself.

This change is necessary in order to move the resourcesout
of the framework because TetherService needs to know when
it need to re-run entitlement recheck from framework res
(config_mobile_hotspot_provision_check_period).

Bug: 146918263
Test: atest TetherSerivceTest
Change-Id: Ie45859c19b96d0689c45dd610501fae0506742ff
Merged-In: Ie45859c19b96d0689c45dd610501fae0506742ff
2020-06-19 23:04:43 +08:00
TreeHugger Robot
992d31cd03 Merge "Add BatteryStatusFeatureProvider" 2020-06-19 14:02:13 +00:00
Arc Wang
97659b2dfc [Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment
Bug: 152571756
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ie6f63cb8aa81d61bfa41687c73f8c8764cb3cefe
2020-06-19 19:15:42 +08:00
Mark Chien
cf18d506fe Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db am: e35a89ef62 am: 211a604243
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I8ca3430f4bf89107b8a5b4a92f1bbd96023bf78d
2020-06-19 06:46:58 +00:00
Automerger Merge Worker
871c15dcce Merge "Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0" into rvc-qpr-dev-plus-aosp am: 510920bab8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I78d46ffd65eb69b12f0ae3a01aff47454803145c
2020-06-19 06:44:11 +00:00
TreeHugger Robot
43e9340dfb Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf am: 6c0d2225c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I86b2dd6ed85175a1c9e2bbcc1b7ce525eccd419a
2020-06-19 06:18:41 +00:00
Mark Chien
e35a89ef62 Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c am: 5f643bb4db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: Ib91bb507b01b4b0e9994cb9edbadf21bc57e4886
2020-06-19 06:00:23 +00:00
TreeHugger Robot
53d99db577 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc am: a68b7cc6bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I5a715f26585a7af1c142aac930f1e196e5ebcb10
2020-06-19 06:00:10 +00:00
Mark Chien
c3a501c02e Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I89a1b4747662611dc2a103ab6835afff0e05086b
2020-06-19 05:45:18 +00:00
Mark Chien
5f643bb4db Merge "Remove unused resource from TetherServiceTest" into rvc-dev am: 45a953b56c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908542

Change-Id: I63a125c5291f71811e2c010d946c0440c1eca29c
2020-06-19 05:45:00 +00:00
TreeHugger Robot
25a8c13254 Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: I3da9493dff22054dd6250a17d8ea6ed7a5226457
2020-06-19 05:44:59 +00:00
TreeHugger Robot
a68b7cc6bf Merge "Remove the feature flag of contextual home V2" into rvc-dev am: e8e4e4bafc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11910083

Change-Id: Idc85a865b5579bc08dbb4b0e6b92726bb2e6cf08
2020-06-19 05:44:52 +00:00
Mark Chien
45a953b56c Merge "Remove unused resource from TetherServiceTest" into rvc-dev 2020-06-19 05:43:36 +00:00
TreeHugger Robot
e8e4e4bafc Merge "Remove the feature flag of contextual home V2" into rvc-dev 2020-06-19 05:06:12 +00:00
markchien
efb029c067 Remove unused resource from TetherServiceTest
TetherService is no longer query resource by itself after ag/11524847.
That CL miss to remove unused getResources code.
Now remove unused resource in this change.

Bug: 146918263
Test: atest TetherServiceTest
Change-Id: I3b0da2672246997aee16b11576ce5ae9bfe596dc
2020-06-19 03:37:38 +00:00
Jason Chiu
d489acb2e3 Remove the feature flag of contextual home V2
Bug: 159393461
Test: robotest & rebuild
Change-Id: If5f030b4c8bd5ef61bb722da9ae7f3ace0ac6e0e
2020-06-19 11:23:57 +08:00
TreeHugger Robot
3e032c93b5 Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f am: 73ebf35f81 am: 399e5e3d7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I2309a23cb2c461d5893571ef63561888ec14afcb
2020-06-19 02:04:33 +00:00
TreeHugger Robot
73ebf35f81 Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: Ic83548d14318f9c96ead86ba9aca53e50e195337
2020-06-19 01:34:10 +00:00
TreeHugger Robot
8006681905 Merge "Update notification subtext" into rvc-dev am: 141153e789
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I27cc9ca8a606be820f8c4a3c9f3dd6af95f0388b
2020-06-19 01:16:49 +00:00
TreeHugger Robot
385e9be34f Merge "Update notification subtext" into rvc-dev am: 141153e789
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I9f48f9e9fc98eee8ae3df94135c0baac9783429e
2020-06-19 01:16:42 +00:00
Beth Thibodeau
13f3e8f04b [DO NOT MERGE] Add toggle for media resumption
Adds a toggle under Settings > Sound > Media to toggle media resumption

Bug: 154039093
Test: manual
Test: atest SettingsProviderTest
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="MediaControls"

Change-Id: I803c57031bc3252cab35c06ea124d1c22a3c3aeb
2020-06-18 23:58:34 +00:00
Alex Mang
4368da2e23 Merge "Add flag to allow NAS to indicate adjustments on notifications and solicit feedback." 2020-06-18 20:38:06 +00:00
Julia Reynolds
03a42fd844 Update notification subtext
Test: atest
Fixes: 159274325
Change-Id: Iff98b4b056bf7a3c6386063d6588a26607ee7525
2020-06-18 16:25:38 -04:00
Jason Chiu
2de51f92f2 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: I69b8345c0d34a77326b7dd86f4ad52edeedc0b02
2020-06-18 15:09:51 +00:00
TreeHugger Robot
d2ea0b8e37 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: I79cee4ac6d5c40605be2a20c69cf39d213ceaa28
2020-06-18 15:08:07 +00:00
Mark Chien
b94412a653 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: I11233a13c5d6c0995521a2034d51fe080bf3295f
2020-06-18 14:28:08 +00:00
Jason Chiu
3e7ae1b547 Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: e623f69f29 am: a4e005e0ef am: cab15b0d65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I183c512bfec686df0e9c3de50fc7252ccff66663
2020-06-18 12:03:52 +00:00
Jason Chiu
a4e005e0ef Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b98492f am: e623f69f29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11837792

Change-Id: I7fa7892e91b9db37728930fcf70652b891ba765d
2020-06-18 11:36:26 +00:00
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