Mark Chien
3d4ad9fc7d
Merge "Get entitlement configuration from intent extra" into rvc-dev am: 481816a97d
am: b94412a653
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11524847
Change-Id: Idaafd6c560e990e68eacc9af9fba93fec9a266af
2020-06-18 14:34:18 +00:00
Tim Peng
e43b7bdc71
Align Slice Row title icon with Panel icon in output switcher panel am: 7084631b4b
am: 792d46527e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882401
Change-Id: I640d4a5b32f4b01ed40e2da544ba2821e32247f2
2020-06-18 14:34:02 +00:00
Mark Chien
ffdde8abc0
Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b
am: fd865bc7df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805
Change-Id: Ifc6dc80df6a0d453254661d8843f5a954c8cb212
2020-06-18 14:32:01 +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
Tim Peng
792d46527e
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: Icd905fc40d880995d120536c9813c3145e1b2f06
2020-06-18 14:27:54 +00:00
Mark Chien
fd865bc7df
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: I5aca0bbac13b6b7b9f6d3abdefd1537f4cb8255b
2020-06-18 14:25:17 +00:00
TreeHugger Robot
4ce89147b7
Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
am: ce685b4142
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: Ia76e93e5631dbd07f4c613977d11cb29182a36e8
2020-06-18 13:59:43 +00:00
TreeHugger Robot
ce685b4142
Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174
Change-Id: Iaf94f87697c7e7f4c86475f8c291502a1d441f22
2020-06-18 13:44:59 +00:00
TreeHugger Robot
ea45695190
Merge "Launch work dnd setting for work-profile apps" into rvc-dev
2020-06-18 13:32:43 +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
Yanting Yang
4f63c8d5a9
Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
am: bdbcd02a09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411
Change-Id: I6c7731402386659cd61c45e67c6edadb1759ec01
2020-06-18 10:41:47 +00:00
Yanting Yang
bdbcd02a09
Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411
Change-Id: Ib3c4bc91cc51a409b29455e4f00bc423b389a709
2020-06-18 10:21:11 +00:00
Yanting Yang
c8e0d2e755
Merge "Avoid NPE when screen title is null" into rvc-dev
2020-06-18 09:58:47 +00:00
TreeHugger Robot
037eb6b776
Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
am: dae8a5bff1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420
Change-Id: Iac142b41a16bf2fcfc3192801a2c3cfd00fd5a1c
2020-06-18 09:40:31 +00:00
TreeHugger Robot
dae8a5bff1
Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420
Change-Id: I0e19896545564be3c19be24c2ea2493c10b8f0d9
2020-06-18 09:19:46 +00:00
TreeHugger Robot
52707fce4f
Merge "Workaround for Recent app icon disappear" into rvc-dev
2020-06-18 09:10:00 +00:00
TreeHugger Robot
65cb9c9c1d
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678
Change-Id: I6594136afd56b93290c919e09c7e34b66bf62bb4
2020-06-18 08:20:08 +00:00
TreeHugger Robot
e47478ddcc
Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev
2020-06-18 08:06:13 +00:00
TreeHugger Robot
debdb0f32d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours am: cdaf90029f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889176
Change-Id: Ib158fe84fb02e799f0f86d53b002e679e409232a
2020-06-17 19:22:22 +00:00
TreeHugger Robot
cdaf90029f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889176
Change-Id: I93fce8d35db8a225adc0c8f7431007d512dd9d1e
2020-06-17 19:04:10 +00:00
TreeHugger Robot
21099bcb95
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-17 18:51:02 +00: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
Bill Yi
553dcca790
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Id87875585903185c64f8ed91c03dd50ca9e06b39
2020-06-17 09:27:34 -07:00
Beverly
51fb73e512
Launch work dnd setting for work-profile apps
...
Test: manual
Fixes: 159178762
Change-Id: Ifa4c7f776e19f3aec87b5ef1f858c92cff46b30b
2020-06-17 11:57:19 -04:00
Yanting Yang
72c2fa5a3d
Avoid NPE when screen title is null
...
The screen title of Settings pages could be empty, e.g., Mobile network
detail page. It will cause NPE when Settings generates the slice
object, and then results in the Settings Search showing empty view for
slice search result. It’s a bad user experience, we need to add the null
check to avoid it.
Bug: 157986273
Test: robotests
Change-Id: I8bf6a081c6b3e97ccb173424ff4a310ae863ae2f
2020-06-17 23:49:09 +08: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
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
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
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
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
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
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