Fan Zhang
d9f7fba943
Fix context leak in AudioSwitchPreferenceController.
...
In this controller the context is stored into a global singleton but was
not cleared, thus leaking context and associated views.
Change-Id: I4247f8ff753bc0a331c6c81a0e4b5b4bc41588de
Bug: 80507279
Test: robotests
Test: inspected hprof before/after change
2018-06-07 22:46:19 +00:00
TreeHugger Robot
60f2f06855
Merge "Don't crash on null Intent in FingerprintEnrollFindSensor"
2018-06-05 19:52:53 +00:00
TreeHugger Robot
4d142c992b
Merge "Add null check in displayPreference"
2018-06-05 18:14:17 +00:00
Beverly
b77145401f
Add null check in displayPreference
...
Change-Id: I3afaa3f587dc5c9989d5e520f1c8a0b33e57ec7d
Fixes: 109740402
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-06-05 13:05:12 -04:00
Atanas Kirilov
6ffc5c43b2
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours am: 71046c3d10 -s ours am: bed0aff4a2 -s ours
...
am: 5a996aa7fe
2018-06-04 18:57:37 -07:00
Atanas Kirilov
e190f40dae
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53 am: 128334d2c6
...
am: 8006c6a726
2018-06-04 18:51:33 -07:00
Atanas Kirilov
5573ff9140
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 am: 463ea747f6 am: 25bd78d7e9
...
am: f97fc8eb17
2018-06-04 18:49:11 -07:00
Atanas Kirilov
1582b6450a
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 am: 0d59c0d23d am: a6b728c5a3
...
am: dabefd5d43
2018-06-04 18:40:28 -07:00
Atanas Kirilov
aa05ba6b6f
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 am: 2f38890832 am: 5dfb976b21
...
am: c114a65956
2018-06-04 18:31:55 -07:00
Atanas Kirilov
0ab302bc3a
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c am: f2a135ec5a
...
am: 224968eebd
2018-06-04 18:19:38 -07:00
Atanas Kirilov
5a996aa7fe
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours am: 71046c3d10 -s ours
...
am: bed0aff4a2
2018-06-04 18:17:44 -07:00
Atanas Kirilov
8006c6a726
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3 am: 5e66879b53
...
am: 128334d2c6
2018-06-04 17:47:54 -07:00
Atanas Kirilov
f97fc8eb17
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1 am: 463ea747f6
...
am: 25bd78d7e9
2018-06-04 17:46:21 -07:00
Atanas Kirilov
dabefd5d43
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778 am: 0d59c0d23d
...
am: a6b728c5a3
2018-06-04 17:41:57 -07:00
Atanas Kirilov
bed0aff4a2
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours am: b072779789 -s ours
...
am: 71046c3d10
2018-06-04 17:41:55 -07:00
Atanas Kirilov
c114a65956
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9 am: 2f38890832
...
am: 5dfb976b21
2018-06-04 17:31:09 -07:00
Atanas Kirilov
224968eebd
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3 am: a50293f72c
...
am: f2a135ec5a
2018-06-04 17:18:51 -07:00
Atanas Kirilov
71046c3d10
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev am: 8994d1f0a4 -s ours
...
am: b072779789
2018-06-04 17:10:35 -07:00
Shuzhen Wang
cca6aac897
[automerger skipped] Merge "Revert "Settings: Add logical camera default switch"" into pi-dev am: 1db4027355
...
am: 7ed1343d0a
2018-06-04 17:06:26 -07:00
Atanas Kirilov
b072779789
[automerger skipped] Merge "Merge translations of Bluetooth confirmation text" into oc-dev
...
am: 8994d1f0a4
2018-06-04 16:59:14 -07:00
Atanas Kirilov
128334d2c6
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4 am: dededea9f3
...
am: 5e66879b53
2018-06-04 16:46:48 -07:00
Atanas Kirilov
25bd78d7e9
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94 am: 67892acff1
...
am: 463ea747f6
2018-06-04 16:45:39 -07:00
Atanas Kirilov
a6b728c5a3
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52 am: a29108a778
...
am: 0d59c0d23d
2018-06-04 16:42:39 -07:00
Atanas Kirilov
5dfb976b21
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb am: 65db9c47b9
...
am: 2f38890832
2018-06-04 16:41:45 -07:00
Atanas Kirilov
f2a135ec5a
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e am: 74d98110f3
...
am: a50293f72c
2018-06-04 16:40:10 -07:00
Atanas Kirilov
5e66879b53
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am: 9b4f5525b4
...
am: dededea9f3
2018-06-04 16:14:11 -07:00
Atanas Kirilov
463ea747f6
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am: 75f0072c94
...
am: 67892acff1
2018-06-04 16:13:02 -07:00
Atanas Kirilov
0d59c0d23d
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev am: 438cf9da52
...
am: a29108a778
2018-06-04 16:10:32 -07:00
Atanas Kirilov
2f38890832
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am: 9e626734bb
...
am: 65db9c47b9
2018-06-04 16:09:33 -07:00
Atanas Kirilov
a50293f72c
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev am: 826b14e43e
...
am: 74d98110f3
2018-06-04 16:07:36 -07:00
Shuzhen Wang
7ed1343d0a
Merge "Revert "Settings: Add logical camera default switch"" into pi-dev
...
am: 1db4027355
2018-06-04 16:06:07 -07:00
TreeHugger Robot
0e902e0d78
Merge "Suppress work-profile search terms when no AfW is on device"
2018-06-04 23:03:30 +00:00
Atanas Kirilov
dededea9f3
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
...
am: 9b4f5525b4
2018-06-04 15:43:14 -07:00
Atanas Kirilov
67892acff1
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
...
am: 75f0072c94
2018-06-04 15:41:42 -07:00
Atanas Kirilov
a29108a778
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
...
am: 438cf9da52
2018-06-04 15:39:29 -07:00
Atanas Kirilov
65db9c47b9
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
...
am: 9e626734bb
2018-06-04 15:38:17 -07:00
Fan Zhang
3f34335e2e
Suppress work-profile search terms when no AfW is on device
...
- Share the same set of pref controller between main UI and search
in AccountDashboardFragment.
- Update WorkSoundPreferenceController to actually do something for
updateNonIndexable() method.
- LockscreenDashboardFragment to also suppress "Work notification" header. I
think we just missed it previously.
Change-Id: Ifa6f9b2077c9810ffff33f240929f418d4a8a5aa
Fixes: 62167659
Test: robotests
2018-06-04 22:37:42 +00:00
Atanas Kirilov
74d98110f3
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
...
am: 826b14e43e
2018-06-04 15:36:29 -07:00
TreeHugger Robot
6029c63884
Merge "Clean up some search nonIndexableKeys."
2018-06-04 20:55:49 +00:00
TreeHugger Robot
1db4027355
Merge "Revert "Settings: Add logical camera default switch"" into pi-dev
2018-06-04 20:45:51 +00:00
Atanas Kirilov
8994d1f0a4
Merge "Merge translations of Bluetooth confirmation text" into oc-dev
2018-06-04 20:37:42 +00:00
Atanas Kirilov
9b4f5525b4
Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev
...
* changes:
[automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a108cb3edaab176eaa85ee20b700ac1a0b8f3fe3a108cb3edaab176eaa85ea0b8f3fe3a108cb3edaaa0b8f3fe3a
2018-06-04 20:25:15 +00:00
Atanas Kirilov
75f0072c94
Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5ed423eadcf7304aaf293e9345782e2c874b450af7d505aefa5ed423eadcf7304aaf293e9345782e27d505aefa5ed423eadcf7304aaf2937d505aefa5ed423eadcf7d505aefa5
2018-06-04 20:24:37 +00:00
Atanas Kirilov
438cf9da52
Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 732b65ca4d
2018-06-04 20:24:34 +00:00
Atanas Kirilov
9e626734bb
Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff714a82795313ba2ea1e53e2d1bae1bd88bc91c3b8b3e48235bf63f8d33ff714a82795313ba2ea1e53e2d1bae1bd88bc91c3b8b3f8d33ff714a82795313ba2ea1e53e2d1bae1bd83f8d33ff714a82795313ba2ea1e53e3f8d33ff714a827953133f8d33ff71
2018-06-04 20:24:25 +00:00
Atanas Kirilov
826b14e43e
Merge changes from topic "am-b95e3cad-9610-4d9b-96a8-a82f585400e6" into oc-dev
...
* changes:
[automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17e30d0145eadb9aa0fbfe9e0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17e30d0145eade0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85f93ee1bd17ee0eeafcb5d5b4de5e724cb66517282874c51780f551be9a85fe0eeafcb5d5b4de5e724cb66517282874c51780fe0eeafcb5d5b4de5e724cb66517282e0eeafcb5d5b4de5e724e0eeafcb5d
2018-06-04 20:24:19 +00:00
Fan Zhang
7c1233116b
Clean up some search nonIndexableKeys.
...
- Make the entire gesture setting page unsearchable. This is safe
because each row in gesture setting page lead to a child page, we are
only removing duplicates.
- Make the pref controller for System -> gesture return
AVILABLE_UNSEARCHABLE so it's also suppressed.
- Suppres the parent page for adaptive brightness.
Bug: 72748524
Test: manual
Change-Id: Id7317f5f126af88b1bde8d87b8a206d9909df904
2018-06-04 18:50:44 +00:00
Bill Yi
0614f76677
[automerger skipped] Import translations. DO NOT MERGE am: d9bd267146 -s ours
...
am: 170d5415bc
2018-06-04 11:26:33 -07:00
Antony Sargent
ba8ae71025
Merge translations of Bluetooth confirmation text
...
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.
Bug: 62672248
Test: manual
Change-Id: I829baada46cdb2314021d8772feb8811072e41d8
Merged-In: I2d8c57680d1d98b74193654e9fe77016304f6ac5
2018-06-04 18:05:34 +00:00
Shuzhen Wang
8f9fc06a18
Revert "Settings: Add logical camera default switch"
...
This reverts commit a9578a2b8a
2018-06-04 17:37:25 +00:00
