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
7248e67343
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
am: 9b626fce11
am: 56b98ca21e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: I0b5c3c9f0b7d4b321fd98bc081bf01c4fa4945a2
2020-06-17 06:49:06 +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
Tim Peng
28dcfda0bf
Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
am: 38168ef519
am: 620253c196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401
Change-Id: Id44591aed348bcdd0377a694bf19a6ea62d7d6e5
2020-06-17 06:31:01 +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
Tim Peng
620253c196
Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
am: 38168ef519
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401
Change-Id: I72a47cce2ea61afb442f8c8354e4e845a922d994
2020-06-17 06:12:27 +00:00
Mark Chien
481816a97d
Merge "Get entitlement configuration from intent extra" into rvc-dev
2020-06-17 06:07:52 +00:00
Tim Peng
38168ef519
Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401
Change-Id: I7ef704688ca82229f110e82441213d8344883bea
2020-06-17 05:59:06 +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
Tim Peng
7084631b4b
Align Slice Row title icon with Panel icon in output switcher panel
...
-Icon size changes and padding needs to be updated
-Apply padding to output switcher panel
-Remove padding from generic slider panel
Bug: 159179348
Test: manual test
Change-Id: I063926f4b22f6aaa1187b78efa570009fe02d5c4
2020-06-17 12:02:26 +08:00
Mark Chien
1d05abe366
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
am: bb8f08013b
am: cb57d2247d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805
Change-Id: Ifc0519178b1ab808e63b71072eb044167efba41a
2020-06-17 03:15:37 +00:00
Mark Chien
cb57d2247d
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
am: bb8f08013b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805
Change-Id: Ie3a9e582c1dce1e714c2f40f137333fd9eec52f3
2020-06-17 02:58:21 +00:00
Mark Chien
bb8f08013b
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805
Change-Id: I3c59ccf36d2912c96ef9a2267ebf4742f4765e52
2020-06-17 02:47:31 +00:00
Mark Chien
5bd41e573b
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev
2020-06-17 02:29:35 +00:00
Mehdi Alizadeh
1a3e35b3b2
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: 634e0ac8b3
am: dfe74931a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: Ic736affe694018690b9fdbd0e3fac73b7b7d0ba8
2020-06-16 23:40:24 +00:00
Automerger Merge Worker
fb2e613c74
Merge "Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
am: 29e6eb0513" into rvc-qpr-dev-plus-aosp
2020-06-16 23:40:10 +00:00
Mehdi Alizadeh
296b9dcbe3
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
am: 4d896e3da8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: Ic9b70cd934b937a2c45efac6f637ec53f8188753
2020-06-16 23:40:02 +00:00
Mehdi Alizadeh
7594ae50d6
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
am: 29e6eb0513
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I0da94dcda22a49f1ebc8221934b0c3c3e5041119
2020-06-16 23:39:57 +00:00
Mehdi Alizadeh
dfe74931a5
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: 634e0ac8b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I70f11a1461405518604e9bd1baaa856026927067
2020-06-16 23:27:30 +00:00
Mehdi Alizadeh
4d896e3da8
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I4b0d51bd2450f96d876ee00e78d59e6cbe0d8766
2020-06-16 23:27:27 +00:00
Mehdi Alizadeh
29e6eb0513
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
am: eab293354a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I5e603aa831d709daa4de6a886b2e607410023c48
2020-06-16 23:27:05 +00:00
Mehdi Alizadeh
634e0ac8b3
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I55f36a667b7ce3d790a2a886a59c8add2e26b80c
2020-06-16 23:09:51 +00:00
Mehdi Alizadeh
eab293354a
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166
Change-Id: I022be22ccde5c45748b4e54e6974d1ccb41f3820
2020-06-16 23:09:36 +00:00
Mehdi Alizadeh
b50512b69a
Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev
2020-06-16 22:53:25 +00:00
Automerger Merge Worker
4438930d2c
Merge "Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
am: ec64a1d562
am: 7d991c6460" into rvc-qpr-dev-plus-aosp
2020-06-16 20:10:41 +00:00
Alex Johnston
500ef83791
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
am: 1a9820c415
am: eebf47cdec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I84f00545e4a603efb816fcdbe43c0d7efcddace0
2020-06-16 20:10:36 +00:00
Alex Johnston
9dca10ea19
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
am: ec64a1d562
am: 7d991c6460
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Ica03c027d0c0e45396c54cadf900a997d6405e3c
2020-06-16 20:10:35 +00:00
Alex Johnston
6f9115072a
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
am: ec64a1d562
am: 28e4b34ec7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: If3ea251bca59ab5f5d665416b2b069c0243e41f2
2020-06-16 20:10:01 +00:00
Alex Johnston
7d991c6460
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
am: ec64a1d562
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Iee37736fca1db6cac3580b804e0045e9df57f4aa
2020-06-16 19:47:27 +00:00
Alex Johnston
eebf47cdec
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
am: 1a9820c415
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: Iadf29f6056d7563cee6fd943291d42ea5320657f
2020-06-16 19:47:18 +00:00
Alex Johnston
28e4b34ec7
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
am: ec64a1d562
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I67cf0cf480b4baede6e47b8d7958d842282d8714
2020-06-16 19:47:02 +00:00
Alex Johnston
ec64a1d562
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I6fccaa22cd0c09008619b59a1b6c342c40d869f7
2020-06-16 19:21:58 +00:00
Alex Johnston
1a9820c415
Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803
Change-Id: I3bb56b01b0a2459bf2c02f23723cc81b0f828cbe
2020-06-16 19:21:53 +00:00
Alex Johnston
dd1d9c4db0
Merge "Wifi details - handle no profile owner" into rvc-dev
2020-06-16 19:06:52 +00:00
TreeHugger Robot
3385955653
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours am: 7032886561
-s ours am: f1363f7809
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I4dee73f6411e014471179692f962a94d011822df
2020-06-16 18:31:58 +00:00
Automerger Merge Worker
34f5952129
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours am: aa702e7b68
-s ours am: 2d0c6b39f6
-s ours" into rvc-qpr-dev-plus-aosp
2020-06-16 18:31:47 +00:00
TreeHugger Robot
049d92f6a0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours am: aa702e7b68
-s ours am: 2d0c6b39f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I4cf677cdf793eaaa375a7ddea682dd2792861be1
2020-06-16 18:31:42 +00:00
TreeHugger Robot
c35940bf00
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours am: aa702e7b68
-s ours am: 55bc4d6226
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: Ibbfe65d78be393cf55440c0e3f05552c7041773f
2020-06-16 18:31:39 +00:00
TreeHugger Robot
21f8bda9c9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf
-s ours am: 6a9b77b0f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: If163752591586e0dfbca30260cf8a03a079cefd6
2020-06-16 18:31:29 +00:00
TreeHugger Robot
e81966c8eb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf
-s ours am: ea905acab7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: Iefa5918bdc8ac19d67a67da4fb4d53118d47a5e4
2020-06-16 18:31:07 +00:00
TreeHugger Robot
f1363f7809
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours am: 7032886561
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I02788250d6562d3c15812c4215608ead77984088
2020-06-16 18:18:26 +00:00
TreeHugger Robot
2d0c6b39f6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours am: aa702e7b68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I65e0be7cbebc20ea7c57e50a2c78af7df90ea470
2020-06-16 18:10:47 +00:00
TreeHugger Robot
55bc4d6226
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours am: aa702e7b68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I335e69f62cb863d5c48cc806c38f92246e9306b5
2020-06-16 18:10:21 +00:00
TreeHugger Robot
6a9b77b0f4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: Iea517dafbc98b89f6aaa2bf4baac2d1daa5232d4
2020-06-16 18:10:15 +00:00
TreeHugger Robot
ea905acab7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 565af5abcf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876507
Change-Id: I30407fda8fed7bbcc5ebc7784662471072590d10
2020-06-16 18:10:04 +00:00
TreeHugger Robot
aa702e7b68
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I95e75a17db6e1dc47c7f258ed09223660ee363bb
2020-06-16 18:02:35 +00:00
TreeHugger Robot
7032886561
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c622fdc7a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11876506
Change-Id: I98cfcd706acd8f45cd80cfda62993316f03dfbbf
2020-06-16 18:02:26 +00:00