Commit Graph

3184 Commits

Author SHA1 Message Date
Doris Ling
e1aa184bb6 Merge "Log preference change as Integer instead of Long." into oc-mr1-dev am: 7074e25a0e
am: cb5b48df7a

Change-Id: I8f321efc5f8df7c767f6d10e3fa944d65058aa96
2017-08-10 04:02:08 +00:00
Doris Ling
cb5b48df7a Merge "Log preference change as Integer instead of Long." into oc-mr1-dev
am: 7074e25a0e

Change-Id: I2e0994f910863ad892f6008f27cbcc59a6e3c1ef
2017-08-10 03:54:12 +00:00
TreeHugger Robot
7074e25a0e Merge "Log preference change as Integer instead of Long." into oc-mr1-dev 2017-08-10 03:41:07 +00:00
TreeHugger Robot
c4d8c456ed Merge "Move tests from tests/app/ to tests/unit/" 2017-08-10 02:52:37 +00:00
Doris Ling
9906395fa3 Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev am: db56114b34
am: 3503851ee1

Change-Id: I7587f70afd9b0ed0dc4f7351871b6095a3610c8f
2017-08-10 02:32:36 +00:00
Fan Zhang
3f6c90eb34 Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev am: 5b820431d3
am: a8f7f745e1

Change-Id: Ifd5618ddad3fcc9a535fe719470e67946bcd9d2d
2017-08-10 02:30:57 +00:00
Daniel Nishi
591c654fb7 Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e am: 8bbc28a95b
am: 6df5c65f45

Change-Id: I4cc89e8bebedc294c6c30ca6456f86f48a9a46b4
2017-08-10 02:22:09 +00:00
Salvador Martinez
f3692132ca Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193 am: 7bc388d823
am: 35c0949b2e

Change-Id: I3f7f56e233c8fe4b06269ef031fdce43800cf782
2017-08-10 02:20:50 +00:00
Ajay Nadathur
3253b7ee7c Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
am: b9c3eb954a

Change-Id: Ie7d1d6bd37274ac70c87fc6b8dca5f3118a64a64
2017-08-10 02:20:25 +00:00
Justin Klaassen
27ef303dd1 Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am: d59854de24
am: 6652cfcd7e

Change-Id: I25161af9d86997b2d0808590fc0a89f8a3b16d04
2017-08-10 02:19:12 +00:00
Doris Ling
3503851ee1 Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev
am: db56114b34

Change-Id: I696eb7a3267febf3ad8f21d7c5e9e7887bafb59e
2017-08-10 01:53:50 +00:00
TreeHugger Robot
db56114b34 Merge "Initialize the volume seekbar preference max and progress." into oc-mr1-dev 2017-08-10 01:41:45 +00:00
Fan Zhang
a8f7f745e1 Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev
am: 5b820431d3

Change-Id: I269323c219ccd8e5d343b62bfbc6160959f5340f
2017-08-10 00:37:34 +00:00
Doris Ling
9dbd807ea1 Log preference change as Integer instead of Long.
Change-Id: I3dc93a4b8a5aa7f03bef05d39bd4504ed205334f
Fix: 64485529
Test: make RunSettingsRoboTests
2017-08-09 17:36:02 -07:00
TreeHugger Robot
5b820431d3 Merge "Delete DynamicindexableContentMonitor & all refs to it" into oc-mr1-dev 2017-08-10 00:28:03 +00:00
Fan Zhang
e3535d9998 Delete DynamicindexableContentMonitor & all refs to it
Convert input device search into a search query loader

And remove old logic from DynamicIndexableContentMonitor

Change-Id: If652b1ea7c8add9185bbd025055e14925d3a8eec
Bug: 64310452
Bug: 63831980
Test: robotests
2017-08-09 17:27:02 -07:00
Justin Klaassen
0a982f39c2 DO NOT MERGE - Ask device owner for master clear in demo mode
am: a22c8345fa

Change-Id: Idf0f52476201a55c6d3a8051158e0ea3a7f555b0
2017-08-10 00:23:52 +00:00
Doris Ling
109bb5e59a Move tests from tests/app/ to tests/unit/
- first round: move tests that currently pass

Bug: 62103184
Test: make SettingsUnitTests
Change-Id: Ief3adf88e5090621e5ec3957a71d1b56b4be186a
2017-08-09 17:12:46 -07:00
Daniel Nishi
6df5c65f45 Merge "Expose the notification-swipe controls." into oc-dr1-dev am: c075f8943e
am: 8bbc28a95b

Change-Id: I2f52d59322a5b5f3960aa686adca06451ca87d13
2017-08-09 22:51:45 +00:00
Daniel Nishi
8bbc28a95b Merge "Expose the notification-swipe controls." into oc-dr1-dev
am: c075f8943e

Change-Id: I479a411c032df7426d89838a668f4303c4d67a54
2017-08-09 22:37:34 +00:00
Justin Klaassen
a22c8345fa DO NOT MERGE - Ask device owner for master clear in demo mode
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 15:37:01 -07:00
Doris Ling
b7490bea28 Initialize the volume seekbar preference max and progress.
When the media stream is set, initialize the preference max and progress
with the streams current value. Otherwise, when we initialize the seekbar
volumizer, it will first set the seekbar max to 0 and progress to 0,
then update with the correct value, which will result in the jank that
is seen when the sound settings are displayed.

Change-Id: I515c97bbc6ec38bbe92755e3d7cb53bb13ac52d0
Fix: 34035654
Test: make RunSettingsRoboTests
2017-08-09 13:56:13 -07:00
Salvador Martinez
35c0949b2e Merge "Update availability for mobile network" into oc-dr1-dev am: 4bcc3eb193
am: 7bc388d823

Change-Id: I33cb44239c0725efd34611c06ed1734a6898d943
2017-08-09 20:28:30 +00:00
Ajay Nadathur
b9c3eb954a Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am: 0ed0319005

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
2017-08-09 20:27:45 +00:00
Salvador Martinez
7bc388d823 Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193

Change-Id: I8dca27c407709961ed28c64b76304894d5456781
2017-08-09 20:21:32 +00:00
TreeHugger Robot
0ed0319005 Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev 2017-08-09 20:15:20 +00:00
Justin Klaassen
6652cfcd7e Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
am: d59854de24

Change-Id: I244bebfc463e3d045556a74a2de0cb9ef5f862af
2017-08-09 20:01:40 +00:00
TreeHugger Robot
d59854de24 Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev 2017-08-09 19:40:03 +00:00
Daniel Nishi
b2da45dd09 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev
am: 97e0e42959

Change-Id: I14f7ce1b372520d52f6e91e047aea15e764f18a3
2017-08-09 19:27:58 +00:00
Matthew Fritze
8efbe4e120 Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev
am: 3161375f78

Change-Id: Iea4b58025fbc83557b4eb37940931eb0b831cc45
2017-08-09 19:26:10 +00:00
Daniel Nishi
97e0e42959 Merge "Add floats to the SecureSettings shadow." into oc-dr1-dev 2017-08-09 19:25:35 +00:00
TreeHugger Robot
3161375f78 Merge "Fix DataSaverBackend objects created on background threads" into oc-dr1-dev 2017-08-09 19:15:27 +00:00
Matthew Fritze
e69329cc84 Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev am: e0c0616d6f
am: f9831dc7be

Change-Id: Ic310159af3c87a4d91445806c65976457c6ae2c0
2017-08-09 18:57:08 +00:00
Matthew Fritze
f9831dc7be Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
am: e0c0616d6f

Change-Id: I4c63b3c4fad2824d45cc6637d08074a7fb3059fd
2017-08-09 18:37:19 +00:00
TreeHugger Robot
e0c0616d6f Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev 2017-08-09 18:22:21 +00:00
Fan Zhang
b5a5cc251a Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev am: 293899d5ce
am: 25f9060ab7

Change-Id: I7c55bfcfb82be93e2902ef51e159115cbf6851d3
2017-08-09 18:17:29 +00:00
Fan Zhang
471f603ea5 Merge "Misc fixes for settings" into oc-mr1-dev am: 54d816fd90
am: e809b806f9

Change-Id: I1a1b5f2833389f0e40fe5a3a1e4b8e47db5ec9d3
2017-08-09 18:16:57 +00:00
Fan Zhang
25f9060ab7 Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
am: 293899d5ce

Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
2017-08-09 18:04:15 +00:00
Fan Zhang
e809b806f9 Merge "Misc fixes for settings" into oc-mr1-dev
am: 54d816fd90

Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
2017-08-09 18:03:29 +00:00
TreeHugger Robot
293899d5ce Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev 2017-08-09 17:53:22 +00:00
TreeHugger Robot
54d816fd90 Merge "Misc fixes for settings" into oc-mr1-dev 2017-08-09 17:52:49 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00
Justin Klaassen
3025727e16 Ask device owner for master clear in demo mode
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 10:44:19 -07:00
TreeHugger Robot
9010ba4479 Merge "Remove old VPN tests which instrumented Settings" 2017-08-09 16:40:42 +00:00
Daniel Nishi
5f3f655ad2 Merge "Expose the notification-swipe controls." into oc-dr1-dev
am: c075f8943e

Change-Id: If4e022ce3189995eade9b7ef8ce131bf97be71b3
2017-08-09 16:30:01 +00:00
Daniel Nishi
c075f8943e Merge "Expose the notification-swipe controls." into oc-dr1-dev 2017-08-09 16:16:49 +00:00
Matthew Fritze
7c1825aa64 Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I7396107e4ed06982c8cd300912ce1f4e3c63df4c
Merged-In: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-09 02:06:42 +00:00
Matthew Fritze
c6211c8829 Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-08 19:03:43 -07:00
Salvador Martinez
3781030b94 Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193

Change-Id: I1f99651b28ba8576769d0efdb1283c4f6da46695
2017-08-09 01:20:24 +00:00
Fan Zhang
816efc02fc Refresh preferences when background data switch is toggled
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes: 64466310
Test: robotests
2017-08-08 17:38:28 -07:00