Commit Graph

3282 Commits

Author SHA1 Message Date
TreeHugger Robot
542fe0c0c3 Merge "Add summary provider for system tile." 2016-10-14 19:56:35 +00:00
Fan Zhang
e0c253fccb Add summary provider for system tile.
Refactored getLocaleNames() into a FeatureProvider interface so it's
reusable and testable.

Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I2d31a66a4b32cfa7a364a4cfef1f6eea87084577
2016-10-14 11:08:51 -07:00
TreeHugger Robot
352c55594f Merge "Show a disclaimer about enabling vpn lockdown" 2016-10-14 12:46:15 +00:00
Doris Ling
b2c8c9cc9c Add connected devices dashboard category for new IA.
Add the initial version for the connected devices category.

Test: RunSettingsRoboTests
Bug: 31800290

Change-Id: Ibacef7d5ceaae5e71ff5e5b1c35dafa7738e4f75
2016-10-12 15:27:19 -07:00
Fan Zhang
bb93dc0242 Add a new empty dashboard for Network & Internet.
Bug: 31799836
Test: RunSettingsRoboTests
Change-Id: Ide0c07839332e615f6ba86fb87a1eb04cce2fae7
2016-10-12 10:24:42 -07:00
Robin Lee
b6f787c4df Show a disclaimer about enabling vpn lockdown
Lockdown is now the default option, not best-effort mode. It's easier
to shoot oneself in the foot now so we'll show a warning to explain that
before switching it on.

Bug: 29052115
Bug: 29076208
Test: com.android.settings.vpn2.AppSettingsTest
Change-Id: Ia6845e6a7d57baa5476b8a021fb1255fd74aabea
2016-10-07 16:27:27 +01:00
TreeHugger Robot
fbe72822b4 Merge "Remove old unused activity." 2016-10-07 02:54:30 +00:00
Lorenzo Colitti
5a63070109 resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
am: 54ec71200b

Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df
2016-10-07 01:27:38 +00:00
Fan Zhang
d56ad9dc61 Remove old unused activity.
Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
2016-10-06 17:03:37 -07:00
Lorenzo Colitti
b01c080b08 resolve merge conflicts of f2801e4 to nyc-mr1-dev
Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248
2016-10-04 02:28:58 +09:00
Hugo Benichi
f2801e46d1 Update text of wifi to cell autoswitch toggle
Bug: 31807564
Change-Id: I3332a93bca855e3d3c8d63306a116dbe7f829ae0
2016-10-04 00:56:53 +09:00
Matthew Fritze
2fb386ac8f Support dialog disclaimer text now appears properly am: adc5555acf am: bbe0e8a30b
am: 1869973e12

Change-Id: I780f4b595fe276a3898237eb42d0852e7a7a5321
2016-09-30 17:02:27 +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
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
Hugo Benichi
3d1b901e40 Update text of wifi to cell autoswitch toggle am: 1968fb1fd4 am: b00a9135ba
am: 55e04b82af

Change-Id: I5d3f8e6f7e8b158ade94cd757940d3134e6f1d81
2016-09-29 05:59:38 +00:00
Meng Wang
c59b12a4fc WiFiCallingSettings: show roaming preferrence am: fe3749dd0b am: 335b3488f9
am: 9f0d5f7e5d

Change-Id: Ie899eba9566d12534dd9bf524542c1a5f00cb38b
2016-09-29 05:55:00 +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
Meng Wang
335b3488f9 WiFiCallingSettings: show roaming preferrence
am: fe3749dd0b

Change-Id: I10a1a2e443e3c678db3fa892d4c1331339e8df85
2016-09-29 00:22:18 +00:00
Meng Wang
2f6eef699d Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev 2016-09-29 00:13:53 +00:00
Matthew Fritze
f3b1d7b580 Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b am: d522eff9e5
am: a7b7f86f1e

Change-Id: Icac895f280eb02b5cedebfec4d6b809431ea04f7
2016-09-28 23:21:51 +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
Daniel Nishi
a2e0824b26 resolve merge conflicts of a4e3842 to master
Change-Id: Ia52171f3cfa0bcb73c6a4d23122ef8ad9025e807
2016-09-28 13:20:27 -07: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
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
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
Steven Ng
d654c889b8 Merge "Provide fingerprint options for SET_NEW_PASSWORD intent" 2016-09-27 21:04:21 +00:00
Matthew Fritze
62cf9efd9b Settings suggestions now describes expand and collapse in talkback
Bug: 30314874
Change-Id: I2231148594c8e878111a754e5806c20dd4e289af
2016-09-27 13:31:15 -07:00
Ruben Brunk
9623588d81 Improve text for VR Settings. am: f345b8cb36 am: 5220c925fc
am: 14352821d0

Change-Id: Id4a9d03885dcfda744729eb3635e62f57516ad87
2016-09-27 02:30:35 +00:00
Salvador Martinez
3dd10e14e8 Added strings for advanced wifi accessibility am: 45f79c2f20 am: ba0baa312d
am: 3d710bdc70

Change-Id: I4ac7b76f50b66fccd1d04cdc7004e3ed66d6f45d
2016-09-27 02:30:07 +00:00
Ruben Brunk
5220c925fc Improve text for VR Settings.
am: f345b8cb36

Change-Id: I9fef78adc08d9a652d5e008cb019ec5d5364752a
2016-09-27 01:08:43 +00:00
Ruben Brunk
3b90cfc71e Merge "Improve text for VR Settings." into nyc-mr1-dev 2016-09-27 00:57:36 +00:00
Salvador Martinez
ba0baa312d Added strings for advanced wifi accessibility
am: 45f79c2f20

Change-Id: I5207f6b4e2c43e0aaa9e1b4e849f05e25e29b7a8
2016-09-27 00:34:40 +00:00
Salvador Martinez
04d55c4417 Merge "Added strings for advanced wifi accessibility" into nyc-mr1-dev 2016-09-27 00:26:09 +00:00
Salvador Martinez
45f79c2f20 Added strings for advanced wifi accessibility
These strings are needed for talkback to
say the correct thing when a user taps
on advanced options in the dialog to
add a new access point.

Test: Accessibility Scanner
Bug: 30079196
Change-Id: I6208cc01f6434780ba56296769cfaa05b6a6aaaa
2016-09-26 17:07:27 -07:00
Ruben Brunk
f345b8cb36 Improve text for VR Settings.
Bug: 31101223

Change-Id: I5c529e76cc6b802cae01301f67dad2e51fb4ad49
2016-09-26 15:50:53 -07:00
Stephen Chen
61462ae0ec Fix display summary string in Setup Wizard preview screen.
Bug: 31752790
Fixes: 31752790
Test: manual
Change-Id: I4f94dcd123cf9a95a6b3ef605e6575d844e338bb
2016-09-26 15:40:03 -07:00
Steven Ng
4fdcec71dc Provide fingerprint options for SET_NEW_PASSWORD intent
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-26 22:13:08 +01:00
Doris Ling
dc6f7bd0b2 Update gesture settings text. am: 8ff630966a am: 5252165f6a
am: e816be1565

Change-Id: Id12528f90bf67eb3ce66f7fe4ca2fa5b9d8c509a
2016-09-26 20:39:54 +00:00
Doris Ling
8ff630966a Update gesture settings text.
Update the preference title and summary for Ambient Display Double-tap
and Pickup gestures.

Test: manual - launch gestures settings and verify latest strings are
used.

Bug: 30595437
Change-Id: I029c2048603563ea20f5030e381a9e7a624d0e85
2016-09-26 17:19:35 +00:00
Doris Ling
430025c4d6 Split Ambient Display settings. am: 1ad58d0abf am: f89766dbab
am: 0dfe46fe58

Change-Id: I33ffaa71c09cff7a4df496c42371519367e1772c
2016-09-24 00:35:24 +00:00
Doris Ling
f89766dbab Split Ambient Display settings.
am: 1ad58d0abf

Change-Id: Ie47c7504728bb225214ee8c348af8a154cb5a1f2
2016-09-24 00:05:17 +00:00
TreeHugger Robot
4f8a703d51 Merge "Split Ambient Display settings." into nyc-mr1-dev 2016-09-24 00:00:05 +00:00
Doris Ling
1ad58d0abf Split Ambient Display settings.
1. Reverting the changes for Display->Ambient Display; this setting
   will control incoming notification pulse.
2. Added 2 separate entries in gestures settings to control pick up
   and double tap gestures-triggered pulsing for Ambient Display.
3. Added automated tests to verify the preference initializes to the
   correct default value, and also verify that toggling the preference
   updates the corresponding settings correctly.

Test: make SettingsTests

Bug: 30595437
Change-Id: I125bf75fc4ccfea126a00ffae4207fcb789f487a
2016-09-23 15:33:37 -07:00
Annie Chin
2d1e4fb063 Change 'red' to 'amber' am: f980a1239c am: e1ffa85984
am: 30dbecc7bc

Change-Id: If32f29086f59c7a216e27636e91105196f58359e
2016-09-23 22:05:52 +00:00
Meng Wang
fe3749dd0b WiFiCallingSettings: show roaming preferrence
Bug: 31492826
Change-Id: I45cd8455e84802d690d074099d6a8e9c9398e157
2016-09-23 12:09:03 -07:00