Commit Graph

13322 Commits

Author SHA1 Message Date
Fan Zhang
b69ec294c2 Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481

Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
2016-11-23 23:29:22 +00:00
Steven Ng
26a3c28735 Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
am: 046a63450f

Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
2016-11-23 23:28:38 +00:00
Jerry Zhang
fd764ac0e3 Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
am: a75fa91247

Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6
2016-11-17 00:24:50 +00:00
Jerry Zhang
a75fa91247 Refactor setCurrentFunction and setUsbDataUnlocked into one method
am: a1b60e629f

Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd
2016-11-17 00:09:38 +00:00
Sohani Rao
6cebca2599 Merge "Add WiFi toggle prompts - settings" am: b4b2c2aa43
am: 6f126a8f5c

Change-Id: I327d6c864ce58c21a74d628d1945f86ff518234c
2016-11-14 21:21:49 +00:00
Sohani Rao
6f126a8f5c Merge "Add WiFi toggle prompts - settings"
am: b4b2c2aa43

Change-Id: Idef71123fde9475a549a1ccab136564ccf3d4a4a
2016-11-14 21:14:54 +00:00
Svetoslav Ganov
e06767af78 Add WiFi toggle prompts - settings
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Bug: 28715749
Test: Unit tests
Change-Id: I10d1231ea0c47eec5993dbe367cc0c245cba9385
Merged-In: I10d1231ea0c47eec5993dbe367cc0c245cba9385
2016-11-14 10:32:39 -08:00
Juan Flores
16455893d7 Merge "Fix crash while searching in Settings" am: 176c0c5d98
am: d705a333ca

Change-Id: I31732b822a80caa52cb97c43ea093dea8c0b19cb
2016-11-02 16:45:03 +00:00
Juan Flores
d705a333ca Merge "Fix crash while searching in Settings"
am: 176c0c5d98

Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1
2016-11-02 16:42:03 +00:00
Treehugger Robot
176c0c5d98 Merge "Fix crash while searching in Settings" 2016-11-02 16:37:08 +00:00
Fan Zhang
f3e86ca481 Fix crash when opening account sync detail for external app
am: c9cdc25f41

Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
2016-11-01 17:21:36 +00:00
Fan Zhang
c9cdc25f41 Fix crash when opening account sync detail for external app
Bug: 32426306
Test: Manual, and added unit test
Change-Id: I8703c9a13a60e57d7dd2bab2ae3cf6be362e351a
(cherry picked from commit e3ad2b56c3)
2016-10-31 21:57:36 +00:00
Paul Stewart
dab924f04d Merge "Don't display an invalid Wi-Fi MAC address" am: 917b7b863c
am: 27c5edb968

Change-Id: I427261d397f0003f1e4eecd55d431441303e4b4c
2016-10-28 21:09:38 +00:00
Paul Stewart
27c5edb968 Merge "Don't display an invalid Wi-Fi MAC address"
am: 917b7b863c

Change-Id: I61b50ff7a50551e12a218d73bcf95f0c24e64430
2016-10-28 21:04:40 +00:00
Treehugger Robot
917b7b863c Merge "Don't display an invalid Wi-Fi MAC address" 2016-10-28 20:56:35 +00:00
Paul Stewart
1aeb383d73 Don't display an invalid Wi-Fi MAC address
Only display the WifiInfo MAC address if it is a valid address.
Otherwise, display "Unavailable".  The underlying WifiInfo class
now has a default value, and a method that can be used to test
whether or not the contained address is valid.  This change uses
this test and avoids having the confusing default address displayed.

Bug: 32478606
Test: Manual: Turn off WiFi and reboot -- make sure "Unavailable"
      is displayed as the Wi-Fi MAC Address as opposed to "02:00:00:00:00:00"

Change-Id: I912804eb65735375e0ca3c4618a6399543f33b57
2016-10-27 13:34:10 -07:00
Svetoslav Ganov
13088cac84 Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I5ae0c532c92b2c05a91f0d769ca6744002747fca
(cherry picked from commit b06766f129)
2016-10-26 13:30:38 -07:00
Steven Ng
046a63450f Nexus imprint setting is missing while adding corp account from SUW
am: 378dec1495

Change-Id: I829c9738c70ec8242fb2c3fdcf7eecd5ff39df7c
2016-10-25 22:15:03 +00:00
Steven Ng
378dec1495 Nexus imprint setting is missing while adding corp account from SUW
+ This is caused by the encryption interstitial result code not handled
  in ChooseLockGeneric. Change the request code of launching encryption
  interstitial screen to CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST if it
  is set new password flow.

Testing
Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   On a device (Nexus 5x) that shows encryption interstital screen and
   supports fingerprint.
   1) Nexus imprint flow (regression test)
      Fingerprint can be enrolled with the following flow.
      Settings > Security > Nexus Imprint > FingerprintEnrollIntroduction
      > ChooseLockGeneric (Unlock selection) > Encryption Interstitial
      > Password setup > Notification Interstitial
      > Find sensor and fingerprint enrollment
   2) Set new password test
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Nexus Imprint + Pattern.
      iii) Choose "Require pattern to start device"
      iv) Set a pattern lock.
      v) Choose any of the notification behavior.
      vi) Can enroll a fingerprint.

Bug: 32382952

Change-Id: Ie66ffca2e8c3cc46b5e8b619bd35986e4f41d5ab
2016-10-25 20:01:23 +00:00
Jerry Zhang
a1b60e629f Refactor setCurrentFunction and setUsbDataUnlocked into one method
This allows us to get rid of an extraneous config switch and
simplify some code.

Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit 5d36a177d9)
2016-10-25 11:02:21 -07:00
Juan Flores
92fa371a0b Fix crash while searching in Settings
A crash occurrs when power button is pressed during search in Settings
due to IndexOutOfBoundsException in HeaderViewListAdapter.
When suggestions and results are cleared,
the layouts should be invisible to solve this problem.

Bug: 27913974
Test: manual - search "font" and press power button twice

Change-Id: Ia53d393e695dbb238fc4c82a3fe52ef4250d84c1
2016-10-25 12:12:10 +09:00
Doris Ling
12ffd7aaa7 Ensure that the gesture animation video is paused properly. am: 4245ad4771
am: 5e4fce04fb

Change-Id: Ic615738b57a4ca49f5c6101e86aea03dbf0f9a12
2016-10-21 23:46:51 +00:00
Doris Ling
5e4fce04fb Ensure that the gesture animation video is paused properly.
am: 4245ad4771

Change-Id: Ib6bd653fe0f1fd0859c37df4655908e67ecc4444
2016-10-21 23:44:19 +00:00
Doris Ling
4245ad4771 Ensure that the gesture animation video is paused properly.
Add the handling to pause the animation video when user navigates away
from the gesture settings.

Test: Manual - play gesture animation videos, then switch to another app
in recents. Verifies from logcat that NuPlayerDriver is not active.
Fix: 32064123

Change-Id: I3d0fb3946e4d0d77a686aa97cfabe667862cac17
2016-10-21 14:28:54 -07:00
Fan Zhang
dd387b6739 Fix help & feedback link in data usage summary screen. am: 9b52836251
am: 7568e120cf

Change-Id: If7768bdf34204ca158dcf7e2078826a0aabc2ec7
2016-10-20 20:33:51 +00:00
Fan Zhang
7568e120cf Fix help & feedback link in data usage summary screen.
am: 9b52836251

Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674
2016-10-20 20:25:37 +00:00
TreeHugger Robot
08254e5b4f Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev 2016-10-20 20:18:44 +00:00
Fan Zhang
9b52836251 Fix help & feedback link in data usage summary screen.
The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.

Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes: 32291069
Test: manual
2016-10-20 09:13:36 -07:00
Adrian Roos
c0dfa153f4 Separate ambient display triggers am: 82829ee0b1
am: 5ba2074e31

Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c
2016-10-18 22:19:52 +00:00
Adrian Roos
5ba2074e31 Separate ambient display triggers
am: 82829ee0b1

Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
2016-10-18 22:07:11 +00:00
Adrian Roos
ee5eef1492 Merge "Separate ambient display triggers" into nyc-mr1-dev 2016-10-18 22:00:08 +00:00
jackqdyulei
ac49ccedb7 Suspend action in security patch when browser is disabled am: 013da34209
am: 221b9157b4

Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4
2016-10-18 17:09:15 +00:00
jackqdyulei
221b9157b4 Suspend action in security patch when browser is disabled
am: 013da34209

Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
2016-10-18 16:54:03 +00:00
Lei Yu
7fee46383f Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev 2016-10-18 16:45:35 +00:00
jackqdyulei
013da34209 Suspend action in security patch when browser is disabled
When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.

Bug: 32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.

Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10
2016-10-17 14:35:15 -07:00
Adrian Roos
82829ee0b1 Separate ambient display triggers
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.

Bug: 32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
2016-10-17 14:05:53 -07:00
Doris Ling
fccee6adae Add static preview images to gesture settings. am: 12e4bebabf
am: df7b815980

Change-Id: I56c1f9368bb762e400e0a071e72dd175351a7696
2016-10-17 20:24:26 +00:00
Doris Ling
df7b815980 Add static preview images to gesture settings.
am: 12e4bebabf

Change-Id: I4f5f16b109c4997b15b93320945bbb3ccab06735
2016-10-17 20:18:30 +00:00
Doris Ling
ec5314f2f5 Merge "Add static preview images to gesture settings." into nyc-mr1-dev 2016-10-17 20:11:31 +00:00
Sanket Padawe
a049c988e7 Fix multi-sim popup issue in data usage. am: 8591f26fa3
am: d8fc77122b

Change-Id: Idbe5e19e8ce5660e4a056b28917fccca5477cc9e
2016-10-17 17:25:04 +00:00
Sanket Padawe
d8fc77122b Fix multi-sim popup issue in data usage.
am: 8591f26fa3

Change-Id: If23388f4fb2211af239aef7043cceb2ec2dd13e8
2016-10-17 17:18:34 +00:00
Sanket Padawe
8591f26fa3 Fix multi-sim popup issue in data usage.
+ Avoid sending popup dialog when data is enabled on currently active
data sim.

Bug: 31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
2016-10-14 15:41:52 -07:00
Qi Ding
051c1b298d Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d
am: 85768b3723

Change-Id: I7bb1c3b3a5dbb1ee4e6d8934a7be542076d1e863
2016-10-13 01:34:08 +00:00
Qi Ding
85768b3723 Merge "Fix searched item isn't highlighted" am: 363c529dc6
am: 1d07de566d

Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06
2016-10-13 01:28:00 +00:00
Dan Sandler
67d326d2b4 Suppress notif block/silence settings for essential packages. am: acf763e996
am: 80df316ac4

Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92
2016-10-12 13:57:49 +00:00
Dan Sandler
80df316ac4 Suppress notif block/silence settings for essential packages.
am: acf763e996

Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
2016-10-12 13:51:04 +00:00
Daniel Sandler
0f6ae3aa87 Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev 2016-10-12 13:38:56 +00:00
Doris Ling
ef980e4dd1 Remove pickup gesture settings if sensor is not found. am: 94e0da52fc
am: 79aa718669

Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0
2016-10-12 00:35:58 +00:00
Doris Ling
79aa718669 Remove pickup gesture settings if sensor is not found.
am: 94e0da52fc

Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
2016-10-12 00:23:46 +00:00
Doris Ling
12e4bebabf Add static preview images to gesture settings.
Set the animation preview image view to the newly added preview image
instead of loading it from animation video.

Test: manual - launch gesture settings and visually check the animation
preview images.

Bug: 31636637

Change-Id: If25a0e3501bea0c6343326a143d665ec79e3d7c7
2016-10-11 16:44:58 -07:00