Commit Graph

46722 Commits

Author SHA1 Message Date
Atanas Kirilov
a29108a778 Merge changes from topic "am-6c725c0d-a5b4-4cf2-92c6-c4d99a39a459" into oc-dev
am: 438cf9da52

Change-Id: I0964b2320f0b6d55923847bbba779bb8ee5c2794
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

Change-Id: I6536e0423a261da7232b6229d96019fea35f5bfe
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

Change-Id: If4056f03d27f845d30862b04dcbdb119141f2bf8
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: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
  [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a
  Merge translations of Bluetooth confirmation text
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: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2 skipped: c874b450af
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293 skipped: e9345782e2
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf skipped: 7304aaf293
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5 skipped: ed423eadcf
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 7d505aefa5
  Merge translations of Bluetooth confirmation text
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
  Merge translations of Bluetooth confirmation text
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: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b skipped: 3e48235bf6
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
  Merge translations of Bluetooth confirmation text
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: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead skipped: b9aa0fbfe9
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e skipped: 30d0145ead
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f skipped: 93ee1bd17e
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f skipped: 551be9a85f
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282 skipped: 874c51780f
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724 skipped: cb66517282
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d skipped: 5b4de5e724
  [automerger skipped] Merge translations of Bluetooth confirmation text skipped: e0eeafcb5d
  Merge translations of Bluetooth confirmation text
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  -s ours

Change-Id: I5adca8586469006ca8b38f0849335d2a9325658a
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.

Test: Build
Bug: 80007047
Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
2018-06-04 17:37:25 +00:00
TreeHugger Robot
04af70a604 Merge "Revert "Settings: Add logical camera default switch"" 2018-06-04 17:35:57 +00:00
Android Build Merger (Role)
80381d7ff8 [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e am: e20b700ac1
Change-Id: Ib56a32b88c58c7b1a54ba4522cd9bf4bd80cd6e5
2018-06-04 17:23:18 +00:00
Android Build Merger (Role)
e20b700ac1 [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa am: b176eaa85e
Change-Id: Ib1f576348a4e89028ddb3d731ecdc1c92599723d
2018-06-04 17:23:16 +00:00
Android Build Merger (Role)
b176eaa85e [automerger] Merge translations of Bluetooth confirmation text am: a0b8f3fe3a skipped: 108cb3edaa
Change-Id: I0d88fc2ba7016327ab0ebbe05b016c4585ee965f
2018-06-04 17:23:08 +00:00
Bill Yi
170d5415bc [automerger skipped] Import translations. DO NOT MERGE
am: d9bd267146  -s ours

Change-Id: I40fc59c193077ee76cf2e1a47e8039ef08df123f
2018-06-04 10:12:58 -07:00
Bill Yi
d9bd267146 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I7d788703ce218cc211305bf078fde78ce7dde2af
2018-06-03 14:55:40 -07:00
TreeHugger Robot
e763ebcba1 Merge "Add Wifi calling Preference slice and other cleanup" 2018-06-01 22:32:11 +00:00
TreeHugger Robot
4661045f2c Merge "Add Slices for Enhanced 4G LTE" 2018-06-01 21:28:11 +00:00
TreeHugger Robot
b6ce6d3663 Merge "Removed guest user access to Tap & Pay via Search." 2018-06-01 19:06:39 +00:00
Bill Yi
05e543299c [automerger skipped] Import translations. DO NOT MERGE am: 8c56825ecd -s ours
am: 5236bf8780  -s ours

Change-Id: Ibdb9322f8935be31ef56c583bc90ab4ac5a49c39
2018-06-01 11:23:28 -07:00
Bill Yi
5236bf8780 [automerger skipped] Import translations. DO NOT MERGE
am: 8c56825ecd  -s ours

Change-Id: I3a9cfd19929f45a1d551c2e09d5b7e67103a89aa
2018-06-01 11:19:28 -07:00
Matthew Ng
dd3964986a Avoids systemui color tint flicker because no system ui flags set
Systemui nav buttons set the insensity from launcher and -1 window but
fallback home does not. This causes services to pass the wrong flags to
system ui to apply the incorrect tint that would later be fixed by
launcher and sometimes lead to color flicker.

Fixes: 79776583
Test: use bright color wallpaper (nav dark icons) and reboot phone,
unlock with pin/pass/finger and view nav buttons

Change-Id: I86906cd1b5af5d078499a1392c260aa186b2eee8
2018-06-01 11:11:14 -07:00
Naina Nalluri
6b1869351a Add Wifi calling Preference slice and other cleanup
WifiCallingPreference Slice Provider:
  1. If Wifi calling is not enabled - display message to user
     to enable Wifi calling
  2. Else if Wifi preference is not editable - return a null
     Slice
  3. Else provide a slice with rows - first row giving current pref
     information, followed by preference items (in each row).
     wifi_only is displayed only when it is allowed to display it.
     Each row with preference item has specific intent action.
WifiCallingPreference Slice BroadcastReceiver:
   1. If only Wifi calling is enabled & Wifi preference is editable &
      there is a change in current value modify wifi pref setting
   2. And Ask to re-query the slice in one second to display
      updated settings if 1 is valid or display appropriate message.
Clean-up:
   1. Return null instead of non-actionable slices.
   2. Use getText to get string resources.
   3. Remove unnecessary extra variables.

Bug: 79548264
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I186f19be2007c2331eaf6195e70b4a9c635adf9e
2018-06-01 11:02:59 -07:00
Andre Garivay
6d48242da7 Removed guest user access to Tap & Pay via Search.
Gathered user info to verify that user is not a guest. If user is a
guest (and only a guest: other alternate users may use the feature),
they are not allowed to load the nfc_payment_settings xml file.

Change-Id: I5700b9cd4b639b031b6d464827d16f4ea4cfa03f
Fixes: 80111261
Test: Robotests
2018-06-01 09:57:23 -07:00
Beverly
23ea118788 Increase char limit to 76 for Settings string
Test: n/a
Change-Id: I97ac988fc85e8e7cbde516d9d8ad2dc86dee7e80
Fixes: 80200230
2018-06-01 10:14:15 -04:00
TreeHugger Robot
eec3faea44 Merge "Fix null pointer in StarredContactsPrefController" 2018-06-01 12:07:30 +00:00
TreeHugger Robot
8885e93f90 Merge "Import translations. DO NOT MERGE" 2018-06-01 06:06:36 +00:00
Ryan Lin
1e7e455495 Merge "Handle Bluetooth is not supported on emulator" into pi-dev am: 942b07da93
am: 15eb7fe8c4

Change-Id: I515f9679afa7962fda4f2d04392007d201468070
2018-05-31 22:41:53 -07:00
Bill Yi
8c56825ecd Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I67611d91d92e62641467382da0079497eb5dcd06
2018-05-31 22:05:33 -07:00
Bill Yi
cd69e1f808 Import translations. DO NOT MERGE
Change-Id: I01a0990e89de81507a540cbaa6b1bd1b2de3b2f9
Auto-generated-cl: translation import
2018-05-31 21:25:44 -07:00
Ryan Lin
15eb7fe8c4 Merge "Handle Bluetooth is not supported on emulator" into pi-dev
am: 942b07da93

Change-Id: I9977e19cc055effe3c9ce91a2665462957a97481
2018-05-31 17:16:12 -07:00
Ryan Lin
942b07da93 Merge "Handle Bluetooth is not supported on emulator" into pi-dev 2018-05-31 23:22:30 +00:00
Beverly
dc0c9a0ab9 Merge "No need for "and" - ListFormatter adds it" into pi-dev am: fa01fcb2c9
am: 60d57976bc

Change-Id: I77f7aa7076786c6f3855f9b976cfa70e23f0d8a0
2018-05-31 16:03:12 -07:00
Matthew Fritze
adff8a2643 Merge "Make Settings Slider Slices one row" into pi-dev am: 4199198ec2
am: 2c7fe6f8ea

Change-Id: I0910df206d702cc348371c57da27ddf698faa6ff
2018-05-31 15:38:17 -07:00
Shuzhen Wang
6cd426482e Revert "Settings: Add logical camera default switch"
This reverts commit 5aab8d9ee1.

Reason for revert: This setting is for internal QC purpose only
Bug: 80007047

Change-Id: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
2018-05-31 22:29:29 +00:00
TreeHugger Robot
2760369d4f Merge "Added keyword 'bug' to Send Device Feedback" 2018-05-31 21:35:15 +00:00
Beverly
1aa6826e80 Fix null pointer in StarredContactsPrefController
Change-Id: I9b2209825b30a6cc8dfe355632201b8082572dbb
Fixes: 80084826
Test: ZenModeStarredContactsPreferenceControllerTest.java
2018-05-31 17:29:08 -04:00
Beverly
60d57976bc Merge "No need for "and" - ListFormatter adds it" into pi-dev
am: fa01fcb2c9

Change-Id: If899d486356937f740a959f1ca6d94b8675d857a
2018-05-31 14:24:11 -07:00
Antony Sargent
9ceb587ede Don't crash on null Intent in FingerprintEnrollFindSensor
During a run of the setup wizard, a tester one time encountered a case
where the 'Accept Legal terms' screen followed by the Security screen
showed for a second time after already confirming the pattern in the
Security screen. The logs showed a crash in
FingerprintEnrollFindSensor.onActivityResult which could only have
happened if it was called with a requestCode of CONFIRM_REQUEST and a
resultCode of RESULT_OK, but a null Intent.

This isn't an expected flow, and AFAIK we haven't been able to reproduce
the original problem, but it seems reasonable to at least not crash in
settings, so this CL defends against that crash by just calling finish()
in this case, which means the caller who started the
FingerprintEnrollFindSensor will see the default result code of
Activity.RESULT_CANCELLED.

Bug: 80099085
Test: make -j RunSettingsRoboTests
Change-Id: I94401eabe295e4d5396cf7d324fbf1902dc45f6d
2018-05-31 14:22:38 -07:00
Matthew Fritze
2c7fe6f8ea Merge "Make Settings Slider Slices one row" into pi-dev
am: 4199198ec2

Change-Id: I3716adf421c539c4a4f0617a5ab8d1a1f89e7cbc
2018-05-31 11:37:19 -07:00
TreeHugger Robot
fa01fcb2c9 Merge "No need for "and" - ListFormatter adds it" into pi-dev 2018-05-31 18:12:00 +00:00
Josh Hou
606222da7f Add Slices for Enhanced 4G LTE
Add Slices for Enhanced 4G LTE
Enhanced 4G LTE Slice Provider:
Create slice to display appropriate message with further instructions
Enhanced 4G LTE Slice Broadcast Reciver:
1. Change the setting via ImsManager
2. Ask to requery the slice in one second to display updated settings if 1 is valid or display appropriate message

Bug: 79270171
Test: Robotests
Test: Use support-slices-demos-debug.apk to test on device
Change-Id: I48d412de94d5d9f1ad42a299691ec5cf8001c6a1
2018-05-31 10:34:00 -07:00
TreeHugger Robot
4199198ec2 Merge "Make Settings Slider Slices one row" into pi-dev 2018-05-31 16:03:25 +00:00
Beverly
ab5a016e26 No need for "and" - ListFormatter adds it
Test: manual, visual inspection
Change-Id: I5ce1442cc762c9c0ca22827df429dc64714c2f20
Fixes: 80303010
2018-05-31 09:32:26 -04:00