Commit Graph

3147 Commits

Author SHA1 Message Date
Steven Moreland
68b580f346 Merge "Revert "Development Options: toggle binderized hals""
am: 21de66bc0c

Change-Id: If9288dda590a4f7fe5a60faeec695045e038ead1
2017-03-28 01:18:00 +00:00
Steven Moreland
544c820ac7 Revert "Development Options: toggle binderized hals"
This reverts commit 73dd0ae30e.

Reason for revert: b/34274385 - This was a temporary setting.

Change-Id: I98b2d05c431bb5361b11cd3b05b7f5ac4e939e0e
2017-03-23 05:07:53 +00:00
Andrew Sapperstein
251c91d974 Finalize string for usage alerts.
am: 59fd24cde2

Change-Id: I79519e4c1f04dd2eee32320b4d8c4482fd4f2830
2017-01-27 03:39:48 +00:00
Andrew Sapperstein
59fd24cde2 Finalize string for usage alerts.
Test: manual
Bug: 34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
2017-01-26 17:30:30 -08:00
Steven Moreland
7ea5b6d740 Merge "Development Options: toggle binderized hals" am: 5f854f39a8 am: 8076dcde0c
am: ec0e1fb59f

Change-Id: I7bb618cdbe0bc925b214b9184652864ad6b5a8ba
2017-01-26 10:06:43 +00:00
Steven Moreland
8076dcde0c Merge "Development Options: toggle binderized hals"
am: 5f854f39a8

Change-Id: Id05768135b0609e917f4e1888caf2724ebf9ba3a
2017-01-26 10:01:15 +00:00
Steven Moreland
73dd0ae30e Development Options: toggle binderized hals
This allows for quick performance testing and also for a better
dogfooding experience.

Bug: 34256441
Test: Verification with getprop.
Change-Id: I81c5e0b1044d4569a6fe55a4b30f7e21c4465fc2
2017-01-25 22:03:45 -08:00
Robin Lee
cb1968148a Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f am: fde3c6d74a
am: 185275e0ad

Change-Id: If1956964597ad1885dde00f23c55a4492f867977
2017-01-19 23:31:21 +00:00
Robin Lee
fde3c6d74a Merge "Clear VPN after Clear credentials if VPN is being established"
am: 4ce19f5c4f

Change-Id: Ib35450b0c389da1bbba311c05d1d0346eb612b9e
2017-01-19 23:13:04 +00:00
insight.lee
03159e4c85 Clear VPN after Clear credentials if VPN is being established
1. There is no way to disconnect VPN after 'Clear credentials'
without removing whole Internet connection because VPN profile to
disconnect is removed when Clear credentials.

2. This commit checks whether VPN is being established or not when
Clear credentials and disconnect VPN if VPN is being established.
Lastly, this shows a toast message to inform VPN disconnected.

Test: manual - took a photo

Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Bug: 29093779

Change-Id: Id5ea01c8731b3b0fca2a31d9d84e8c103952b377
2017-01-18 10:44:57 +09:00
Jaewoong Jung
c360bc5813 Adds a menu item for additional battery info to battery settings.
am: 7b557df0e4

Change-Id: Iaef847979f64bf93b87457fa3f2f734b1789c830
2017-01-13 22:40:38 +00:00
Jaewoong Jung
7b557df0e4 Adds a menu item for additional battery info to battery settings.
This is a manual cherry-pick of commit
1e0f8ff5e5.

Bug: 33352540
Test: No additional test failures.

Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a
2017-01-13 12:58:44 -08:00
Ruchi Kandoi
e40f036ab3 Merge "Update Android Beam feature summary string" am: 27a59e1d2c am: abe9a41d19
am: 662975d861

Change-Id: I6bad7c49519869dd60e130e5a31cf3514b0896c1
2017-01-05 18:14:58 +00:00
Ruchi Kandoi
abe9a41d19 Merge "Update Android Beam feature summary string"
am: 27a59e1d2c

Change-Id: I6edef06c6e0c94dc8c5d27003f19b60b2f6c5f4c
2017-01-05 18:08:22 +00:00
Ruchi Kandoi
de2f8e7cc1 Update Android Beam feature summary string
Bug: 32183480
Test: compiles
Change-Id: I750e998ea73b10645666c7d080afe7320b705d47
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-04 23:44:40 +00:00
Pankaj Kanwar
642e48e527 Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev 2016-12-22 20:41:55 +00:00
pkanwar
675122ad51 DO NOT MERGE: Add UI toggle to control connections to carrier networks.
Bug: 31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
2016-12-22 09:39:12 -08:00
Youhan Wang
70b47859fa DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
am: d9b3709fc1

Change-Id: I4f10d79d7dcd29a59c1ac0823f394cbb3e76256d
2016-12-21 00:37:24 +00:00
Youhan Wang
d9b3709fc1 DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
Failed Treehugger automerge to master, will be cherry-picked to master
manually.

Bug:32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
2016-12-20 12:37:12 -08:00
Jeremy Joslin
1fed0c6ae7 Merge "New pref toggle for network recommendations." am: a5249906ab am: 2b03ffb264
am: 6061ca1b1a

Change-Id: I05753f7a5d54cd7707531c0a6cd9491c081454b3
2016-12-19 22:09:52 +00:00
Jeremy Joslin
2b03ffb264 Merge "New pref toggle for network recommendations."
am: a5249906ab

Change-Id: I7f39f341077bcc403c06d08a87d394f0f25f6356
2016-12-19 22:02:23 +00:00
Jeremy Joslin
fbcff7a6b2 New pref toggle for network recommendations.
Adding a new toggle to control whether network
recommendations are enabled.

Removed the "Use open networks" pref and its associated strings
and components as it's no longer needed.

Test: Built and ran.
BUG: 33549591
BUG: 33270391
Change-Id: I03069ca30d06089600ca958f8da117564189f839
Merged-In: I7248ac32e0598d82107c150372c1fe4e9e2243a5
Merged-In: I82eed6dc7daef1c622ea4e33ce42c331e0cd786d
2016-12-18 10:33:28 -08:00
Svetoslav Ganov
c6a074c80d DO NOT MERGE 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: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
2016-12-12 09:44:39 -08:00
Nathan Harold
70ab95ee63 Add Ims Registration Info to RadioInfo
am: 839b9f9733

Change-Id: I18a64c82bf853b86da4fe99981b1b8d6f5955643
2016-12-09 22:23:33 +00:00
Nathan Harold
839b9f9733 Add Ims Registration Info to RadioInfo
Replaced not used pdp list.

Bug:32874442
Change-Id: Iadb21a3108aaaa3afcde3972e6f98bfbbd5413f1
2016-12-06 14:54:56 -08: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
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
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
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
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
2f6eef699d Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev 2016-09-29 00:13:53 +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
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
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
3b90cfc71e Merge "Improve text for VR Settings." into nyc-mr1-dev 2016-09-27 00:57:36 +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
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
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
Meng Wang
fe3749dd0b WiFiCallingSettings: show roaming preferrence
Bug: 31492826
Change-Id: I45cd8455e84802d690d074099d6a8e9c9398e157
2016-09-23 12:09:03 -07:00
TreeHugger Robot
0ae282b26e Merge "Change 'red' to 'amber'" into nyc-mr1-dev 2016-09-23 00:11:08 +00:00
Annie Chin
f980a1239c Change 'red' to 'amber'
Change-Id: I36e4815165a12d33ce4aaad446acae19897be138
Fixes: 31628145
2016-09-22 10:26:06 -07:00