Commit Graph

27748 Commits

Author SHA1 Message Date
Philip P. Moltmann
ae23c07073 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am: f9ca06b367

Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9
2016-10-06 20:26:50 +00:00
Philip P. Moltmann
a78fced068 USB restriction is similar to media restriction
am: 13ee50be48

Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c
2016-10-06 19:55:42 +00:00
Philip P. Moltmann
f9ca06b367 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev 2016-10-01 00:16:12 +00:00
Matthew Fritze
c94ac39096 Merge "Prevent double tap on suggestions" into nyc-mr1-dev
am: d8435d57d2

Change-Id: Ia59ca2de3d5f90bb80c62ad3615197ccefc6f461
2016-09-30 22:41:33 +00:00
Matthew Fritze
ae3ad11e69 Prevent double tap on suggestions
am: 703dc60b14

Change-Id: I29e1f6aff53fc0c97ea5fabf325838981f1ef57f
2016-09-30 22:41:32 +00:00
Matthew Fritze
4de4d8801d Tablet Settings support tab has start/end padding
am: 839be498b6

Change-Id: I6e58352f95e5f5947a3d4ae111f3cf4a709462b7
2016-09-30 22:38:23 +00:00
TreeHugger Robot
d8435d57d2 Merge "Prevent double tap on suggestions" into nyc-mr1-dev 2016-09-30 22:33:46 +00:00
Philip P. Moltmann
13ee50be48 USB restriction is similar to media restriction
Bug: 31472955
Change-Id: I3682ccd102565982c434d70fc0d907b1aa779689
(cherry picked from commit 58e2b50292)
2016-09-30 21:18:14 +00:00
Matthew Fritze
839be498b6 Tablet Settings support tab has start/end padding
Change-Id: Ifdc74af0edbd1b44c4f73b497f16f8edcf647ede
Fixes: 31583422
Tests: Visual Inspection
2016-09-30 21:16:30 +00:00
Matthew Fritze
703dc60b14 Prevent double tap on suggestions
Change-Id: I963d96b75cb5d464b6f91cf0824aee6e21cfeff0
Fixes: 31856366
2016-09-30 14:13:53 -07:00
Matthew Fritze
b0722aeb88 Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev
am: cf0f301250

Change-Id: I3279202d4e7d9e836ca5173c9f4169c92c052d15
2016-09-30 00:20:29 +00:00
Matthew Fritze
bbe0e8a30b Support dialog disclaimer text now appears properly
am: adc5555acf

Change-Id: I8eefba43b0e919f502c91f5f770d446c1d17a4e3
2016-09-30 00:20:27 +00:00
Matthew Fritze
cf0f301250 Merge "Support dialog disclaimer text now appears properly" into nyc-mr1-dev 2016-09-30 00:12:55 +00:00
Garfield Tan
1ab4f4b816 Launch other info in storage in correct user id.
am: 493bf348b9

Change-Id: Iced863d798194b66b549e4213b5f813c2773ac1b
2016-09-29 23:23:50 +00:00
Matthew Fritze
adc5555acf Support dialog disclaimer text now appears properly
The string override between Settings and SettigsGoogle was not properly
distinguishing, and was defaulting to the AOSP version.

Bug: 31827726
Test: Manual
Change-Id: Iebd8681fb4f040e956f05fb0f5d96deae9eec26f
2016-09-29 22:32:10 +00:00
Garfield Tan
493bf348b9 Launch other info in storage in correct user id.
Bug: 31592290
Change-Id: I816668c7ff9d1b443d4b49e17bdcfa39ef335aee
2016-09-29 14:45:50 -07:00
Bill Yi
a69e26abbf Import translations. DO NOT MERGE am: dccfc04a3e -s ours
am: ae35fa061e  -s ours

Change-Id: Iefe3d69297ef0f4cb04ede83b2b93b523678c3ff
2016-09-29 07:57:16 +00:00
Bill Yi
ae35fa061e Import translations. DO NOT MERGE
am: dccfc04a3e  -s ours

Change-Id: Ia00dff846fc9174b6f5f4284e3d42f1ad9869ec7
2016-09-29 07:53:15 +00:00
Bill Yi
c53fb015d9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f497c48345  -s ours

Change-Id: Ie7d6c6f9bbe4af3ca3709c1557dde5e52eeb91bc
2016-09-29 07:48:48 +00:00
Bill Yi
ae3ec3984d Import translations. DO NOT MERGE
am: 4ae03656ac  -s ours

Change-Id: I69bfb0033fd813af6242dead9e30d4a1bfcd3cd6
2016-09-29 07:48:46 +00:00
TreeHugger Robot
f497c48345 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-09-29 07:40:48 +00:00
Bill Yi
dccfc04a3e Import translations. DO NOT MERGE
Change-Id: I0cd1cb776f4dda8b02f683d92cda3efedff989bb
Auto-generated-cl: translation import
2016-09-28 23:25:18 -07:00
Bill Yi
4ae03656ac Import translations. DO NOT MERGE
Change-Id: I4a6114d77d04143e22aa02f591cc6f7b75444d46
Auto-generated-cl: translation import
2016-09-28 23:20:25 -07:00
Hugo Benichi
9bd60dd8ac Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev
am: c81e1141cc

Change-Id: Idf215a22923b96129462579816e170655f99d4e8
2016-09-29 03:46:11 +00:00
Hugo Benichi
b00a9135ba Update text of wifi to cell autoswitch toggle
am: 1968fb1fd4

Change-Id: I58f87f2befc0dbcb1fa0ea43dc9255a7849984f6
2016-09-29 03:46:10 +00:00
TreeHugger Robot
c81e1141cc Merge "Update text of wifi to cell autoswitch toggle" into nyc-mr1-dev 2016-09-29 03:38:46 +00:00
Hugo Benichi
1968fb1fd4 Update text of wifi to cell autoswitch toggle
Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0
2016-09-29 11:13:32 +09:00
Matthew Fritze
493350dcf7 Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev
am: 6cafff3b2c

Change-Id: I8cc65986d6b5788ccbc8919e0788cf2db4b7fade
2016-09-29 00:27:18 +00:00
Matthew Fritze
a936610ae2 Tablet Settings Layout is no longer stretched
am: c4a9b18121

Change-Id: Ie103fd6248bd206e517c5f7de880b76862b831ba
2016-09-29 00:27:17 +00:00
Meng Wang
2c545d5bfa Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev
am: 2f6eef699d

Change-Id: Id6d84cd51171da42f21894617ec26fb48e45cfa9
2016-09-29 00:26:56 +00:00
Meng Wang
335b3488f9 WiFiCallingSettings: show roaming preferrence
am: fe3749dd0b

Change-Id: I10a1a2e443e3c678db3fa892d4c1331339e8df85
2016-09-29 00:22:18 +00:00
TreeHugger Robot
6cafff3b2c Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev 2016-09-29 00:16:24 +00:00
Meng Wang
2f6eef699d Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev 2016-09-29 00:13:53 +00:00
Matthew Fritze
cdaddb365f Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev
am: fb0d4c8534

Change-Id: Ibdbf2f289d9e74e6517f3bb4c05e3436dd699e37
2016-09-28 22:58:11 +00:00
Matthew Fritze
d522eff9e5 Settings suggestions now describes expand and collapse in talkback
am: 62cf9efd9b

Change-Id: Iba413a4b55d79d3baff5147b2a04f3c606b2f3a3
2016-09-28 22:58:10 +00:00
Matthew Fritze
fb0d4c8534 Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev 2016-09-28 22:52:26 +00:00
Matthew Fritze
c4a9b18121 Tablet Settings Layout is no longer stretched
Change-Id: If4a883077f41b859f4e8aaf92a4f397b94814137
Fixes: 31583422
Tests: Visual Inspection
2016-09-28 15:40:55 -07:00
Daniel Nishi
6ee68d167f Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev
am: 24d63d17d6

Change-Id: I62c0604a9f1216f425a9a54bf3a2a2c509645b62
2016-09-28 18:38:23 +00:00
Daniel Nishi
c409b02411 Add a warning message to the ASM toggle.
am: 116b95666f

Change-Id: I7b542d75575f6d8a5bcc08e85802dbd888c19766
2016-09-28 18:38:22 +00:00
TreeHugger Robot
24d63d17d6 Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev 2016-09-28 18:34:30 +00:00
Steven Ng
27fc8ed383 Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev
am: 2f5ab90e70

Change-Id: Ifcc5abd42137fb207f7bb588e41c0bcbbea5b243
2016-09-28 17:01:30 +00:00
Steven Ng
a2c32a3b91 DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent
am: da738b2edc

Change-Id: I74c02f4f9430ae8780b6a32e0c318174dce0c5c3
2016-09-28 17:01:26 +00:00
Steven Ng
2f5ab90e70 Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev 2016-09-28 16:55:53 +00:00
Steven Ng
da738b2edc DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent
Cherry-pick from ag/1444396

1) Added a trampoline activity to display SET_NEW_PASSWORD intent.
2) On devices that have fingerprint sensor and have no enrolled fingerprint,
   ChooseLockGeneric handles the SET_NEW_PASSWORD intent by providing
   fingerprint + {PIN/PATTERN/PASSWORD} and skip fingerprint options.

Test: See below
1) Auto
   make RunSettingsRoboTests
2) Manual
   a) Fingerprint + pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Pixel Imprint + Pattern.
      iii) Set a pattern lock.
      iv) Can enroll a fingerprint.
   b) Pattern
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Click Continue without Pixel Imprint
      iii) A list of unlock options, without fingerprint option, is shown.
      vi) Select and enroll a pattern lock
   c) Has an existing password
      i) $ adb shell am start -a android.app.action.SET_NEW_PASSWORD
      ii) Setting app asks for password input.
      iii) Enter password and click "Continue without Pixel imprint".
      vi) No password is asked. A list of unlock options, without fingerprint option, is shown.
      v) Select and enroll a pattern lock
   d) Work profile
      i) Create a work profile
      ii) adb shell am start --user x -a android.app.action.SET_NEW_PASSWORD. X is the work profile user id.
      iii) Click Pixel Imprint + Pattern.
      iv) Set a pattern lock.
      v) Can enroll a fingerprint.

Bug: 23017051
Change-Id: I6384bbffb72a5d3a83972da7474532746e4d06b9
2016-09-28 15:24:14 +00:00
Fan Zhang
e469371dac Connect button click handler for bluetooth forget dialog.
am: f8c29641da

Change-Id: I2529056af5cfa947c85dcc6633bb2b4498ac9fa6
2016-09-28 01:57:49 +00:00
Daniel Nishi
116b95666f Add a warning message to the ASM toggle.
This trigger fires if ASM is not enabled by default for
the device and the toggle is only visible if the ASM visible
flag is enabled.

Bug: 30455784
Change-Id: Id6adf8a75dbd4290f042d743689a75f496efb0c9
2016-09-27 17:46:52 -07:00
Fan Zhang
f8c29641da Connect button click handler for bluetooth forget dialog.
Bug: 31761184
Test: manual
Change-Id: I48aac6899cb9a49bf988d3b9e6480dfd6fe0c1c2
2016-09-27 22:45:58 +00:00
Salvador Martinez
bec304f4aa Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev
am: efbe5ec924

Change-Id: Ied648c479e0cb34bd08c620c36332cbbcc241056
2016-09-27 21:56:33 +00:00
Salvador Martinez
ce18d5ea14 Fixed talkback feedback for wifi menu
am: 7c59e7ab53

Change-Id: Id2a839f71ce23520cef7e69ca13c4f5c587cf4a5
2016-09-27 21:56:32 +00:00
Salvador Martinez
efbe5ec924 Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev 2016-09-27 21:52:16 +00:00