Commit Graph

15016 Commits

Author SHA1 Message Date
TreeHugger Robot
91a4c542d1 Merge "resolve merge conflicts of af840b5 to master" 2016-09-30 16:58:49 +00:00
Garfield Tan
dbd039a6de resolve merge conflicts of af840b5 to master
Change-Id: I8a31d08dae71d5cb71ae01c06ead4ebf32f89121
2016-09-29 18:08:25 -07:00
Matthew Fritze
1869973e12 Support dialog disclaimer text now appears properly am: adc5555acf
am: bbe0e8a30b

Change-Id: I42f693c150af45e2a6c57d82c30d0b5ffc9dd0ed
2016-09-30 00:22:26 +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
Meng Wang
c77206f536 Merge "WifiCallingSettings: remove MetricsLogger" 2016-09-30 00:02:00 +00:00
Garfield Tan
af840b584d Launch other info in storage in correct user id. am: 493bf348b9
am: 1ab4f4b816

Change-Id: I93d5222647efd84eb6c1d159c053455fbb382c13
2016-09-29 23:29:21 +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
TreeHugger Robot
96fa06ebf7 Merge "Use DashboardFeatureProvider to load homepage tiles." 2016-09-29 21:19:34 +00:00
TreeHugger Robot
4fac4648b3 Merge "Maintain focus on switch for a11y" 2016-09-29 20:03:48 +00:00
Meng Wang
ee54eb8ffe WifiCallingSettings: remove MetricsLogger
Test: make
Change-Id: Ifd9ac2f6b35bd851f29189c090e49c0728730ec0
2016-09-29 12:36:45 -07:00
Fan Zhang
a96a2d8d60 Use DashboardFeatureProvider to load homepage tiles.
Adding support to homepage category.

Test: SettingsRoboTests for regression. Will write tests for new feature
soon once we are set on the data structure.
Bug: 31781480

Change-Id: I25fa367fecb643f17e23f0182df7585bf1fcdd02
2016-09-29 12:31:10 -07:00
TreeHugger Robot
0231d64190 Merge "Settings timeout for suggestions" 2016-09-29 18:44:24 +00:00
Salvador Martinez
d969a5f53d Settings timeout for suggestions
If loading suggestions takes too long (750ms)
settings will display just the categories
so the user does not get confused.

Test: Forthcoming
Bug: 31203004
Change-Id: Ic9866a5ccdcef965908db8c4592435a5d252f7b0
2016-09-29 18:39:47 +00:00
Salvador Martinez
8807594800 Maintain focus on switch for a11y
Modified subsetting where user can toggle
if an app should be able to modify system
settings so that talkback announces state
change properly.

Test: Accessibility Scanner, Manual Verification
Bug: 31755538
Change-Id: I54ad016b5edb0937b77cfdeef0cfcae24a78e2a2
2016-09-29 18:02:38 +00:00
Lei Yu
f4c5904863 Merge "Add classloader for RtlCompatibleViewPager" 2016-09-29 16:52:37 +00:00
Narayan Kamath
6fd19a1d70 WifiCallingSettings: Fix build.
Test: make
Change-Id: Ic22e32c960380fd6c2a6fa959d613941d13d815b
2016-09-29 15:10:17 +01:00
Matthew Fritze
202193109b Tablet Settings Layout is no longer stretched am: c4a9b18121 am: a936610ae2
am: fa7aa9663e

Change-Id: I7865b06593fc99cabe78dac7bb4a3574dea79404
2016-09-29 05:59:08 +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
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
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
9f0d5f7e5d WiFiCallingSettings: show roaming preferrence am: fe3749dd0b
am: 335b3488f9

Change-Id: I9a6d86727a29991056f452b74bcc5632bb8750a9
2016-09-29 00:30:54 +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
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
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
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
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
a2e0824b26 resolve merge conflicts of a4e3842 to master
Change-Id: Ia52171f3cfa0bcb73c6a4d23122ef8ad9025e807
2016-09-28 13:20:27 -07: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
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
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
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
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
Stephen Chen
e9a91a9ab3 Merge "Fix cancel button behavior when setting data limit." 2016-09-27 23:02:00 +00:00