Commit Graph

32070 Commits

Author SHA1 Message Date
Stephen Chen
fb9693d83b Wrap layout content so that "Open by default" view does not scroll.
Bug: 29088583
Change-Id: I2f4d102b2997042bf06778f2094d8dcd0b5d15f7
Fixes: 29088583
Test: Visually verified
2016-09-28 18:46:51 -07:00
jackqdyulei
0bfee2799d Add classloader for RtlCompatibleViewPager
To avoid BadParcelableException when reload the activity after it
is killed by OS.

Bug: 31707097
Test: make SettingsTests && adb install -r \
${OUT}/data/app/SettingsTests/SettingsTests.apk && \
adb shell am instrument -w \
'com.android.settings.tests/android.support.test.runner.AndroidJUnitRunner'

Change-Id: Ic8f20d9e2d236f0bea96071a88fbc6e7ba856f54
2016-09-28 17:56:04 -07:00
Matthew Fritze
7d79557c56 Merge "Tablet Settings Layout is no longer stretched" into nyc-mr1-dev am: 6cafff3b2c
am: 493350dcf7

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

Change-Id: Ib6d604f753d3424d67396c9e051829cad43d6d76
2016-09-29 00:36:04 +00:00
Meng Wang
82812ff668 Merge "WiFiCallingSettings: show roaming preferrence" into nyc-mr1-dev am: 2f6eef699d
am: 2c545d5bfa

Change-Id: I06bdabaabc3baec3faa82182cf8e0d0e208e252b
2016-09-29 00:35:49 +00:00
Meng Wang
9f0d5f7e5d WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
am: 335b3488f9

Change-Id: I9a6d86727a29991056f452b74bcc5632bb8750a9
2016-09-29 00:30:54 +00: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
72648f9ec5 Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev am: fb0d4c8534 am: cdaddb365f
am: e8dd48370b

Change-Id: Ib05a5e65c2d9eb9899825ad16181802cbfc0be6b
2016-09-28 23:22:07 +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
e8dd48370b Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev am: fb0d4c8534
am: cdaddb365f

Change-Id: I712be7226887900a0810c692615c5c3a39bf7c10
2016-09-28 23:01:26 +00:00
Matthew Fritze
a7b7f86f1e Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b
am: d522eff9e5

Change-Id: I95c7c1e9f7e3cec8dc9d439b480b78b2520730fb
2016-09-28 23:01:12 +00:00
Jaewoong Jung
03ceac7636 Merge "Deligates some themes.xml attributes to dimens.xml." 2016-09-28 23:00:00 +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
Jaewoong Jung
97e8c99172 Deligates some themes.xml attributes to dimens.xml.
Bug: 31448445
Test: Inspected manually.
Change-Id: Ifda3424287cde4474eb20be53c3ff3e54e6eba5e
2016-09-28 15:57:42 -07: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
ec59822764 Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6 am: 6ee68d167f
am: 6a7a181be4

Change-Id: Ib2674883fa6e5cf90f8875b3d8ee0a53b4c25c08
2016-09-28 22:13:52 +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
6a7a181be4 Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev am: 24d63d17d6
am: 6ee68d167f

Change-Id: I9984e28b7535acd4c63dfaf9187d7787c847d2b5
2016-09-28 18:41:40 +00:00
Daniel Nishi
a4e3842b1e Add a warning message to the ASM toggle. am: 116b95666f
am: c409b02411

Change-Id: Id1e13a14aeb24917da0e5a78421b09b385ea0818
2016-09-28 18:41:24 +00: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
TreeHugger Robot
176478c282 Merge "Make icon size are the same in factory reset account list." 2016-09-28 17:51:30 +00:00
Steven Ng
5b4b9de3f3 Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev am: 2f5ab90e70 am: 27fc8ed383
am: a2fb0055aa  -s ours

Change-Id: I9517d9cc4773c2c8578ba6c3707bdb88f392d687
2016-09-28 17:07:20 +00:00
Steven Ng
76745fc7cb DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc am: a2c32a3b91
am: 2d83e3a357  -s ours

Change-Id: I4ee505b11ae0bfd56f7f608a4d32fbf735f2df57
2016-09-28 17:07:14 +00:00
Steven Ng
a2fb0055aa Merge "DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent" into nyc-mr1-dev am: 2f5ab90e70
am: 27fc8ed383

Change-Id: Id769c6f609e2c5667a5b13e911d8543afb48cc04
2016-09-28 17:04:04 +00:00
Steven Ng
2d83e3a357 DO NOT MERGE Provide fingerprint options for SET_NEW_PASSWORD intent am: da738b2edc
am: a2c32a3b91

Change-Id: If52fe6c02e707465a074527221fbe851ad51085a
2016-09-28 17:03:57 +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
Lei Yu
d9ab1dfeeb Merge "Add talk back for regulatory info" 2016-09-28 16:44:18 +00:00
Fan Zhang
6b2bb39c2b Make icon size are the same in factory reset account list.
Change-Id: I74779471a3fb7b99b515203ddba3aca6b0cd588b
Fix: 31791627
Test: Visual inspection
2016-09-28 09:07:44 -07:00
Tony Mantler
43d4c41c8b Merge "Catch all data set changes" 2016-09-28 15:54:46 +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
84e6446ca8 Connect button click handler for bluetooth forget dialog. am: f8c29641da am: e469371dac
am: c4a53b367e

Change-Id: Ie0968931c918718417948214b6ba7d54733c91cf
2016-09-28 02:04:26 +00:00
Fan Zhang
c4a53b367e Connect button click handler for bluetooth forget dialog. am: f8c29641da
am: e469371dac

Change-Id: I442d8074737cbbfc788bb0f7be155119aad40d3b
2016-09-28 02:01:04 +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
TreeHugger Robot
195a29e9bf Merge "Add feature provider for dashboard." 2016-09-28 00:54:05 +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
TreeHugger Robot
eaec1622f5 Merge "Fix robolectric tests" 2016-09-27 23:25:33 +00:00
Stephen Chen
e9a91a9ab3 Merge "Fix cancel button behavior when setting data limit." 2016-09-27 23:02:00 +00: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
f0d6a79fc9 Merge "Fixed talkback feedback for wifi menu" into nyc-mr1-dev am: efbe5ec924 am: bec304f4aa
am: b3d77264e1

Change-Id: I4f69b8b6470fe0d3de818d39ded544a463c19fca
2016-09-27 22:02:16 +00:00