Commit Graph

62886 Commits

Author SHA1 Message Date
Yanting Yang
ec3f5672b2 Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755 am: ab6813af23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: I602f53ff6ed4dab2989b0f30fe7b4ded6e58d267
2020-06-18 15:25:43 +00:00
TreeHugger Robot
6bc89177b4 Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: 4a4f006894
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420

Change-Id: I36af9646a2d8a9a88e2fcff66760720b636cf7fc
2020-06-18 15:25:39 +00:00
TreeHugger Robot
e61a21f4a0 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 21099bcb95 -s ours am: d46390f21f -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: I1ec5502896d4e2bd84ee93235400eefe7b250e2f
2020-06-18 15:25:22 +00:00
TreeHugger Robot
b62744bdab Merge "Add new Always on display slice" into rvc-dev am: 16e1cd296a am: d2ea0b8e37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11736609

Change-Id: Ia00973ba8ab6819f6afb7afeda01b31d86f3cf0d
2020-06-18 15:24:51 +00:00
TreeHugger Robot
315695c17a 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: I9f4afbcceebfc4eaf74e1ae1dd852a201a7c5404
2020-06-18 15:10:09 +00: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
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
4a4f006894 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: I1b22282644bb4f630ae02df36cdb9005119fb131
2020-06-18 15:09:01 +00:00
TreeHugger Robot
d46390f21f [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: I147652b5f55b7554cefa4da80ce96db642b994b9
2020-06-18 15:08:34 +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
a45cb9ab93 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: Ic480b87cf77dc72cad7593140aa86d475d1425a3
2020-06-18 14:32:29 +00:00
Tim Peng
4a5d1b4c40 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: Ifaf9f1ea2869e0e40d8fc59981e4c9faae600f0a
2020-06-18 14:32:23 +00:00
Mark Chien
8545e1c47d 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: I2eef0c70273b80439014cebf7e924575f7a4c5ad
2020-06-18 14:30:41 +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
ea45695190 Merge "Launch work dnd setting for work-profile apps" into rvc-dev 2020-06-18 13:32:43 +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
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
c8e0d2e755 Merge "Avoid NPE when screen title is null" into rvc-dev 2020-06-18 09:58:47 +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
41f4d72ea2 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: I25340023927d1cbb86b497979cfe9344f5fdd8a8
2020-06-18 08:19:55 +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
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
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
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
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
5bd41e573b Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev 2020-06-17 02:29:35 +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
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
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
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
dd1d9c4db0 Merge "Wifi details - handle no profile owner" into rvc-dev 2020-06-16 19:06:52 +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
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
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
565af5abcf Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-06-16 17:59:57 +00:00
TreeHugger Robot
c622fdc7a9 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-06-16 17:40:13 +00:00
Chihhang Chuang
786e814706 Launch WallpaperPicker in a new task[Part2]
Didn't notice com.android.settings.Settings$WallpaperSettingsActivity was also change unexpectedly, we should only add new task for CustomizationPickerActivity only.

Test: Manually
Fixes: 158642941
Change-Id: I9b271d0fbf124d2d38bc52fa99c2c17b0bfc658c
2020-06-16 18:38:04 +08:00
Alex Johnston
10c970c571 Wifi details - handle no profile owner
* If there is no profile owner, then do
  no call DPM method getProfileOwnerAsUser

Bug: 158284193
Test: manual testing
      make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ief1f0b3aa6805d69fc14da8f87a90c9b12bef8c6
2020-06-16 11:05:33 +01:00
Sunny Shao
a92deac94d Workaround for Recent app icon disappear
- Use the ic_home_xxxx.xml to replace the original icon.

Bug: 157623047
Test: manual review
Change-Id: Iffd084cac6a0a40d13d9fd1a8944ef957db450c6
Merged-In: I7a78ba47a0383a5e4c65bd461a15a8425beb1acb
2020-06-16 17:30:32 +08:00
Chihhang Chuang
b080ef6c83 Launch WallpaperPicker in a new task am: 8bed8d3454
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862433

Change-Id: Ic619bf5ac9f8f3e0b3f30f99871e98a006b154b1
2020-06-16 09:07:13 +00:00
Chihhang Chuang
8bed8d3454 Launch WallpaperPicker in a new task
Wallpaper does not support multi window mode, but launching from
Settings will make it support multi window because the root activity
supports.

Solution: Launch WallpaperPicker in a new task

Test: Manually
Fixes: 158642941
Change-Id: I93a6eaa8c0292e99c54d5278274482075ed007d5
2020-06-16 15:20:59 +08:00