Commit Graph

31811 Commits

Author SHA1 Message Date
TreeHugger Robot
fbe72822b4 Merge "Remove old unused activity." 2016-10-07 02:54:30 +00:00
Bill Yi
65629f36c0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours am: f0be222981 -s ours
am: 4d6ff7e669  -s ours

Change-Id: Ifc72d70787d079c2e53d5ec7a39d4da4163b2a5d
2016-10-07 01:28:19 +00:00
Bill Yi
88b083f02e Import translations. DO NOT MERGE am: 8aee525418 -s ours am: 47f6271d15 -s ours
am: b30d988a1c  -s ours

Change-Id: I430a63f2b012f187ce9a0efe6b9f97182a5af8cb
2016-10-07 01:28:05 +00:00
Lorenzo Colitti
8e4f0035c1 Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a am: bb529c267d
am: 03cbc81f32

Change-Id: I7ae22e05a1f58b396f4543a68a73c8b209ec14b4
2016-10-07 01:27:53 +00:00
Lorenzo Colitti
5a63070109 resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
am: 54ec71200b

Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df
2016-10-07 01:27:38 +00:00
Matthew Fritze
9fa8e96b6f Prevent monkey tests from crashing with race conditions am: 7ac78f2daf am: 9264154bee
am: 927007dd53

Change-Id: I74f45c284e8cde00af46562fb0903a856ea05de4
2016-10-07 01:27:24 +00:00
Bill Yi
1943100912 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours am: ffae7d82c3 -s ours
am: c8ef13d120  -s ours

Change-Id: Ic0c4a0ba5246c2cff4db7064d1ca4ff5f3bbf89e
2016-10-07 01:27:08 +00:00
Bill Yi
02c28ed262 Import translations. DO NOT MERGE am: ae33f8e62c -s ours am: b1f3f659f1 -s ours
am: 5fb2b6c1c5  -s ours

Change-Id: I5260308dca7fe09bde379cf57f2378fef3693a71
2016-10-07 01:26:52 +00:00
Philip P. Moltmann
b2d459b970 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367 am: ae23c07073
am: 96d81b1332

Change-Id: I9469b566e8682162271992f3175c5153c4668614
2016-10-07 01:26:36 +00:00
Philip P. Moltmann
e98d7e074d USB restriction is similar to media restriction am: 13ee50be48 am: a78fced068
am: 58154e8c27

Change-Id: Ic59c247b316a26640bda84b82c001254e01abe74
2016-10-07 00:35:19 +00:00
Fan Zhang
d56ad9dc61 Remove old unused activity.
Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
2016-10-06 17:03:37 -07:00
Stephen Chen
9d66f6f738 Merge "Fix icon loading in EditUserInfo dialog on orientation change." 2016-10-06 22:36:52 +00:00
TreeHugger Robot
840208bc77 Merge "Use a Digit TtsSpan for pairing pins for talkback." 2016-10-06 22:12:30 +00:00
Bill Yi
4d6ff7e669 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours
am: f0be222981  -s ours

Change-Id: I22381a4a7bc572765718c6003769431b0974567c
2016-10-06 21:00:03 +00:00
Bill Yi
b30d988a1c Import translations. DO NOT MERGE am: 8aee525418 -s ours
am: 47f6271d15  -s ours

Change-Id: I9f2c7f8ffce896e53ca32192b6902760b9939bb2
2016-10-06 20:59:44 +00:00
Lorenzo Colitti
03cbc81f32 Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a
am: bb529c267d

Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331
2016-10-06 20:59:31 +00:00
Lorenzo Colitti
54ec71200b resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08
am: be3924c1b6

Change-Id: Ifecf71ed6b0c756fb59ce8fa4293aebb68158f89
2016-10-06 20:59:17 +00:00
Matthew Fritze
927007dd53 Prevent monkey tests from crashing with race conditions am: 7ac78f2daf
am: 9264154bee

Change-Id: If30a93ce12ee3100f6fea14f4765e3428b122ad3
2016-10-06 20:59:03 +00:00
Bill Yi
c8ef13d120 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours
am: ffae7d82c3  -s ours

Change-Id: Iff1708277ff2827a631228d4c4a286e503543190
2016-10-06 20:58:50 +00:00
Bill Yi
5fb2b6c1c5 Import translations. DO NOT MERGE am: ae33f8e62c -s ours
am: b1f3f659f1  -s ours

Change-Id: Ibb7e5a0d26b14095d632979a5e57fd8bed9966f1
2016-10-06 20:58:37 +00:00
Philip P. Moltmann
96d81b1332 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
am: ae23c07073

Change-Id: I9ccd46e5d5d15685dccf8b9a3dbd5a82b56d6bda
2016-10-06 20:58:22 +00:00
Bill Yi
f0be222981 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: f91ca6bcd9  -s ours

Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10
2016-10-06 20:28:13 +00:00
Bill Yi
47f6271d15 Import translations. DO NOT MERGE
am: 8aee525418  -s ours

Change-Id: If58e31763e5f3b014126005d2816532323aa13f3
2016-10-06 20:28:12 +00:00
Lorenzo Colitti
bb529c267d Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
am: 365d95b69a

Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a
2016-10-06 20:27:51 +00:00
Lorenzo Colitti
be3924c1b6 resolve merge conflicts of f2801e4 to nyc-mr1-dev
am: b01c080b08

Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a
2016-10-06 20:27:49 +00:00
Matthew Fritze
9264154bee Prevent monkey tests from crashing with race conditions
am: 7ac78f2daf

Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
2016-10-06 20:27:36 +00:00
Bill Yi
ffae7d82c3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 0d424ef9bd  -s ours

Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9
2016-10-06 20:27:09 +00:00
Bill Yi
b1f3f659f1 Import translations. DO NOT MERGE
am: ae33f8e62c  -s ours

Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122
2016-10-06 20:27:08 +00:00
Philip P. Moltmann
ae23c07073 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am: f9ca06b367

Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9
2016-10-06 20:26:50 +00:00
Fan Zhang
71ab9605a3 Use a Digit TtsSpan for pairing pins for talkback.
Fixes: 31539689
Test: manually enabled talkback and focused on bt pairing pin. Verified
read-out is digits instead of a big number.

Change-Id: I71c53094762a71459e70485470684c515053b600
2016-10-06 13:17:06 -07:00
Philip P. Moltmann
58154e8c27 USB restriction is similar to media restriction am: 13ee50be48
am: a78fced068

Change-Id: Icb1dbfba6cf3e1a5097cc32b33330b8025e6c46d
2016-10-06 20:07:13 +00:00
Philip P. Moltmann
a78fced068 USB restriction is similar to media restriction
am: 13ee50be48

Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c
2016-10-06 19:55:42 +00:00
TreeHugger Robot
9a54e843a7 Merge "Add test for new DashboardFragment and PreferenceController" 2016-10-06 19:22:21 +00:00
TreeHugger Robot
ced3676723 Merge "Import translations. DO NOT MERGE" 2016-10-06 18:02:34 +00:00
Fan Zhang
e6c60c24a8 Add test for new DashboardFragment and PreferenceController
Also added a FakeFeatureFactory to make it easier to mock different
FeatureProviders.

Bug: 31781480
Test: make RunSettingsRoboTests
Change-Id: Ie45db601e0bec951d7ef983ec2e3ca747ec1c3af
2016-10-06 10:33:01 -07:00
Stephen Chen
94d0b1674c Fix icon loading in EditUserInfo dialog on orientation change.
UserSettings loads icons asynchronously, so an incorrect icon is loaded
on orientation change.

Bug: 30088727
Change-Id: I29b15ede4f7c3ca7e67b035a086271eccd075426
Fixes: 30088727
Test: Visual inspection
2016-10-05 18:06:03 -07:00
Bill Yi
dd98e45e6e Import translations. DO NOT MERGE
Change-Id: Ie36226fd9be0469ed8263fd156f9a7e28d4fe6cc
Auto-generated-cl: translation import
2016-10-05 17:29:27 -07:00
TreeHugger Robot
0cff709a0d Merge "Add search provider for storage dashboard." 2016-10-05 23:59:24 +00:00
TreeHugger Robot
7b1060022c Merge "Switch to static warning threshold when adopting." 2016-10-05 19:24:33 +00:00
Jeff Sharkey
9157360179 Switch to static warning threshold when adopting.
See rationale and details in inline comment block.

Test: adopt slow and fast SD cards
Bug: 29990216
Change-Id: I927d683db5e43216ee0837290ee4ca23a55a5dbb
2016-10-05 11:47:36 -06:00
Fan Zhang
31a285387d Add search provider for storage dashboard.
Bug: 31800690
Test: manual
Change-Id: Icb906bf3b3698c1379e10cf6e346d489675ad940
2016-10-04 17:52:05 -07:00
Fan Zhang
1d4495f985 Merge "Update signature when calling CategoryManager.get." 2016-10-05 00:14:54 +00:00
Fan Zhang
6ede9fbd83 Merge "Add storage dashborad page." 2016-10-05 00:10:27 +00:00
Jeff Sharkey
d89ef643ab Merge "Give CTS the handle it expects to remove PIN." 2016-10-04 22:19:36 +00:00
Fan Zhang
1fb1526af7 Update signature when calling CategoryManager.get.
Bug: 31781480
Test: compiles
Change-Id: Iee715aca3767a67728527ba9390787d3f8a7e5fe
2016-10-04 15:18:02 -07:00
Fan Zhang
bb6d2608e9 Add storage dashborad page.
Refactor shared dashboard page display logic between storage and
system page.

Bug: 31800690
Test: RunSettingsRoboTests

Change-Id: I7eb86f590b79ab871bdb383fb2f5326790beb193
2016-10-04 14:06:57 -07:00
Fan Zhang
27991718e5 Merge "Add search provider for system dashboard fragment." 2016-10-04 19:52:15 +00:00
Jeff Sharkey
159dff63a5 Give CTS the handle it expects to remove PIN.
When the Direct Boot tests go to remove the PIN set in previous
tests, it needs to find the option that will remove the PIN.  Recent
changes for fingerprint caused this "none" option to be hidden, so
assign the "none" ID to the "skip" option.

Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest
Bug: 31160946
Change-Id: I0b34cbfae45d1db8ee58a5ef66738414f5e2fc27
2016-10-04 13:45:38 -06:00
Bill Yi
f91ca6bcd9 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-04 18:51:05 +00:00
Bill Yi
ac5b6b0f15 Merge "Import translations. DO NOT MERGE" 2016-10-04 18:50:51 +00:00