Amith Yamasani
7d892acaeb
Merge "Adapt to behavior change in MATCH_UNINSTALLED_PACKAGES"
2016-12-01 17:01:09 +00:00
TreeHugger Robot
243cc9f5f6
Merge "Import translations. DO NOT MERGE"
2016-12-01 06:17:43 +00:00
Amin Shaikh
0bc81fbd0e
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
am: 3140bb5ace
am: 7c8af0aedc
...
am: 409f09b15a
Change-Id: I8ce57090a80cb83b12a55ced0f95989a65db8f9d
2016-12-01 02:31:46 +00:00
Amin Shaikh
409f09b15a
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
am: 3140bb5ace
...
am: 7c8af0aedc
Change-Id: I08804d0672ee723f0e6b1278972613a4f11f479d
2016-12-01 02:27:02 +00:00
Amin Shaikh
7c8af0aedc
Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
...
am: 3140bb5ace
Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001
2016-12-01 02:21:13 +00:00
Amin Shaikh
3140bb5ace
Merge "Refactor NetworkScoreAppManager for testing."
...
am: 512368a22e
Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
2016-12-01 02:11:06 +00:00
Treehugger Robot
512368a22e
Merge "Refactor NetworkScoreAppManager for testing."
2016-12-01 01:59:14 +00:00
Fan Zhang
1e798ff51f
Merge "Add code inspector to ensure fragments implements search."
2016-12-01 00:50:41 +00:00
Stephen Chen
3ddd9eaf05
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
am: 539eaa34d5
am: 701e558586
...
am: 075e8da2a0
Change-Id: Ie578966f612bd9033b25a88b227fd6811207a332
2016-12-01 00:28:39 +00:00
Stephen Chen
075e8da2a0
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
am: 539eaa34d5
...
am: 701e558586
Change-Id: I0a5dd13992a450a04417bdc703781fb2d4c79055
2016-12-01 00:13:50 +00:00
Stephen Chen
701e558586
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am: 666c9d7ea5
...
am: 539eaa34d5
Change-Id: I32a45ccc9a08d8f90e8801f727853fc320db9dc5
2016-12-01 00:09:32 +00:00
Stephen Chen
539eaa34d5
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
...
am: 666c9d7ea5
Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2
2016-11-30 23:59:43 +00:00
Fan Zhang
89e669f5d8
Add code inspector to ensure fragments implements search.
...
Unless a fragment is grandfathered:
- If it's a SearchPreferenceFragment, it needs to implement Indexable.
- If it's a Indexable, it needs to contain SEARCH_INDEX_DATA_PROVIDER.
Bug: 33209410
Test: make RunSettingsRoboTests
Change-Id: I078c54374341ba2966145429fc1507a3d5763d3b
2016-11-30 15:09:09 -08:00
Amith Yamasani
21556cdba1
Adapt to behavior change in MATCH_UNINSTALLED_PACKAGES
...
Don't use the PM flag to reach across users.
If retrieving labels, etc., use MATCH_ANY_USER, since
several Settings screens show work profile apps as well.
Bug: 31000380
Test: Manual test of affected screens
Change-Id: Ib6f981ae8443f640276d395c37247c8c0b610894
2016-11-30 13:24:54 -08:00
TreeHugger Robot
7aad8a97a4
Merge "Add handling for account tiles for specific account type."
2016-11-30 20:53:16 +00:00
Treehugger Robot
666c9d7ea5
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
2016-11-30 20:25:13 +00:00
Bill Yi
7b8e87a43e
Import translations. DO NOT MERGE
...
Change-Id: I0adf0de3925b86d14dc110dd0811ecb53375fd76
Auto-generated-cl: translation import
2016-11-30 11:04:32 -08:00
Julia Reynolds
3f9df37d44
Merge "Method rename"
2016-11-30 15:08:17 +00:00
TreeHugger Robot
fcbb6528ae
Merge "Add test to ensure all future fragments implements logging."
2016-11-29 23:20:35 +00:00
Doris Ling
20d4b041f7
Add handling for account tiles for specific account type.
...
- List individual account instead of account type under User & account
screen.
- Add handling to move account tiles with specific account type from
top level account dashboard to inside the corresponding account
preference.
- Rename settings.accounts.AccountPreference to
settings.accounts.AccountTypePreference to make it less confused
with settings.AccountPreference
Bug: 31801423
Test: make RunSettingsRoboTests
Change-Id: Iebe70a3c4230e8d979344f142a5c2a60945e552e
2016-11-29 14:18:30 -08:00
Amin Shaikh
f91ac62756
Refactor NetworkScoreAppManager for testing.
...
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
2016-11-29 10:17:34 -08:00
TreeHugger Robot
737ae83a66
Merge changes from topic 'show-deleted-vpn'
...
* changes:
VpnSettings PreferenceList tests
VpnSettings: slightly more robust callback context
VpnSettings: show connected VPN even if deleted
2016-11-29 10:22:35 +00:00
TreeHugger Robot
121c3e59af
Merge "Import translations. DO NOT MERGE"
2016-11-29 06:17:35 +00:00
Tadashi G. Takaoka
5e8b93bc53
Merge "Add initialize helper method to improve readability"
2016-11-29 04:03:54 +00:00
Bill Yi
d31b72c065
Import translations. DO NOT MERGE
...
Change-Id: Ifa2ac6e743d48d3acaae6302fc59310adb4d09d4
Auto-generated-cl: translation import
2016-11-28 19:54:58 -08:00
Fan Zhang
8b8218c01b
Add test to ensure all future fragments implements logging.
...
The idea is: if a class is Fragment, it must also implements
Instrumentable.
To make the test possible, I added a structure to load all classes in
current classloader, and filter to only the ones we care about. Then
insepct each class definition using reflection.
Bug: 32952614
Test: make RunSettingsRoboTests
Change-Id: Ifa5e27c41d5ad0e84b6e9e9df81c96e8be2878c5
2016-11-28 16:34:45 -08:00
Stephen Chen
e365aa8cd9
Link WIFI_SAVED_NETWORK_SETTINGS action with activity.
...
Bug: 32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
2016-11-28 16:29:31 -08:00
Shahriyar Amini
3d7f09d7ad
Merge "Use preference key specified in injected settings."
2016-11-29 00:17:29 +00:00
Shahriyar Amini
6259129d69
Use preference key specified in injected settings.
...
Bug: 31002801
Test: make RunSettingsRoboTests
Reads in optional metadata field for specifying the key used for an
injected preference.
Change-Id: Ief2ff10c508d42f91906b531cf34906c1c42fdd4
2016-11-28 14:49:46 -08:00
TreeHugger Robot
01bffd0751
Merge "Update strings."
2016-11-28 22:26:26 +00:00
Fan Zhang
3d9fd0cd73
Update strings.
...
Bug: 32841662
Test: RunSettingsRoboTests
Change-Id: I178070bfd5f20188e580f8a3a8dd442bd17f3632
2016-11-28 12:48:07 -08:00
Bartosz Fabianowski
2e0b608495
Populate Enterprise Privacy Settings page - batch 2
...
This CL adds the second batch of items to the Privacy Settings page.
These are all the remaining items that fall into the "What types of
information can your organization see?" category.
Test: make RunSettingsRoboTests
Bug: 32692748
Change-Id: I08569646ed6bb6f5d9d6d65ed2718be8456f50ae
2016-11-28 21:13:30 +01:00
Robin Lee
9c2758f407
VpnSettings PreferenceList tests
...
For validating that when VPNs are added / removed, the right set of
changes are made to the PreferenceGroup in which they are supposed to
be shown.
Bug: 30998549
Bug: 29093779
Test: runtest -x packages/apps/Settings/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
Change-Id: I9394db0e78cc984ab62e3670aa0a7942ae767a66
2016-11-28 17:42:56 +00:00
Robin Lee
4f0a0d0a40
VpnSettings: slightly more robust callback context
...
Test: runtest -x com/android/settings/vpn2/VpnTests.java
Change-Id: I45fa0509c56211602f6abd55a2f44cdf76f28829
2016-11-28 17:42:43 +00:00
Robin Lee
393857be9c
VpnSettings: show connected VPN even if deleted
...
So there's a way to disconnect from it, if someone deletes all the
keystore entries and the VPN doesn't actually exist any more (but
is still sitting around in memory somewhere keeping the connection
alive).
Bug: 29093779
Fix: 32880676
Test: runtest -x tests/app/src/com/android/settings/vpn2/VpnTests.java
Change-Id: I97671a74af746e5baaa5be0b5cff24e2b1766f53
2016-11-28 17:41:58 +00:00
Tadashi G. Takaoka
b51f6bf869
Add initialize helper method to improve readability
...
This CL also reduces SearchIndexableResources class about 1kB.
Test: Added Robolectric test. "make RunSettingsRoboTests" passed.
Change-Id: Id7f7676e175db4aba0be23c0c1a3fc12dd6acc2e
2016-11-25 16:21:22 +09:00
Fan Zhang
51ecc5eced
Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481
am: b69ec294c2
...
am: 660dad552b
Change-Id: Ied8736dd99e576f376cde15e51cf0d49e07814f6
2016-11-23 23:58:44 +00:00
Bill Yi
33ae03d03d
Import translations. DO NOT MERGE am: bb6af9902d
-s ours am: 061b294714
-s ours am: 4666b50754
-s ours am: 5cca5a64e8
-s ours
...
am: 7963df8127
-s ours
Change-Id: I4e1251b23b0b8c82b2ea91b6558b8d49deaa025e
2016-11-23 23:58:30 +00:00
Bill Yi
d6e052142d
Import translations. DO NOT MERGE am: e7f9b0b30b
-s ours am: f8b4927683
-s ours am: 57b56329f3
-s ours
...
am: 9a1589ad6a
-s ours
Change-Id: Iab860b955d46457f9ccf482394f5d45a9a1a1389
2016-11-23 23:58:17 +00:00
Steven Ng
e94ecec616
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
am: 046a63450f
am: 26a3c28735
...
am: e8928024c4
Change-Id: I9643fa546e1621577df2938687c09e08cfe935ad
2016-11-23 23:58:03 +00:00
Bill Yi
c32d3c9b66
Import translations. DO NOT MERGE am: a6d9842695
-s ours am: c027907edc
-s ours am: f8032d0b15
-s ours am: 71a0bb85a5
-s ours
...
am: 1ff86be2bd
-s ours
Change-Id: Ic416da31020ed0f59891c78ee96df3665ca480d3
2016-11-23 23:57:49 +00:00
Bill Yi
ab4ccb2c49
Import translations. DO NOT MERGE am: 475763d01c
-s ours am: 9a22968ff8
-s ours am: 88b043714b
-s ours
...
am: 72976be89a
-s ours
Change-Id: Idaf80586d8c9419cadcc2012663af3ad446bf1b8
2016-11-23 23:57:35 +00:00
Fan Zhang
660dad552b
Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481
...
am: b69ec294c2
Change-Id: I2c195509e31812f55b00a1ecc6bc1cdead3f90f4
2016-11-23 23:45:30 +00:00
Bill Yi
7963df8127
Import translations. DO NOT MERGE am: bb6af9902d
-s ours am: 061b294714
-s ours am: 4666b50754
-s ours
...
am: 5cca5a64e8
-s ours
Change-Id: Ic72803a51ba93c56254173c8f428fb9a146bdc1a
2016-11-23 23:45:18 +00:00
Bill Yi
9a1589ad6a
Import translations. DO NOT MERGE am: e7f9b0b30b
-s ours am: f8b4927683
-s ours
...
am: 57b56329f3
-s ours
Change-Id: I1d86bc055b65520c41615ddf919c64890f1b653f
2016-11-23 23:45:05 +00:00
Steven Ng
e8928024c4
Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
am: 046a63450f
...
am: 26a3c28735
Change-Id: I490619e028e67635fbd97b9537e3f8435471c0b0
2016-11-23 23:44:53 +00:00
Bill Yi
1ff86be2bd
Import translations. DO NOT MERGE am: a6d9842695
-s ours am: c027907edc
-s ours am: f8032d0b15
-s ours
...
am: 71a0bb85a5
-s ours
Change-Id: I306a02fc5ca3330732fde9e8439b12e8a5f55389
2016-11-23 23:44:38 +00:00
Bill Yi
72976be89a
Import translations. DO NOT MERGE am: 475763d01c
-s ours am: 9a22968ff8
-s ours
...
am: 88b043714b
-s ours
Change-Id: I733c0d9fc99ffe62dc43ff32e0d9067ab2e1fa23
2016-11-23 23:44:25 +00:00
Fan Zhang
b69ec294c2
Fix crash when opening account sync detail for external app am: c9cdc25f41
...
am: f3e86ca481
Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
2016-11-23 23:29:22 +00:00
Bill Yi
5cca5a64e8
Import translations. DO NOT MERGE am: bb6af9902d
-s ours am: 061b294714
-s ours
...
am: 4666b50754
-s ours
Change-Id: I1aaca58936606507f763770e65dace147da5153a
2016-11-23 23:29:07 +00:00