Doris Ling
cd885f057a
Merge "Fix monkey crash on selecting account sync prefernece."
2018-06-06 18:44:56 +00:00
Beverly
da412f07e5
If zen settings are updated, don't show onboarding
...
Change-Id: I33c328e5d90f1b948c7dacb2e7f6265a1e496d35
Bug: 109668117
Test: ZenOnboardingActivity
2018-06-06 14:24:12 -04:00
yuemingw
a2a593dd3b
Check EnforcedAdmin to see if location is locked down by device policy.
...
Bug: 78563793
Test: m -j RunSettingsRoboTests
and manually via TestDPC
Change-Id: Iad2f11bde51bf6c321beb3c4709d53971a8e40c7
2018-06-06 13:46:40 +01:00
hughchen
68b9bb68c5
Change the string
...
Change name of "Received files" to "Files received via Bluetooth"
Bug: 78247635
Test: make -j42 RunSettingsRoboTests
Change-Id: I63cb7a5179008380a70929102bcd9eba38b07387
2018-06-06 14:28:05 +08:00
TreeHugger Robot
a809c439a9
Merge "Fix gray out previously connected device preference issue"
2018-06-06 05:26:29 +00:00
TreeHugger Robot
ddfb21113e
Merge "Add a flashlight slice in settings."
2018-06-06 04:07:35 +00:00
Doris Ling
d0a8fcb2ed
[automerger skipped] Only add entry with unique package name to default browser list. am: 688d1d81cb
...
am: 6e6ed32a03
2018-06-05 20:10:40 -07:00
Steven Wu
97915b15d9
Add a flashlight slice in settings.
...
- It retrieves the flashlight status from Settings.Secure.
- It uses the broadcast relay to update flashlight status
without action on the slice.
Test: robotests
Change-Id: Ib4d636541f5166b8634326cce76aed5665989b76
Fixes: 74913192
2018-06-06 02:59:37 +00:00
Doris Ling
6e6ed32a03
Only add entry with unique package name to default browser list.
...
am: 688d1d81cb
2018-06-05 19:42:15 -07:00
TreeHugger Robot
66f666d70b
Merge "No-op clean up on UserSettings to make it more readable"
2018-06-06 01:28:42 +00:00
Doris Ling
688d1d81cb
Only add entry with unique package name to default browser list.
...
When we query the package manager for activities that can handle the
web data uri, different capable activities within the same package will
be returned as separate entries. However, when we show the default
browser apps to the user, the entries are simply base on package name.
So, if there are multiple activities within the same package that can
handle the web data, they will be shown as duplicate entries.
When we process the resolved activities, check the corresponding package
name for duplicate entries before adding it to the default browser list.
Change-Id: I4e1f1e1ea22781efe24d791b367246423ca7a3c4
Merged-In: I70c88866eb3d5fe6466554749e23c85f429dd30c
Fixes: 84207432
Test: make RunSettingsRoboTests
2018-06-05 17:48:30 -07:00
Doris Ling
366418dab7
Fix monkey crash on selecting account sync prefernece.
...
When running monkey, the authority in the preference might not have been
properly set. Add a check for valid authority before trying to update
the sync automatically setting.
Change-Id: I59f910565fc9f128e86bd92337135fe46fed12e1
Fixes: 80551551
Test: make RunSettingsRoboTests
2018-06-05 17:36:12 -07:00
TreeHugger Robot
c42b1d1c09
Merge "Only add entry with unique package name to default browser list."
2018-06-06 00:32:39 +00:00
Fan Zhang
d63c8ef3b9
No-op clean up on UserSettings to make it more readable
...
Bug: 72319180
Test: existing tests
Change-Id: Ie7a327658d1fe16055aad7e90ecffc1e56eb6657
2018-06-05 16:29:32 -07:00
Doris Ling
1503b0273b
Only add entry with unique package name to default browser list.
...
When we query the package manager for activities that can handle the
web data uri, different capable activities within the same package will
be returned as separate entries. However, when we show the default
browser apps to the user, the entries are simply base on package name.
So, if there are multiple activities within the same package that can
handle the web data, they will be shown as duplicate entries.
When we process the resolved activities, check the corresponding package
name for duplicate entries before adding it to the default browser list.
Change-Id: I70c88866eb3d5fe6466554749e23c85f429dd30c
Fixes: 84207432
Test: make RunSettingsRoboTests
2018-06-05 15:28:27 -07:00
Fan Zhang
44931d1e96
Properly suppress zen mode entry from soundsetting page.
...
Change-Id: If2c033232b05753f3ba52bb986dd6c85cab6e452
Fixes: 72748524
Test: robotests
2018-06-05 15:10:45 -07:00
Fan Zhang
752350c8d8
Suppress prevent ringer gesture parent page in search.
...
The full page verion of prevent ringing is still searchable.
- Created a new controller for parent entry.
- On the child controller, inherit the same getAvailabilityStatus() but
override AVILABLE_UNSEARCHABLE to AVAILABLE so it becomes searchable.
Fixes: 72748524
Test: existing robotests for PreventRingingPreferenceController
Change-Id: Id2454db110c81b59fa4a98338602b03de0812f8a
2018-06-05 15:10:45 -07: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
