Commit Graph

33952 Commits

Author SHA1 Message Date
Yanting Yang
ab6813af23 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: I491d5d4b1e74abc320566d64326601dbe0b2ad31
2020-06-18 15:09:33 +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
TreeHugger Robot
05c7f75b42 Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: ce685b4142 am: 4ce89147b7 am: 506b0cc65b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: I8940e8791c21403b1944cf2ce81746a0813931f2
2020-06-18 14:38:09 +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
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
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
Peter_Liang
22ed240aab Fix the dark theme obscures the center marker of audio balance slider.
Root Cause:
The color of center marker is wrong.

Next:
The color of center marker is white when dark theme is enabled; Otherwise, it's black.

Bug: 159028208
Test: manual test & make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBarPreferenceTest & make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBarTest
Change-Id: Id2d548778d1275709448f4c009a8469216950d8c
Merged-In: Id2d548778d1275709448f4c009a8469216950d8c
(cherry picked from commit 34a873884d)
2020-06-18 20:03:25 +08: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
6bf232cbfe Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: bdbcd02a09 am: 4f63c8d5a9 am: 93b72cdd79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I4cba8dc47afeea253f6f1738516fae5e3c896d95
2020-06-18 11:04:19 +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
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
TreeHugger Robot
55c260bfc7 Merge "Launch WallpaperPicker in a new task[Part2]" into rvc-d1-dev am: e47478ddcc am: 65cb9c9c1d am: 9774deb533
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11881678

Change-Id: I546a874a0dcbd3d15aa302931aa26d87a566845a
2020-06-18 08:45:33 +00:00
mincheli
f670261028 Supports triple-tap shortcut for window magnification
Window magnification mode shows triple-tap shortcut.

Bug: 157861708
Test: make RunSettingsRoboTests
Change-Id: I88c7a26e476d3cc5f85fa1b3f267ef3f1453ae38
2020-06-18 16:41:02 +08: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
PETER LIANG
9926988728 Merge "Fix the dark theme obscures the center marker of audio balance slider." 2020-06-18 07:03:46 +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
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
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
Peter_Liang
34a873884d Fix the dark theme obscures the center marker of audio balance slider.
Root Cause:
The color of center marker is wrong.

Next:
The color of center marker is white when dark theme is enabled; Otherwise, it's black.

Bug: 159028208
Test: manual test & make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBarPreferenceTest & make RunSettingsRoboTests ROBOTEST_FILTER=BalanceSeekBarTest
Change-Id: Id2d548778d1275709448f4c009a8469216950d8c
2020-06-17 08:30:55 +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
Mark Chien
4110e8c19c Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: bb8f08013b am: cb57d2247d am: 1d05abe366
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: I1152a3f3081f860d68270289c9ceaa23ce56da9d
2020-06-17 03:33:08 +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
c89052a4fa Merge "Allows IndicatorView to have a different size than Settings Activity" into rvc-dev am: b50512b69a am: eab293354a am: 4d896e3da8 am: 296b9dcbe3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11835166

Change-Id: Ia1e671d00528170aad8b960ed3704fb25e407900
2020-06-17 00:04:18 +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
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
Kevin Chyn
af90bd5c11 Remove setActiveUser together with frameworks/base (see 12/n)
setActiveUser is removed from the @hide API surface and is no longer
necessary. The framework ensures that the correct user is set without
an explicit call, since userId is sent as a parameter to each of the
methods already.

Bug: 157790417
Test: See testing from frameworks/base change (12/n) from the same
      gerrit topic
Change-Id: Id88b818ed0bb1f75f18ac8e9ba7aff2a9b80b319
2020-06-16 14:52:15 -07:00
Alex Johnston
ff77ef91f8 Merge "Wifi details - handle no profile owner" into rvc-dev am: dd1d9c4db0 am: ec64a1d562 am: 28e4b34ec7 am: 6f9115072a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11866803

Change-Id: I21c612959a9e408f1abea3175c9daa20bd10767f
2020-06-16 20:31:05 +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