OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMake device discoverable in Connected Devices settings page
timhypeng [Fri, 11 May 2018 07:41:10 +0000 (15:41 +0800)]
Make device discoverable in Connected Devices settings page

* For fix the TreeHugger error in pi-dev, cherry pick the ag/4042235 in
  master and fix TreeHugger error. Change android.support.v7.* to androidx.*
* Set preference title by bluetooth state
* Enable bluetooth discoverable mode in Connected device page
* Add more test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: I6d4f8ec3870c43bf48e9666eabd60068aa8950bb

6 years agoAdd bluetooth discoverable footer preference in connected devices page
timhypeng [Fri, 11 May 2018 06:38:22 +0000 (14:38 +0800)]
Add bluetooth discoverable footer preference in connected devices page

* For fix the TreeHugger error in pi-dev, cherry pick the ag/4042014 in
  master and fix TreeHugger error. Change android.support.v7.* to androidx.*
* Dynamicly add preference in controller
* Add test cases for DiscoverableFooterPreferenceController

Bug: 79294219
Test: make -j50 RunSettingsRoboTests
Change-Id: Id4c1e86c9a0a0cd69d8106a18f2cf4a0fa31782b

6 years agoMerge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to retur...
TreeHugger Robot [Mon, 21 May 2018 10:23:17 +0000 (10:23 +0000)]
Merge "[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors."

6 years agoMove getLocalBtManager into FutureTask am: 988dc9fbe6
ryanywlin [Mon, 21 May 2018 10:09:29 +0000 (03:09 -0700)]
Move getLocalBtManager into FutureTask am: 988dc9fbe6
am: 7afd2e57a7

Change-Id: I7860a19b42b65844ec2a0fc8cf6c8b82d05fd4c6

6 years agoMove getLocalBtManager into FutureTask
ryanywlin [Mon, 21 May 2018 10:04:46 +0000 (03:04 -0700)]
Move getLocalBtManager into FutureTask
am: 988dc9fbe6

Change-Id: Ifc3131dd15094c2eef4cbab05df46070b41928d0

6 years ago[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return Color...
Jason Chang [Thu, 3 May 2018 03:08:20 +0000 (11:08 +0800)]
[SettingsLib] Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors.

Update Utils.getColorAccent() and Utils.getColorError() to return ColorStateLists instead of colors and change every callers entry.

Bug: 78215054
Test: manually test for UI
Change-Id: Ie201aee439bd9e8337eca989b4cdc836a6e8e917

6 years agoMove getLocalBtManager into FutureTask
ryanywlin [Fri, 18 May 2018 23:34:52 +0000 (07:34 +0800)]
Move getLocalBtManager into FutureTask

Utils.getLocalBtManager in constructor violate StrictMode
ThreadPolicy, move it into FutureTask.

Bug: 79985175
Test: make RunSettingsRoboTests ROBOTEST_FILTER="MediaOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="HandsFreeProfileOutputPreferenceControllerTest" -j28
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j28
Change-Id: I0a14be18e4766245e7d165239d47ab54fa5e4acb

6 years agoUsing static method to get summary resource id am: 7f1345c3cd
hughchen [Mon, 21 May 2018 07:12:18 +0000 (00:12 -0700)]
Using static method to get summary resource id am: 7f1345c3cd
am: 6a4174a079

Change-Id: I91b805e89e9f3d5a3259f10401a9963d25cb32e1

6 years agoUsing static method to get summary resource id
hughchen [Mon, 21 May 2018 07:07:39 +0000 (00:07 -0700)]
Using static method to get summary resource id
am: 7f1345c3cd

Change-Id: I4acae01207e56a779d5f854e618127311b8408a4

6 years agoUsing static method to get summary resource id
hughchen [Wed, 9 May 2018 06:33:52 +0000 (14:33 +0800)]
Using static method to get summary resource id

* Using getConnectedDevicesSummaryResourceId() to get the resource id to shown the summary.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests
Change-Id: I268de4d989fe01eff463a5ec1c0a174e094e56c0

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 360297...
Bill Yi [Sun, 20 May 2018 14:10:48 +0000 (07:10 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 36029724b2  -s ours
am: 0c5ae7efd7  -s ours

Change-Id: I66dc039a91ee4b84c146390e5bcf7c2b7c6d1423

6 years ago[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Sun, 20 May 2018 14:05:48 +0000 (07:05 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 36029724b2  -s ours

Change-Id: I919f8e980c6522783d2dbb8fbb94d84fba50dc9b

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Sun, 20 May 2018 14:00:12 +0000 (14:00 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Sun, 20 May 2018 09:34:03 +0000 (02:34 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8c15eb852603c17a804d652c236ee561a4218b22

6 years ago[automerger skipped] Add developer options toggle for Bluetooth A2DP hardware offload...
Chienyuan [Sun, 20 May 2018 06:52:57 +0000 (23:52 -0700)]
[automerger skipped] Add developer options toggle for Bluetooth A2DP hardware offload am: c96606500f
am: 6b66b7e8cd  -s ours

Change-Id: I9f0fcba6943ce72a81d9b9a8ab9fc22acc728e1f

6 years agoAdd developer options toggle for Bluetooth A2DP hardware offload
Chienyuan [Sun, 20 May 2018 06:41:40 +0000 (23:41 -0700)]
Add developer options toggle for Bluetooth A2DP hardware offload
am: c96606500f

Change-Id: Ie5519aa3109964e4b3bc734242c72ae50a07101c

6 years agoAdd developer options toggle for Bluetooth A2DP hardware offload
Chienyuan [Wed, 16 May 2018 12:52:00 +0000 (20:52 +0800)]
Add developer options toggle for Bluetooth A2DP hardware offload

Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7
Merged-In: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7

6 years agoAdd developer options toggle for Bluetooth A2DP hardware offload
Chienyuan [Wed, 16 May 2018 12:52:00 +0000 (20:52 +0800)]
Add developer options toggle for Bluetooth A2DP hardware offload

Bug: 63932139
Bug: 79568680
Test: robotests
Change-Id: I54943cb591be1bfed0cdfe7eebf90bad64ce13c7

6 years ago[automerger skipped] Merge "Make user explicitly set security type for tether network...
Salvador Martinez [Sat, 19 May 2018 03:32:49 +0000 (20:32 -0700)]
[automerger skipped] Merge "Make user explicitly set security type for tether network" into pi-dev am: 0e721c598e
am: 13f97a29a6  -s ours

Change-Id: I7f160e545d458ce3257379d54c46157158ea7633

6 years agoMerge "Make user explicitly set security type for tether network" into pi-dev
Salvador Martinez [Sat, 19 May 2018 03:27:51 +0000 (20:27 -0700)]
Merge "Make user explicitly set security type for tether network" into pi-dev
am: 0e721c598e

Change-Id: I60f548f4d813a75f256aaf228c0e58232f376a16

6 years agoMerge "Make user explicitly set security type for tether network" into pi-dev
TreeHugger Robot [Sat, 19 May 2018 03:17:17 +0000 (03:17 +0000)]
Merge "Make user explicitly set security type for tether network" into pi-dev

6 years agoMake user explicitly set security type for tether network
Salvador Martinez [Wed, 16 May 2018 00:44:42 +0000 (17:44 -0700)]
Make user explicitly set security type for tether network

This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Fixes: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64
Merged-In: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64

6 years agoMerge "Refine update process for restrict tip." into pi-dev am: 018548b320
Lei Yu [Sat, 19 May 2018 02:13:57 +0000 (19:13 -0700)]
Merge "Refine update process for restrict tip." into pi-dev am: 018548b320
am: 0e0bf4672b

Change-Id: I55e46cc96c6fd6be9e726e08bd3ac00f22ba4c5a

6 years agoMerge "Make user explicitly set security type for tether network"
TreeHugger Robot [Sat, 19 May 2018 02:05:20 +0000 (02:05 +0000)]
Merge "Make user explicitly set security type for tether network"

6 years agoMerge "Refine update process for restrict tip." into pi-dev
Lei Yu [Sat, 19 May 2018 02:02:55 +0000 (19:02 -0700)]
Merge "Refine update process for restrict tip." into pi-dev
am: 018548b320

Change-Id: I947eac4e04f049dda27a306427a9bf70412527fc

6 years agoMerge "Refine update process for restrict tip." into pi-dev
TreeHugger Robot [Sat, 19 May 2018 01:55:05 +0000 (01:55 +0000)]
Merge "Refine update process for restrict tip." into pi-dev

6 years ago[automerger skipped] Merge "Settings: Add logical camera default switch" into pi...
Shuzhen Wang [Sat, 19 May 2018 01:51:13 +0000 (18:51 -0700)]
[automerger skipped] Merge "Settings: Add logical camera default switch" into pi-dev am: 871d93a564
am: 94f80c719a  -s ours

Change-Id: I161d7bbb078320d0dbd43ed08dc13fe5791d8fa8

6 years ago[automerger skipped] Merge "Add controller to show the summary" into pi-dev am: 863b2...
hughchen [Sat, 19 May 2018 01:49:44 +0000 (18:49 -0700)]
[automerger skipped] Merge "Add controller to show the summary" into pi-dev am: 863b27270d
am: e5ec69e433  -s ours

Change-Id: I42d0991a22187c1b9782db7af7e836ddd299a2fd

6 years agoMerge "Settings: Add logical camera default switch" into pi-dev
Shuzhen Wang [Sat, 19 May 2018 01:37:16 +0000 (18:37 -0700)]
Merge "Settings: Add logical camera default switch" into pi-dev
am: 871d93a564

Change-Id: Id24373caa953f31fae232eb965710cca909ce19d

6 years agoMerge "Add controller to show the summary" into pi-dev
hughchen [Sat, 19 May 2018 01:35:44 +0000 (18:35 -0700)]
Merge "Add controller to show the summary" into pi-dev
am: 863b27270d

Change-Id: I612207108138216ba865cb026b00866ae9f53250

6 years agoMerge "Update headset, help, and info icons" into pi-dev am: 88d4356a1f
Antony Sargent [Sat, 19 May 2018 01:30:26 +0000 (18:30 -0700)]
Merge "Update headset, help, and info icons" into pi-dev am: 88d4356a1f
am: d789f43ea9

Change-Id: I26ad75ad4d88395a25445308318a80cd4e1414b8

6 years agoMerge "Refresh of "swipe up" gesture animation" into pi-dev am: 5d0efdce7f
Antony Sargent [Sat, 19 May 2018 01:29:41 +0000 (18:29 -0700)]
Merge "Refresh of "swipe up" gesture animation" into pi-dev am: 5d0efdce7f
am: 1ead1f1665

Change-Id: I481687f0a8b6c65d6dff2a18dbe280230d0cd550

6 years agoMerge "Settings: Add logical camera default switch" into pi-dev
TreeHugger Robot [Sat, 19 May 2018 01:27:11 +0000 (01:27 +0000)]
Merge "Settings: Add logical camera default switch" into pi-dev

6 years agoMerge "Add controller to show the summary" into pi-dev
TreeHugger Robot [Sat, 19 May 2018 01:26:12 +0000 (01:26 +0000)]
Merge "Add controller to show the summary" into pi-dev

6 years agoMerge "Update headset, help, and info icons" into pi-dev
Antony Sargent [Sat, 19 May 2018 01:25:46 +0000 (18:25 -0700)]
Merge "Update headset, help, and info icons" into pi-dev
am: 88d4356a1f

Change-Id: Ic8ae157f46296613edd6f0b75a43973d4a69d048

6 years agoMerge "Refresh of "swipe up" gesture animation" into pi-dev
Antony Sargent [Sat, 19 May 2018 01:24:44 +0000 (18:24 -0700)]
Merge "Refresh of "swipe up" gesture animation" into pi-dev
am: 5d0efdce7f

Change-Id: Ieb09a7411a7e4f81ccd9fea2f9f7b53c5ce07ebd

6 years agoMerge "Update headset, help, and info icons" into pi-dev
TreeHugger Robot [Sat, 19 May 2018 01:22:23 +0000 (01:22 +0000)]
Merge "Update headset, help, and info icons" into pi-dev

6 years agoMerge "Refresh of "swipe up" gesture animation" into pi-dev
TreeHugger Robot [Sat, 19 May 2018 01:20:35 +0000 (01:20 +0000)]
Merge "Refresh of "swipe up" gesture animation" into pi-dev

6 years agoMerge "Don't use cached app icon in app info page." into pi-dev am: 7312f55549
Fan Zhang [Fri, 18 May 2018 23:10:25 +0000 (16:10 -0700)]
Merge "Don't use cached app icon in app info page." into pi-dev am: 7312f55549
am: 9b8684fd12

Change-Id: I99e6bf942928fe64595c1eba03c3099910fc0545

6 years agoRefresh of "swipe up" gesture animation
Antony Sargent [Fri, 18 May 2018 22:58:36 +0000 (15:58 -0700)]
Refresh of "swipe up" gesture animation

Fixes: 77474484
Test: manual (Settings->System->Gestures->Swipe up on Home button)
Change-Id: I3e6f187ffd79c8b39afeb783fd067878136d0feb

6 years agoMerge "Don't use cached app icon in app info page." into pi-dev
Fan Zhang [Fri, 18 May 2018 23:08:08 +0000 (16:08 -0700)]
Merge "Don't use cached app icon in app info page." into pi-dev
am: 7312f55549

Change-Id: I3f196276bca134df35d0c723ae637354f5214744

6 years agoSettings: Add logical camera default switch
Shuzhen Wang [Fri, 11 May 2018 00:11:27 +0000 (17:11 -0700)]
Settings: Add logical camera default switch

Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.

Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5
Merged-In: I86c7f3b9830fb376b324621feb31cdfac59faee5

6 years agoMerge "Settings: Add logical camera default switch"
TreeHugger Robot [Fri, 18 May 2018 22:58:35 +0000 (22:58 +0000)]
Merge "Settings: Add logical camera default switch"

6 years ago[automerger skipped] Merge "DO NOT MERGE Set click listeners on displayPreference...
Beverly [Fri, 18 May 2018 22:58:19 +0000 (15:58 -0700)]
[automerger skipped] Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev am: cf845f365c
am: 9c6ccfbb4a  -s ours

Change-Id: Ie2482ef0da93306300b1c15e6a1cec8fff4d43b5

6 years agoUpdate headset, help, and info icons
Antony Sargent [Fri, 18 May 2018 22:45:01 +0000 (15:45 -0700)]
Update headset, help, and info icons

Bug: 77982107
Test: manual
Change-Id: Ib5fe8e4df4a524b9c50ad395cd0189bef5fcafa5

6 years agoMerge "Don't use cached app icon in app info page." into pi-dev
TreeHugger Robot [Fri, 18 May 2018 22:43:35 +0000 (22:43 +0000)]
Merge "Don't use cached app icon in app info page." into pi-dev

6 years agoMerge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev
Beverly [Fri, 18 May 2018 22:32:12 +0000 (15:32 -0700)]
Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev
am: cf845f365c

Change-Id: Ifdbe1baa8fc2b7cff4520ef61aa9277d9aeaef15

6 years agoMerge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 22:23:37 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Set click listeners on displayPreference" into pi-dev

6 years agoMake user explicitly set security type for tether network
Salvador Martinez [Wed, 16 May 2018 00:44:42 +0000 (17:44 -0700)]
Make user explicitly set security type for tether network

This was made implicit which is confusing for the user so this CL
adds a preference to make the user manually choose their security
type.

Test: robotests
Bug: 79435112
Change-Id: Ie78806e8952b52e1b7cd21f0b87c9d064acaff64

6 years agoMerge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp
Nathan Harold [Fri, 18 May 2018 22:18:27 +0000 (15:18 -0700)]
Merge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp
am: 3eb0dbdee0

Change-Id: I010e6932d481a6e031239212bb01258a317a7c41

6 years agoMerge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp
Nathan Harold [Fri, 18 May 2018 22:09:20 +0000 (22:09 +0000)]
Merge changes from topic "tel-debug-pi-dev-plus-aosp" into pi-dev-plus-aosp

* changes:
  [Telephony Debug Menu] Redo Layout
  [Telephony Debug Menu] Remove DcRtInfo
  [Telephony Debug Menu] Remove NeighboringCellInfo

6 years agoMerge "Update cancel and cast icons" into pi-dev am: cf2dc360bd
Antony Sargent [Fri, 18 May 2018 21:53:17 +0000 (14:53 -0700)]
Merge "Update cancel and cast icons" into pi-dev am: cf2dc360bd
am: a219ed30df

Change-Id: I9857a7e87943426b1a7759526448690351239d89

6 years agoMerge "Updated delete icon" into pi-dev am: 55642ef91b
Antony Sargent [Fri, 18 May 2018 21:52:44 +0000 (14:52 -0700)]
Merge "Updated delete icon" into pi-dev am: 55642ef91b
am: d55b214dbd

Change-Id: Ifca325273ca5e99461a93487b127b5d0adcf6a39

6 years agoMerge "Update cancel and cast icons" into pi-dev
Antony Sargent [Fri, 18 May 2018 21:49:56 +0000 (14:49 -0700)]
Merge "Update cancel and cast icons" into pi-dev
am: cf2dc360bd

Change-Id: I234d9aff45339d501669f05e3dafa9969542d2bc

6 years agoMerge "Updated delete icon" into pi-dev
Antony Sargent [Fri, 18 May 2018 21:49:07 +0000 (14:49 -0700)]
Merge "Updated delete icon" into pi-dev
am: 55642ef91b

Change-Id: I070f6c587c2b840793027e5e76fe4b258d76dd9d

6 years agoFix color lint baseline. am: 76a0ef6adb
Fan Zhang [Fri, 18 May 2018 21:39:57 +0000 (14:39 -0700)]
Fix color lint baseline. am: 76a0ef6adb
am: 11c9f97a2f

Change-Id: I541566eda1a225d096c8a1210cfff114cef08a05

6 years agoMerge "Update cancel and cast icons" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 21:39:33 +0000 (21:39 +0000)]
Merge "Update cancel and cast icons" into pi-dev

6 years agoMerge "Updated delete icon" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 21:38:51 +0000 (21:38 +0000)]
Merge "Updated delete icon" into pi-dev

6 years agoFix color lint baseline.
Fan Zhang [Fri, 18 May 2018 21:36:21 +0000 (14:36 -0700)]
Fix color lint baseline.
am: 76a0ef6adb

Change-Id: I814c6575a157fa6c4f27cb68aa076df23f94e3be

6 years agoDon't use cached app icon in app info page.
Fan Zhang [Fri, 18 May 2018 17:31:32 +0000 (10:31 -0700)]
Don't use cached app icon in app info page.

The cache in ApplicationsState is causing a lot of damage because AS
object is not smart enough to invalidate the cache in all conditions. So
we end up having bugs like stale app label or icon in weird cases.

This change stops using the cache when loading app icon in entity
headres. This is only a stop gap solution to fix most visible (and most
frequently complained) parts of the page. We still need to address the
cache in ApplicationsState eventually.

Change-Id: Iea88ad99d4069d678d09943cfb0b0e5c94eb3326
Fixes: 79881693
Test: robotests

6 years agoDO NOT MERGE Set click listeners on displayPreference
Beverly [Fri, 18 May 2018 18:33:36 +0000 (14:33 -0400)]
DO NOT MERGE Set click listeners on displayPreference

Test: manual (tap options multiple times with talkback on)
Test: ZenModeVisEffectsCustomPreferenceControllerTest, robotests
Change-Id: Iffa701fb486bd9eeda7d2c4c46cb30392a09a5df
Bug: 79728671

6 years agoSettings: Add logical camera default switch
Shuzhen Wang [Fri, 11 May 2018 00:11:27 +0000 (17:11 -0700)]
Settings: Add logical camera default switch

Add a switch to make logical camera as default camera (with smaller
camera id) for 3rd party app.

Test: Manually using Settings app, RunSettingsRoboTests
Bug: 77600932
Change-Id: I86c7f3b9830fb376b324621feb31cdfac59faee5

6 years agoFix color lint baseline.
Fan Zhang [Fri, 18 May 2018 20:27:11 +0000 (13:27 -0700)]
Fix color lint baseline.

This is broken by some automerge.

Change-Id: I520eff408ef2d071893b0ed4de3c4e58916bf9fc
Fixes: 79954469
Test: repo preupload

6 years agoRefine update process for restrict tip.
Lei Yu [Fri, 18 May 2018 20:00:03 +0000 (13:00 -0700)]
Refine update process for restrict tip.

When restrict tip update, we should also update app list unless it goes
from NEW to INVISIBLE. After that it won't show "0 apps been
restricted".

Change-Id: Iedf4288fcddfe632a9ba8c16afdfb5bc044bce2e
Fix: 79890132
Test: RunSettingsRoboTests

6 years agoUpdate color whitelist for color repohook (caused by auto-merge)
Ching-Sung Li [Fri, 18 May 2018 06:28:21 +0000 (14:28 +0800)]
Update color whitelist for color repohook (caused by auto-merge)

It's blocking CLs to be uploaded to git server becuase inconsistent code
by auto-merge

Test: Can build and upload CLs
Bug: 79954469
Change-Id: I8dfc2cb8d660c6ddc97b3e1c8f06db7db2e15cfb

6 years agoMerge "[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into...
Android Build Merger (Role) [Fri, 18 May 2018 19:35:01 +0000 (19:35 +0000)]
Merge "[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am: e7906cb910 am: f7fcdbda29  -s ours"

6 years ago[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev...
Matthew Fritze [Fri, 18 May 2018 19:34:54 +0000 (12:34 -0700)]
[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am: e7906cb910
am: f7fcdbda29  -s ours

Change-Id: Ie1456f331f0547576ca3e540733e7b0982755700

6 years agoMerge "Add controller to show the summary"
TreeHugger Robot [Fri, 18 May 2018 19:34:48 +0000 (19:34 +0000)]
Merge "Add controller to show the summary"

6 years agoMerge "Update UI when BT device is rename" into pi-dev am: 77d218ab72
hughchen [Fri, 18 May 2018 19:27:08 +0000 (12:27 -0700)]
Merge "Update UI when BT device is rename" into pi-dev am: 77d218ab72
am: 3053922340

Change-Id: I86bd3be4f017f5bd80a2308a5b1e99366027a476

6 years agoMerge "Add Intentfilter BasePreferenceController" into pi-dev
Matthew Fritze [Fri, 18 May 2018 18:59:11 +0000 (11:59 -0700)]
Merge "Add Intentfilter BasePreferenceController" into pi-dev
am: e7906cb910

Change-Id: I4205a88200dcb02ba9029721618da790cb562ea0

6 years agoMerge "Update UI when BT device is rename" into pi-dev
hughchen [Fri, 18 May 2018 18:52:02 +0000 (11:52 -0700)]
Merge "Update UI when BT device is rename" into pi-dev
am: 77d218ab72

Change-Id: I00e7f52939014e6a3079f0a0743fa982fe8abd0a

6 years agoMerge "Add Intentfilter BasePreferenceController" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 18:41:53 +0000 (18:41 +0000)]
Merge "Add Intentfilter BasePreferenceController" into pi-dev

6 years agoAdd controller to show the summary
hughchen [Fri, 11 May 2018 12:11:56 +0000 (20:11 +0800)]
Add controller to show the summary

* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/4036738 in
  master. Change android.support.* to androidx.*
* Add AdvancedConnectedDeviceController that used to show which component is available
* Add getConnectedDevices Summary Resource Id() to decide which string should be shown.
  Here have  4 cases to shown the string.
  case 1: driving mode available and NFC is availalbe, show "Bluetooth, driving mode, NFC"
  case 2: driving mode available and NFC is not availalbe, show "Bluetooth, driving mode"
  case 3: driving mode not available and NFC is availalbe, show "Bluetooth, NFC"
  case 4: driving mode not available and NFC not availalbe, show "Bluetooth"
* Add test to verify the summary string is correct in each condition
* Add test to verify getAvailabilityStatus() is AVAILABLE.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I1048355bbd344db3ab645dd1537b4259eff57f38

6 years agoAdd controller to show the summary
hughchen [Fri, 11 May 2018 12:11:56 +0000 (20:11 +0800)]
Add controller to show the summary

* Add AdvancedConnectedDeviceController that used to show which component is available
* Add getConnectedDevices Summary Resource Id() to decide which string should be shown.
  Here have  4 cases to shown the string.
  case 1: driving mode available and NFC is availalbe, show "Bluetooth, driving mode, NFC"
  case 2: driving mode available and NFC is not availalbe, show "Bluetooth, driving mode"
  case 3: driving mode not available and NFC is availalbe, show "Bluetooth, NFC"
  case 4: driving mode not available and NFC not availalbe, show "Bluetooth"
* Add test to verify the summary string is correct in each condition
* Add test to verify getAvailabilityStatus() is AVAILABLE.

Bug: 79299421
Test: make -j50 RunSettingsRoboTests ROBOTEST_FILTER=AdvancedConnectedDeviceControllerTest
Change-Id: I1048355bbd344db3ab645dd1537b4259eff57f38
Merged-In: I1048355bbd344db3ab645dd1537b4259eff57f38

6 years agoMerge "Add Intentfilter BasePreferenceController"
TreeHugger Robot [Fri, 18 May 2018 18:16:17 +0000 (18:16 +0000)]
Merge "Add Intentfilter BasePreferenceController"

6 years agoMerge "Update UI when BT device is rename" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 18:06:17 +0000 (18:06 +0000)]
Merge "Update UI when BT device is rename" into pi-dev

6 years agoMerge "Micro-cleanup in password settings"
TreeHugger Robot [Fri, 18 May 2018 17:47:53 +0000 (17:47 +0000)]
Merge "Micro-cleanup in password settings"

6 years agoMerge "Don't drop log about excessive O anomaly." into pi-dev am: a866d6bd56
Lei Yu [Fri, 18 May 2018 17:46:18 +0000 (10:46 -0700)]
Merge "Don't drop log about excessive O anomaly." into pi-dev am: a866d6bd56
am: 7ca87fe51b

Change-Id: I1aeebb2b1c8a162390adc3667d850077eed3cc56

6 years agoMerge "Don't drop log about excessive O anomaly." into pi-dev
Lei Yu [Fri, 18 May 2018 17:31:44 +0000 (10:31 -0700)]
Merge "Don't drop log about excessive O anomaly." into pi-dev
am: a866d6bd56

Change-Id: Ic35a5326c2a9be3024ad246a793e05221b2d7aca

6 years agoMerge "Rename the Utils class in settingslib.bluetooth"
TreeHugger Robot [Fri, 18 May 2018 17:29:58 +0000 (17:29 +0000)]
Merge "Rename the Utils class in settingslib.bluetooth"

6 years agoMerge "Don't drop log about excessive O anomaly." into pi-dev
Lei Yu [Fri, 18 May 2018 17:09:44 +0000 (17:09 +0000)]
Merge "Don't drop log about excessive O anomaly." into pi-dev

6 years agoMicro-cleanup in password settings
Pavel Grafov [Fri, 18 May 2018 16:03:20 +0000 (17:03 +0100)]
Micro-cleanup in password settings

Removed unused constant and member that was set and retained across instances
but never actually used.

Test: manual, set password
Bug: 30558331
Change-Id: I575bf1f0508b9441b220641715e9ca7372d9b32c

6 years agoAdd Intentfilter BasePreferenceController
Matthew Fritze [Fri, 11 May 2018 15:35:42 +0000 (08:35 -0700)]
Add Intentfilter BasePreferenceController

For settings which can change in the framework, outside of
the settings app and a slice, a Slice needs to be able to
register a listener for these changes.

Adding a getter for an IntentFilter in BasePreferenceControllers
allows us to use the SliceBroadcastRelay in SysUi to listen for
these changes.

Test: robotests
Fixes: 78138654

Change-Id: I579375069ca98fd21b60cd3a69c1a122cabf96e2
Merged-In: Ifa05b651aaa3458c54866f71469964b1a070e458

6 years agoAdd Intentfilter BasePreferenceController
Matthew Fritze [Fri, 11 May 2018 15:35:42 +0000 (08:35 -0700)]
Add Intentfilter BasePreferenceController

For settings which can change in the framework, outside of
the settings app and a slice, a Slice needs to be able to
register a listener for these changes.

Adding a getter for an IntentFilter in BasePreferenceControllers
allows us to use the SliceBroadcastRelay in SysUi to listen for
these changes.

Test: robotests
Bug: 78138654
Change-Id: Ifa05b651aaa3458c54866f71469964b1a070e458

6 years ago[automerger skipped] Merge "Add DnD as a special case Slice" into pi-dev am: 6dc6462a54
Matthew Fritze [Fri, 18 May 2018 15:00:45 +0000 (08:00 -0700)]
[automerger skipped] Merge "Add DnD as a special case Slice" into pi-dev am: 6dc6462a54
am: 6393e4bcfe  -s ours

Change-Id: I0181444b0286def4faf8dc33454da542c7cc026d

6 years agoMerge "Add DnD as a special case Slice" into pi-dev
Matthew Fritze [Fri, 18 May 2018 14:46:41 +0000 (07:46 -0700)]
Merge "Add DnD as a special case Slice" into pi-dev
am: 6dc6462a54

Change-Id: I8f6260380bb7241ebce956ff2772f7e6ee0218b6

6 years agoMerge "Add DnD as a special case Slice" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 14:41:45 +0000 (14:41 +0000)]
Merge "Add DnD as a special case Slice" into pi-dev

6 years ago[automerger skipped] Merge "Grey the previously connected device preference" into...
hughchen [Fri, 18 May 2018 04:20:22 +0000 (21:20 -0700)]
[automerger skipped] Merge "Grey the previously connected device preference" into pi-dev am: d24c9e4a80
am: 25ed11a1a7  -s ours

Change-Id: Ibb585afdcbd1e036b59219987c3e135675205387

6 years agoMerge "[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks"...
nharold [Fri, 18 May 2018 04:12:42 +0000 (21:12 -0700)]
Merge "[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am: 5ff91e4fbe am: 768e0a2f37  -s ours" into pi-dev-plus-aosp
am: 187e0a117c

Change-Id: Ia1300269e3f8b06826d119934c2b80349aed3f39

6 years agoMerge "Update condition title text color." into pi-dev am: ad031a0a4d
Doris Ling [Fri, 18 May 2018 04:11:21 +0000 (21:11 -0700)]
Merge "Update condition title text color." into pi-dev am: ad031a0a4d
am: 05a0d4f413

Change-Id: I99557205959a219f6d71af946d635aa50e5ee331

6 years agoMerge "Add DnD as a special case Slice"
TreeHugger Robot [Fri, 18 May 2018 04:06:29 +0000 (04:06 +0000)]
Merge "Add DnD as a special case Slice"

6 years agoMerge "Grey the previously connected device preference" into pi-dev
hughchen [Fri, 18 May 2018 03:48:39 +0000 (20:48 -0700)]
Merge "Grey the previously connected device preference" into pi-dev
am: d24c9e4a80

Change-Id: Ib21ad60483a97563c075f12d49b0179db44e661b

6 years agoMerge "[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks"...
Android Build Merger (Role) [Fri, 18 May 2018 03:41:13 +0000 (03:41 +0000)]
Merge "[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am: 5ff91e4fbe am: 768e0a2f37  -s ours" into pi-dev-plus-aosp

6 years agoMerge "Update condition title text color." into pi-dev
Doris Ling [Fri, 18 May 2018 03:40:58 +0000 (20:40 -0700)]
Merge "Update condition title text color." into pi-dev
am: ad031a0a4d

Change-Id: Ibb33ebb3327ed60768399ba5ad3aa18d05ba7846

6 years ago[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am: 5ff91e4fbe
nharold [Fri, 18 May 2018 03:40:32 +0000 (20:40 -0700)]
[automerger skipped] Merge changes from topic "telephony-debug-pi-tweaks" am: 5ff91e4fbe
am: 768e0a2f37  -s ours

Change-Id: I79f4451f4e534fdaaa7e18c28221c6fc35cdba11

6 years ago[Telephony Debug Menu] Redo Layout
Nathan Harold [Tue, 24 Apr 2018 20:21:19 +0000 (13:21 -0700)]
[Telephony Debug Menu] Redo Layout

Changes to the layout to better group
related fields, add more definite
boundaries, fix some alignment issues,
and put more-often-used fields closer
to the top.

Bug: 78791811
Test: manual
Change-Id: I492abe16a25d1880e4385a78247925805fe5b590

6 years ago[Telephony Debug Menu] Remove DcRtInfo
Nathan Harold [Wed, 18 Apr 2018 00:13:30 +0000 (17:13 -0700)]
[Telephony Debug Menu] Remove DcRtInfo

Remove the obsolete and unsupported DcRtInfo
field from the Debug menu. Since it doesn't
do anything and hasn't for a few releases,
we should make space for things that are
supported and minimize clutter.

Bug: 78791811
Test: manual
Change-Id: Id4cc808bf5c7671408cd5297965d93140aeefe97

6 years ago[Telephony Debug Menu] Remove NeighboringCellInfo
Nathan Harold [Wed, 18 Apr 2018 00:09:42 +0000 (17:09 -0700)]
[Telephony Debug Menu] Remove NeighboringCellInfo

This CL removes the long-obsolete NeighboringCellInfo.
From a debug perspective, this info is a subset of the
other info already present, so it just adds clutter
without adding any value.

Bug: 78791811
Test: manual
Change-Id: Iaf275f81e276f63bdd9651ac60a5485bf5bdf160

6 years agoMerge "Grey the previously connected device preference" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 03:21:57 +0000 (03:21 +0000)]
Merge "Grey the previously connected device preference" into pi-dev

6 years agoMerge changes from topic "telephony-debug-pi-tweaks"
nharold [Fri, 18 May 2018 02:29:13 +0000 (19:29 -0700)]
Merge changes from topic "telephony-debug-pi-tweaks"
am: 5ff91e4fbe

Change-Id: Ia2798429d3be242a56d8ac541668ada90ea499d7