Commit Graph

3932 Commits

Author SHA1 Message Date
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
662975d861 Merge "Update Android Beam feature summary string" am: 27a59e1d2c
am: abe9a41d19

Change-Id: I0a2cf7b82818102adc857cd38007a6e3ba7b4dd9
2017-01-05 18:11:54 +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
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
6061ca1b1a Merge "New pref toggle for network recommendations." am: a5249906ab
am: 2b03ffb264

Change-Id: Ie4f4255740559a3018ba84df0084ff94995aa87d
2016-12-19 22:06:22 +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
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
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
Anna Galusza
5bf1f668ff Fix insufficint contrast on Vision Settings toggles.
am: e212817785

Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
2016-10-20 03:38:11 +00:00
Anna Galusza
e212817785 Fix insufficint contrast on Vision Settings toggles.
Bug: 29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
2016-10-19 15:41:00 -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
ec5314f2f5 Merge "Add static preview images to gesture settings." into nyc-mr1-dev 2016-10-17 20:11:31 +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
Doris Ling
94e0da52fc Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.

Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.

Bug: 32072298

Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
2016-10-11 14:23:59 -07:00
Doris Ling
c8b7555fc9 Add condition check for double tap gesture settings.
Only shows the double tap gesture preference if the config is enabled.

Test: manual - launch gesture settings on different devices and check
for double tap preference. Auto test pending.
Bug: 31930457

Change-Id: Id972f60035d0c74f0832395f0229691cd3296d60
2016-10-04 15:31:58 -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
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
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
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
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
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
Daniel Nishi
59d2b185f3 Merge "Fix a deprecated config string name for the storage manager settings." into nyc-mr1-dev 2016-09-27 16:37:00 +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
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
Daniel Nishi
b3405649fa Fix a deprecated config string name for the storage manager settings.
The old string was used for configuration purposes, but the change was
removed. A previous patch accidentally used the old string for
choosing if the activity was exported or not.

Bug: 31621740

Change-Id: I9471e3a4c6d64d3fb8be7cbfcf058d35364892a5
2016-09-26 11:40:55 -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
Daniel Nishi
3843dd96f5 Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev 2016-09-23 22:19:12 +00:00
Meng Wang
fe3749dd0b WiFiCallingSettings: show roaming preferrence
Bug: 31492826
Change-Id: I45cd8455e84802d690d074099d6a8e9c9398e157
2016-09-23 12:09:03 -07:00