OSDN Git Service
Jonathan Nieder [Fri, 7 Oct 2016 18:15:48 +0000 (18:15 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am:
6cab381bc2 am:
64136f30d1
am:
27615e6b49
Change-Id: Ic3cd78dadd1eb0687b6080d59f2c05dd83662e6e
Doris Ling [Fri, 7 Oct 2016 18:15:40 +0000 (18:15 +0000)]
Add condition check for double tap gesture settings. am:
c8b7555fc9 am:
7f62890cad
am:
a5eb66eb01
Change-Id: I0d56e0b1e3b25bd589fcfd4ba2301d51369f217e
Matthew Fritze [Fri, 7 Oct 2016 18:15:09 +0000 (18:15 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am:
fb42828381 am:
62fcf9369f
am:
dabb84876b
Change-Id: I01551ebecdee7b029d62bd76b833d062ccfdfb40
Matthew Fritze [Fri, 7 Oct 2016 18:14:51 +0000 (18:14 +0000)]
Fix bug preventing users from clicking settings suggestions twice am:
f265dbc447 am:
e5e60eccaf
am:
5b509e12ff
Change-Id: Iab38544e2e6fa2cb500fbbdc997dacd9dc611198
Jeff Sharkey [Fri, 7 Oct 2016 18:00:48 +0000 (18:00 +0000)]
Give CTS the handle it expects to remove PIN. am:
7be1b5923f am:
4ae8eb2aae
am:
2eda02e617
Change-Id: If61a3086f49151db5c46fbc19dbe70b816de2e13
Lei Yu [Fri, 7 Oct 2016 17:34:19 +0000 (17:34 +0000)]
Merge "Adjustments based on the changes in ZoneGetter(settingslib)"
Bill Yi [Fri, 7 Oct 2016 15:06:16 +0000 (15:06 +0000)]
Import translations. DO NOT MERGE am:
972c78b4ee -s ours am:
e87f2bbaa0 -s ours am:
784b1cbf35 -s ours
am:
4b9f135da5 -s ours
Change-Id: If4bc2da9b0ec543fed1ec0f75362f311a6775623
Lei Yu [Fri, 7 Oct 2016 15:05:50 +0000 (15:05 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am:
9c54a67d66 am:
d7f2c10f94
am:
efaf3b502f
Change-Id: I79a7bd27ff6c6e7109b1f0a6cb03992b73135436
jackqdyulei [Fri, 7 Oct 2016 15:02:47 +0000 (15:02 +0000)]
Add "FILTER_NOT_HIDE" for all app filters. am:
d785a8db78 am:
00ed827516
am:
15c14f0cc2
Change-Id: I2322d0d3e496013cfb02444b2224fab1eecb47b9
TreeHugger Robot [Fri, 7 Oct 2016 02:54:29 +0000 (02:54 +0000)]
Merge "Remove old unused activity."
Bill Yi [Fri, 7 Oct 2016 01:28:19 +0000 (01:28 +0000)]
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
Bill Yi [Fri, 7 Oct 2016 01:28:05 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE am:
8aee525418 -s ours am:
47f6271d15 -s ours
am:
b30d988a1c -s ours
Change-Id: I430a63f2b012f187ce9a0efe6b9f97182a5af8cb
Lorenzo Colitti [Fri, 7 Oct 2016 01:27:53 +0000 (01:27 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am:
365d95b69a am:
bb529c267d
am:
03cbc81f32
Change-Id: I7ae22e05a1f58b396f4543a68a73c8b209ec14b4
Lorenzo Colitti [Fri, 7 Oct 2016 01:27:38 +0000 (01:27 +0000)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev am:
b01c080b08 am:
be3924c1b6
am:
54ec71200b
Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df
Matthew Fritze [Fri, 7 Oct 2016 01:27:24 +0000 (01:27 +0000)]
Prevent monkey tests from crashing with race conditions am:
7ac78f2daf am:
9264154bee
am:
927007dd53
Change-Id: I74f45c284e8cde00af46562fb0903a856ea05de4
Bill Yi [Fri, 7 Oct 2016 01:27:08 +0000 (01:27 +0000)]
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
Bill Yi [Fri, 7 Oct 2016 01:26:52 +0000 (01:26 +0000)]
Import translations. DO NOT MERGE am:
ae33f8e62c -s ours am:
b1f3f659f1 -s ours
am:
5fb2b6c1c5 -s ours
Change-Id: I5260308dca7fe09bde379cf57f2378fef3693a71
Philip P. Moltmann [Fri, 7 Oct 2016 01:26:36 +0000 (01:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am:
f9ca06b367 am:
ae23c07073
am:
96d81b1332
Change-Id: I9469b566e8682162271992f3175c5153c4668614
Philip P. Moltmann [Fri, 7 Oct 2016 00:35:19 +0000 (00:35 +0000)]
USB restriction is similar to media restriction am:
13ee50be48 am:
a78fced068
am:
58154e8c27
Change-Id: Ic59c247b316a26640bda84b82c001254e01abe74
Fan Zhang [Thu, 6 Oct 2016 23:51:01 +0000 (16:51 -0700)]
Remove old unused activity.
Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
Stephen Chen [Thu, 6 Oct 2016 22:36:51 +0000 (22:36 +0000)]
Merge "Fix icon loading in EditUserInfo dialog on orientation change."
TreeHugger Robot [Thu, 6 Oct 2016 22:12:30 +0000 (22:12 +0000)]
Merge "Use a Digit TtsSpan for pairing pins for talkback."
Jonathan Nieder [Thu, 6 Oct 2016 21:52:45 +0000 (21:52 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am:
6cab381bc2
am:
64136f30d1
Change-Id: I3ee238ba4cc3ec5abc1ecc950dc01e7b08a5d62a
Doris Ling [Thu, 6 Oct 2016 21:52:33 +0000 (21:52 +0000)]
Add condition check for double tap gesture settings. am:
c8b7555fc9
am:
7f62890cad
Change-Id: If89dfb781ca8b8e0a7dd8e0b1f59e32ae6d4d98f
Matthew Fritze [Thu, 6 Oct 2016 21:52:02 +0000 (21:52 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am:
fb42828381
am:
62fcf9369f
Change-Id: I7aa60f53cf44d5090a648551ef2ff02431981ff0
Matthew Fritze [Thu, 6 Oct 2016 21:51:47 +0000 (21:51 +0000)]
Fix bug preventing users from clicking settings suggestions twice am:
f265dbc447
am:
e5e60eccaf
Change-Id: I956ed80ce27ec50378901111f5679b163719628f
Jeff Sharkey [Thu, 6 Oct 2016 21:15:12 +0000 (21:15 +0000)]
Give CTS the handle it expects to remove PIN. am:
7be1b5923f
am:
4ae8eb2aae
Change-Id: Ic3ee8be685d83b8be07f2e0129e3a7573ad4e920
Bill Yi [Thu, 6 Oct 2016 21:10:21 +0000 (21:10 +0000)]
Import translations. DO NOT MERGE am:
972c78b4ee -s ours am:
e87f2bbaa0 -s ours
am:
784b1cbf35 -s ours
Change-Id: I9ffd9b5af5b44dd0e9dfb0a2ee231ce619ce9d71
Lei Yu [Thu, 6 Oct 2016 21:10:06 +0000 (21:10 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am:
9c54a67d66
am:
d7f2c10f94
Change-Id: Idd81a0beb1b5999696e6f47ab6fb64110a4f0793
jackqdyulei [Thu, 6 Oct 2016 21:00:31 +0000 (21:00 +0000)]
Add "FILTER_NOT_HIDE" for all app filters. am:
d785a8db78
am:
00ed827516
Change-Id: I108753ea9af54aba754a8899f02a3f100f3b38fd
Bill Yi [Thu, 6 Oct 2016 21:00:03 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
f91ca6bcd9 -s ours
am:
f0be222981 -s ours
Change-Id: I22381a4a7bc572765718c6003769431b0974567c
Bill Yi [Thu, 6 Oct 2016 20:59:44 +0000 (20:59 +0000)]
Import translations. DO NOT MERGE am:
8aee525418 -s ours
am:
47f6271d15 -s ours
Change-Id: I9f2c7f8ffce896e53ca32192b6902760b9939bb2
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:31 +0000 (20:59 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am:
365d95b69a
am:
bb529c267d
Change-Id: I817462cc9a96112bd6f80d8f6042cae962ec7331
Lorenzo Colitti [Thu, 6 Oct 2016 20:59:17 +0000 (20:59 +0000)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev am:
b01c080b08
am:
be3924c1b6
Change-Id: Ifecf71ed6b0c756fb59ce8fa4293aebb68158f89
Matthew Fritze [Thu, 6 Oct 2016 20:59:03 +0000 (20:59 +0000)]
Prevent monkey tests from crashing with race conditions am:
7ac78f2daf
am:
9264154bee
Change-Id: If30a93ce12ee3100f6fea14f4765e3428b122ad3
Bill Yi [Thu, 6 Oct 2016 20:58:50 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
0d424ef9bd -s ours
am:
ffae7d82c3 -s ours
Change-Id: Iff1708277ff2827a631228d4c4a286e503543190
Bill Yi [Thu, 6 Oct 2016 20:58:37 +0000 (20:58 +0000)]
Import translations. DO NOT MERGE am:
ae33f8e62c -s ours
am:
b1f3f659f1 -s ours
Change-Id: Ibb7e5a0d26b14095d632979a5e57fd8bed9966f1
Philip P. Moltmann [Thu, 6 Oct 2016 20:58:22 +0000 (20:58 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am:
f9ca06b367
am:
ae23c07073
Change-Id: I9ccd46e5d5d15685dccf8b9a3dbd5a82b56d6bda
Jonathan Nieder [Thu, 6 Oct 2016 20:48:23 +0000 (20:48 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
am:
6cab381bc2
Change-Id: I4e140a32c84c820761176e816cbb88c4be46ef70
Doris Ling [Thu, 6 Oct 2016 20:47:32 +0000 (20:47 +0000)]
Add condition check for double tap gesture settings.
am:
c8b7555fc9
Change-Id: I7fa9e76725a7920d36936ffd4a737e8ed7eb8107
Matthew Fritze [Thu, 6 Oct 2016 20:47:09 +0000 (20:47 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
am:
fb42828381
Change-Id: I77f828913d3a941f040c6548fc99e86033e432a6
Matthew Fritze [Thu, 6 Oct 2016 20:47:07 +0000 (20:47 +0000)]
Fix bug preventing users from clicking settings suggestions twice
am:
f265dbc447
Change-Id: I0e9a1a92d84f2ae2dc783ddea4f6bcb728a72a52
Jeff Sharkey [Thu, 6 Oct 2016 20:41:48 +0000 (20:41 +0000)]
Give CTS the handle it expects to remove PIN.
am:
7be1b5923f
Change-Id: If949083726e0809d6ed45083282acda2255f546b
Bill Yi [Thu, 6 Oct 2016 20:41:23 +0000 (20:41 +0000)]
Import translations. DO NOT MERGE am:
972c78b4ee -s ours
am:
e87f2bbaa0 -s ours
Change-Id: Id32e92fba6ba6fbb791e0afd275cb59ae1dfe96e
Lei Yu [Thu, 6 Oct 2016 20:41:04 +0000 (20:41 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
am:
9c54a67d66
Change-Id: Iba9f294bbbd1fd32e55950a6ddcc73604e4d0bea
jackqdyulei [Thu, 6 Oct 2016 20:28:52 +0000 (20:28 +0000)]
Add "FILTER_NOT_HIDE" for all app filters.
am:
d785a8db78
Change-Id: I779bc9de3e094c80c1749ac65acb932dc251f451
Bill Yi [Thu, 6 Oct 2016 20:28:13 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f91ca6bcd9 -s ours
Change-Id: Id18279ec5ccafbdcc0b4de8c24342f2c41ae9d10
Bill Yi [Thu, 6 Oct 2016 20:28:12 +0000 (20:28 +0000)]
Import translations. DO NOT MERGE
am:
8aee525418 -s ours
Change-Id: If58e31763e5f3b014126005d2816532323aa13f3
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:51 +0000 (20:27 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
am:
365d95b69a
Change-Id: Idde7cfe0966da74fad876820d9ad5623735e7a2a
Lorenzo Colitti [Thu, 6 Oct 2016 20:27:49 +0000 (20:27 +0000)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev
am:
b01c080b08
Change-Id: I7eb92f48024bf8298f2a31c0acfa87a355be872a
Matthew Fritze [Thu, 6 Oct 2016 20:27:36 +0000 (20:27 +0000)]
Prevent monkey tests from crashing with race conditions
am:
7ac78f2daf
Change-Id: I6634fa0ac2b4b5712f18db7320f82f595381ce1a
Bill Yi [Thu, 6 Oct 2016 20:27:09 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
0d424ef9bd -s ours
Change-Id: I700b9562e1e366ee89b34c428e7af79d2a1340c9
Bill Yi [Thu, 6 Oct 2016 20:27:08 +0000 (20:27 +0000)]
Import translations. DO NOT MERGE
am:
ae33f8e62c -s ours
Change-Id: Ibb93c7fcea5a052cbafc28b445bd85810a331122
Philip P. Moltmann [Thu, 6 Oct 2016 20:26:50 +0000 (20:26 +0000)]
Merge "USB restriction is similar to media restriction" into nyc-mr1-dev
am:
f9ca06b367
Change-Id: Ic342e1a153ec1139afa7fc36f29fbd657ca441a9
Fan Zhang [Thu, 6 Oct 2016 20:17:06 +0000 (13:17 -0700)]
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
Philip P. Moltmann [Thu, 6 Oct 2016 20:07:13 +0000 (20:07 +0000)]
USB restriction is similar to media restriction am:
13ee50be48
am:
a78fced068
Change-Id: Icb1dbfba6cf3e1a5097cc32b33330b8025e6c46d
Philip P. Moltmann [Thu, 6 Oct 2016 19:55:42 +0000 (19:55 +0000)]
USB restriction is similar to media restriction
am:
13ee50be48
Change-Id: I89214518add09b1e788535ea6b1a913307fb7b5c
TreeHugger Robot [Thu, 6 Oct 2016 19:22:20 +0000 (19:22 +0000)]
Merge "Add test for new DashboardFragment and PreferenceController"
TreeHugger Robot [Thu, 6 Oct 2016 18:02:33 +0000 (18:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Wed, 5 Oct 2016 00:48:32 +0000 (17:48 -0700)]
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
Stephen Chen [Thu, 6 Oct 2016 01:06:03 +0000 (18:06 -0700)]
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
Bill Yi [Thu, 6 Oct 2016 00:29:27 +0000 (17:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie36226fd9be0469ed8263fd156f9a7e28d4fe6cc
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 5 Oct 2016 23:59:23 +0000 (23:59 +0000)]
Merge "Add search provider for storage dashboard."
TreeHugger Robot [Wed, 5 Oct 2016 19:24:33 +0000 (19:24 +0000)]
Merge "Switch to static warning threshold when adopting."
Jeff Sharkey [Wed, 5 Oct 2016 17:21:22 +0000 (11:21 -0600)]
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
Jonathan Nieder [Wed, 5 Oct 2016 01:08:03 +0000 (01:08 +0000)]
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev
Fan Zhang [Wed, 5 Oct 2016 00:48:32 +0000 (17:48 -0700)]
Add search provider for storage dashboard.
Bug:
31800690
Test: manual
Change-Id: Icb906bf3b3698c1379e10cf6e346d489675ad940
Fan Zhang [Wed, 5 Oct 2016 00:14:50 +0000 (00:14 +0000)]
Merge "Update signature when calling CategoryManager.get."
Fan Zhang [Wed, 5 Oct 2016 00:10:27 +0000 (00:10 +0000)]
Merge "Add storage dashborad page."
Matthew Fritze [Tue, 4 Oct 2016 22:51:51 +0000 (22:51 +0000)]
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev
Doris Ling [Tue, 4 Oct 2016 22:31:58 +0000 (15:31 -0700)]
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
Jeff Sharkey [Tue, 4 Oct 2016 22:19:35 +0000 (22:19 +0000)]
Merge "Give CTS the handle it expects to remove PIN."
Fan Zhang [Tue, 4 Oct 2016 22:18:02 +0000 (15:18 -0700)]
Update signature when calling CategoryManager.get.
Bug:
31781480
Test: compiles
Change-Id: Iee715aca3767a67728527ba9390787d3f8a7e5fe
Fan Zhang [Tue, 4 Oct 2016 20:21:06 +0000 (13:21 -0700)]
Add storage dashborad page.
Refactor shared dashboard page display logic between storage and
system page.
Bug:
31800690
Test: RunSettingsRoboTests
Change-Id: I7eb86f590b79ab871bdb383fb2f5326790beb193
Matthew Fritze [Tue, 4 Oct 2016 20:39:27 +0000 (13:39 -0700)]
Fix bug preventing users from clicking settings suggestions twice
In an attempt to fix a monkey test crash which would open a
suggestion, click back and tap the same one again. The change
unfortunately prevented this for all users, but was not caught
because of a debug flag set on my device. A unit test will be added
to master to catch such cases, as tracked by this bug:
b/
31937112
Change-Id: Ib1cff07e54903df687454bdbf2ed1416485ab34f
Fixes:
31926102
Test: Manual
Jeff Sharkey [Tue, 4 Oct 2016 19:43:35 +0000 (13:43 -0600)]
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
Bill Yi [Tue, 4 Oct 2016 20:05:52 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE
am:
972c78b4ee -s ours
Change-Id: I526a783783c7ecda889b918ecfbafca399371895
Fan Zhang [Tue, 4 Oct 2016 19:52:14 +0000 (19:52 +0000)]
Merge "Add search provider for system dashboard fragment."
Lei Yu [Tue, 4 Oct 2016 19:51:22 +0000 (19:51 +0000)]
Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev
Jeff Sharkey [Tue, 4 Oct 2016 19:43:35 +0000 (13:43 -0600)]
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
Bill Yi [Tue, 4 Oct 2016 18:51:04 +0000 (18:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:50:50 +0000 (18:50 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Tue, 4 Oct 2016 18:18:12 +0000 (11:18 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
31827713
Change-Id: Ib9bed5a9d8a9237935842d496c8f1630dad64c27
Fan Zhang [Tue, 4 Oct 2016 00:11:11 +0000 (17:11 -0700)]
Add search provider for system dashboard fragment.
Bug:
31801428
Test: manual
Test:make RunSettingsRoboTests
Change-Id: I6a80d64ed9755f4ddcfde33a82be04cfcbf0495b
Bill Yi [Tue, 4 Oct 2016 05:27:10 +0000 (22:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab5c7c6153bc12f50cc443225c0e562a795a7731
Auto-generated-cl: translation import
Bill Yi [Tue, 4 Oct 2016 05:19:39 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib21fca883ce256f13a62fef1e4958f961ba534c8
Auto-generated-cl: translation import
Fan Zhang [Tue, 4 Oct 2016 01:41:01 +0000 (01:41 +0000)]
Merge "Listen to category changes in preference fragment."
Fan Zhang [Mon, 3 Oct 2016 23:44:57 +0000 (23:44 +0000)]
Merge "Move system update preference from device_info to system."
Fan Zhang [Mon, 3 Oct 2016 20:46:22 +0000 (13:46 -0700)]
Listen to category changes in preference fragment.
Bug:
31781480
Test: make RunSettingsRoboTests
Change-Id: I702e524eb3a9e40b653e112dba80d620be3bc9bb
Lorenzo Colitti [Mon, 3 Oct 2016 23:37:09 +0000 (23:37 +0000)]
Merge "resolve merge conflicts of
f2801e4 to nyc-mr1-dev" into nyc-mr1-dev
Fan Zhang [Mon, 3 Oct 2016 22:46:37 +0000 (22:46 +0000)]
Merge "Fix a NPE when rotating dialog created by DialogCreatable."
jackqdyulei [Mon, 3 Oct 2016 21:01:46 +0000 (14:01 -0700)]
Add "FILTER_NOT_HIDE" for all app filters.
The "FILTER_NOT_HIDE" is used to filter out apps that "blacklisted"
by the carrier. So when user insert a specific sim card, these apps
are hiden in settings > apps unless user enable them.
Bug:
31823872
Test: Manual
Change-Id: I28a38b5780cb63fe22af12d80cc24e965b2b83cf
Matthew Fritze [Mon, 3 Oct 2016 20:26:07 +0000 (13:26 -0700)]
Prevent monkey tests from crashing with race conditions
Change-Id: I3eb7d5549aba2f9684f97e8ee7c56c469f9daae0
Fixes:
31856366
Test: None, monkey test race conditions.
Fan Zhang [Mon, 3 Oct 2016 18:05:08 +0000 (11:05 -0700)]
Move system update preference from device_info to system.
In order to move the preference and its logic cleanly, created a
controller object that encapsulates the preference/click handler.
Bug:
31801428
Test: RunSettingsRoboTests
Change-Id: I332384e20fbf0e21d2f3becb531d97b20f7f7ef1
Fan Zhang [Mon, 3 Oct 2016 20:48:55 +0000 (13:48 -0700)]
Fix a NPE when rotating dialog created by DialogCreatable.
Bug:
30088727
Test: make RunSettingsRoboTests
Change-Id: I775899809dfe920daa294f70d646b141da7c0706
Salvador Martinez [Mon, 3 Oct 2016 19:52:12 +0000 (19:52 +0000)]
Merge "BluetoothDialog view fixed for no pair code case"
Stephen Chen [Mon, 3 Oct 2016 18:06:45 +0000 (18:06 +0000)]
Merge "Wrap layout content so that "Open by default" view does not scroll."
TreeHugger Robot [Mon, 3 Oct 2016 17:43:18 +0000 (17:43 +0000)]
Merge "Fix a NPE in confirm lock screen."
Lorenzo Colitti [Mon, 3 Oct 2016 17:28:58 +0000 (02:28 +0900)]
resolve merge conflicts of
f2801e4 to nyc-mr1-dev
Change-Id: I8a9723e8c070cd7f99c39fe5918335847f0b6248
Fan Zhang [Mon, 3 Oct 2016 16:05:55 +0000 (09:05 -0700)]
Fix a NPE in confirm lock screen.
Change-Id: Id280cd1b8781678540c9ea281b3186edd04d61f9
Fixes:
31895774
Test: make RunSettingsRoboTests
Test: manually enter correct/wrong/empty password/pin in confirm lock UI