OSDN Git Service
TreeHugger Robot [Wed, 7 Dec 2016 00:51:40 +0000 (00:51 +0000)]
Merge "Added feature for surveys provider to Settings"
Doris Ling [Tue, 6 Dec 2016 18:14:06 +0000 (18:14 +0000)]
Merge "Add handling for tiles with intent-action metadata."
TreeHugger Robot [Tue, 6 Dec 2016 15:40:36 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Bartosz Fabianowski [Tue, 6 Dec 2016 15:09:28 +0000 (15:09 +0000)]
Merge "Add entry point to Enterprise Privacy page"
Bill Yi [Tue, 6 Dec 2016 05:01:52 +0000 (21:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I50b30e8b6e262aa894458038bda4ee010045a4b9
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 6 Dec 2016 03:58:10 +0000 (03:58 +0000)]
Merge "Add search provider for dashboard fragments in new IA."
TreeHugger Robot [Tue, 6 Dec 2016 03:10:00 +0000 (03:10 +0000)]
Merge "Add InstrumentFragment for non-PreferenceFragment types."
TreeHugger Robot [Tue, 6 Dec 2016 01:18:17 +0000 (01:18 +0000)]
Merge "Added logging to pinpoint source of bug"
Fan Zhang [Tue, 6 Dec 2016 01:02:33 +0000 (17:02 -0800)]
Add InstrumentFragment for non-PreferenceFragment types.
This allows app fragment use a less heavyweight fragment as super class
if they don't need PreferenceFragment. Using this class as base is
generally easier to set up robolectric tests too.
Bug:
33354536
Test: RunSettingsRoboTests
Change-Id: I91c4d242ea0333c76c8767c03c3f18dee6b6e104
Doris Ling [Mon, 5 Dec 2016 23:12:09 +0000 (15:12 -0800)]
Add handling for tiles with intent-action metadata.
If intent action is provided in the metadata for the dynamic tiles, it
will be added to the launching intent when user selects the tile.
Fixes:
31801423
Test: make RunSettingsRoboTests
Change-Id: Ic3e583a578660f4d9c40feff1418e5e354ab8f60
TreeHugger Robot [Tue, 6 Dec 2016 00:02:16 +0000 (00:02 +0000)]
Merge "Add search indexing for new gesture pages."
Salvador Martinez [Wed, 19 Oct 2016 19:51:45 +0000 (12:51 -0700)]
Added feature for surveys provider to Settings
It is now possible to create and show surveys to a user
asking them for feedback within the Settings app.
Test: JUnitTests
Bug:
27823357
Change-Id: I824899045f6ce30e5b6f46d20888da673114f658
Salvador Martinez [Tue, 29 Nov 2016 18:36:12 +0000 (10:36 -0800)]
Added logging to pinpoint source of bug
Sometimes the airplane mode banner will show up even
though airplane mode is not on. Logging has been added
to several areas around this condition in addition to
where the actual view is created. This will be used
to try and get a better handle on what the source of
the bug is.
Test: manual
Bug:
30860132
Change-Id: I7213aa7e187c5a8c0e94a5ce7a3269e6667cd61b
Fan Zhang [Mon, 5 Dec 2016 22:42:49 +0000 (14:42 -0800)]
Add search provider for dashboard fragments in new IA.
Bug:
33252252
Test: make RunSettingsRoboTests
Change-Id: I8ea3a144f2bee3d979b909aba29a3360e25fd04b
Fan Zhang [Mon, 5 Dec 2016 20:58:03 +0000 (12:58 -0800)]
Add search indexing for new gesture pages.
Bug:
33252252
Test: make RunSettingsRoboTests
Change-Id: I927e5b9b87b226ea5ce2006fc2524ac8db740446
Bartosz Fabianowski [Mon, 28 Nov 2016 18:16:34 +0000 (19:16 +0100)]
Add entry point to Enterprise Privacy page
This CL adds an intent filter that will allow System apps to launch the
Enterprise Privacy page.
Bug:
32692748
Test: GTS test in separate CL
Change-Id: I397f1c8bf486f6974e2c86e98892032324492ab1
Bill Yi [Mon, 5 Dec 2016 18:37:12 +0000 (18:37 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
da32519ef41e079c37920459bbe1adec9c03f94d.
Change-Id: I5c1241a6bf00d73f3b877b2eaeaeabd774413401
Bill Yi [Sat, 3 Dec 2016 08:41:05 +0000 (00:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I13691a933f0c8c83859723b28329673fc2467e8d
Auto-generated-cl: translation import
Lei Yu [Fri, 2 Dec 2016 17:14:15 +0000 (17:14 +0000)]
Merge "Add account picker to Support Tab"
TreeHugger Robot [Fri, 2 Dec 2016 03:32:08 +0000 (03:32 +0000)]
Merge "Update SoundSettings to extend DashboardFragment."
TreeHugger Robot [Fri, 2 Dec 2016 02:27:34 +0000 (02:27 +0000)]
Merge "Add search providers for Connected Devices in new IA"
Lei Yu [Fri, 2 Dec 2016 01:32:08 +0000 (01:32 +0000)]
Merge "Add DashboardItemAnimator to stop flash"
Doris Ling [Thu, 1 Dec 2016 01:33:50 +0000 (17:33 -0800)]
Update SoundSettings to extend DashboardFragment.
- initial round of refactoring SoundSettings to use DashboardFragment.
- add controller for Cast, Do not disturb, Alarm volume, Media volume,
Ring volume and Notification volume.
Bug:
32276590
Test: make RunSettingsRoboTests
Change-Id: I5c02a344bff5117bfce93d7ccac650fccc82d2b0
Fan Zhang [Wed, 30 Nov 2016 23:56:17 +0000 (15:56 -0800)]
Add search providers for Connected Devices in new IA
Also add code inspection tests to ensure search provider is added
properly.
Bug:
33252252
Test: make RunSettingsRoboTests
Change-Id: I192e1d9fe0498b76013c4d43b5624d1ef2beb6f9
Fan Zhang [Thu, 1 Dec 2016 23:01:57 +0000 (15:01 -0800)]
Fix test for appcounter
Bug:
33275978
Test: make RunSettingsRoboTests
Change-Id: Ie3c58dc95b4abde83f33ee7c2af925cef3be85fb
TreeHugger Robot [Thu, 1 Dec 2016 19:53:08 +0000 (19:53 +0000)]
Merge "Upload query text whenever it changes."
Bill Yi [Thu, 1 Dec 2016 19:19:46 +0000 (19:19 +0000)]
Import translations. DO NOT MERGE am:
5a05a8a4ea -s ours am:
f131815859 -s ours
am:
6114c8d76d -s ours
Change-Id: Ib0d7e5743af4d64ea147122bc5bb7c857e120dec
Bill Yi [Thu, 1 Dec 2016 19:13:45 +0000 (19:13 +0000)]
Import translations. DO NOT MERGE am:
5a05a8a4ea -s ours
am:
f131815859 -s ours
Change-Id: I3d20b9cf6c05d4f4770790336ecffcc53eebe11e
Bill Yi [Thu, 1 Dec 2016 19:07:44 +0000 (19:07 +0000)]
Import translations. DO NOT MERGE
am:
5a05a8a4ea -s ours
Change-Id: Ia227c18a81391b0609518b9a68001598bd389191
Fan Zhang [Thu, 1 Dec 2016 17:52:10 +0000 (09:52 -0800)]
Upload query text whenever it changes.
Bug:
33266688
Test: make RunSettingsRoboTests
Change-Id: Ie26f9d4ad7460d49305457a7a3066d121e374eab
Bill Yi [Thu, 1 Dec 2016 18:11:25 +0000 (10:11 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32177112
Change-Id: Ib08dd2e3c6b87cc0fbdc16bb167f4e167e52b020
Amith Yamasani [Thu, 1 Dec 2016 17:01:05 +0000 (17:01 +0000)]
Merge "Adapt to behavior change in MATCH_UNINSTALLED_PACKAGES"
TreeHugger Robot [Thu, 1 Dec 2016 06:17:43 +0000 (06:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Amin Shaikh [Thu, 1 Dec 2016 02:31:46 +0000 (02:31 +0000)]
Merge "Refactor NetworkScoreAppManager for testing." am:
512368a22e am:
3140bb5ace am:
7c8af0aedc
am:
409f09b15a
Change-Id: I8ce57090a80cb83b12a55ced0f95989a65db8f9d
Amin Shaikh [Thu, 1 Dec 2016 02:27:02 +0000 (02:27 +0000)]
Merge "Refactor NetworkScoreAppManager for testing." am:
512368a22e am:
3140bb5ace
am:
7c8af0aedc
Change-Id: I08804d0672ee723f0e6b1278972613a4f11f479d
Amin Shaikh [Thu, 1 Dec 2016 02:21:13 +0000 (02:21 +0000)]
Merge "Refactor NetworkScoreAppManager for testing." am:
512368a22e
am:
3140bb5ace
Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001
Amin Shaikh [Thu, 1 Dec 2016 02:11:06 +0000 (02:11 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
am:
512368a22e
Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
Treehugger Robot [Thu, 1 Dec 2016 01:59:13 +0000 (01:59 +0000)]
Merge "Refactor NetworkScoreAppManager for testing."
Fan Zhang [Thu, 1 Dec 2016 00:50:40 +0000 (00:50 +0000)]
Merge "Add code inspector to ensure fragments implements search."
jackqdyulei [Wed, 30 Nov 2016 01:03:25 +0000 (17:03 -0800)]
Add DashboardItemAnimator to stop flash
When there is no offset change for identical holder in
animateChange, simply return and don't invoke the
resetAnimation.
Bug:
33198024
Test: make RunSettingsRoboTests
Change-Id: Ib83363873bc5f51e5bd71af5a013ee0756728d1a
Stephen Chen [Thu, 1 Dec 2016 00:28:39 +0000 (00:28 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am:
666c9d7ea5 am:
539eaa34d5 am:
701e558586
am:
075e8da2a0
Change-Id: Ie578966f612bd9033b25a88b227fd6811207a332
Stephen Chen [Thu, 1 Dec 2016 00:13:50 +0000 (00:13 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am:
666c9d7ea5 am:
539eaa34d5
am:
701e558586
Change-Id: I0a5dd13992a450a04417bdc703781fb2d4c79055
Stephen Chen [Thu, 1 Dec 2016 00:09:32 +0000 (00:09 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity." am:
666c9d7ea5
am:
539eaa34d5
Change-Id: I32a45ccc9a08d8f90e8801f727853fc320db9dc5
Stephen Chen [Wed, 30 Nov 2016 23:59:43 +0000 (23:59 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
am:
666c9d7ea5
Change-Id: I1b193660453cbc492d83501f8e9fe3b544e6e4b2
Fan Zhang [Wed, 30 Nov 2016 01:04:38 +0000 (17:04 -0800)]
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
jackqdyulei [Mon, 7 Nov 2016 22:36:02 +0000 (14:36 -0800)]
Add account picker to Support Tab
Add a spinner to select the account for user.
Bug:
32249920
Test: make RunSettingsRoboTests
Change-Id: I372d16ec5ec3230f5f2994d79f4fd27085092236
Amith Yamasani [Tue, 1 Nov 2016 22:49:21 +0000 (15:49 -0700)]
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
TreeHugger Robot [Wed, 30 Nov 2016 20:53:15 +0000 (20:53 +0000)]
Merge "Add handling for account tiles for specific account type."
Treehugger Robot [Wed, 30 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
Bill Yi [Wed, 30 Nov 2016 19:04:32 +0000 (11:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0adf0de3925b86d14dc110dd0811ecb53375fd76
Auto-generated-cl: translation import
Julia Reynolds [Wed, 30 Nov 2016 15:08:09 +0000 (15:08 +0000)]
Merge "Method rename"
TreeHugger Robot [Tue, 29 Nov 2016 23:20:34 +0000 (23:20 +0000)]
Merge "Add test to ensure all future fragments implements logging."
Doris Ling [Wed, 23 Nov 2016 00:37:06 +0000 (16:37 -0800)]
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
Amin Shaikh [Tue, 22 Nov 2016 01:28:47 +0000 (17:28 -0800)]
Refactor NetworkScoreAppManager for testing.
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
TreeHugger Robot [Tue, 29 Nov 2016 10:22:34 +0000 (10:22 +0000)]
Merge changes from topic 'show-deleted-vpn'
* changes:
VpnSettings PreferenceList tests
VpnSettings: slightly more robust callback context
VpnSettings: show connected VPN even if deleted
TreeHugger Robot [Tue, 29 Nov 2016 06:17:35 +0000 (06:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Tadashi G. Takaoka [Tue, 29 Nov 2016 04:03:54 +0000 (04:03 +0000)]
Merge "Add initialize helper method to improve readability"
Bill Yi [Tue, 29 Nov 2016 03:54:58 +0000 (19:54 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ifa2ac6e743d48d3acaae6302fc59310adb4d09d4
Auto-generated-cl: translation import
Fan Zhang [Mon, 28 Nov 2016 23:36:56 +0000 (15:36 -0800)]
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
Stephen Chen [Tue, 15 Nov 2016 00:24:08 +0000 (16:24 -0800)]
Link WIFI_SAVED_NETWORK_SETTINGS action with activity.
Bug:
32738882
Test: gts test
Change-Id: Ie92e55fd1b0fbb7ba90b3f378a888b098dcf3287
Shahriyar Amini [Tue, 29 Nov 2016 00:17:28 +0000 (00:17 +0000)]
Merge "Use preference key specified in injected settings."
Shahriyar Amini [Tue, 22 Nov 2016 23:02:07 +0000 (15:02 -0800)]
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
TreeHugger Robot [Mon, 28 Nov 2016 22:26:26 +0000 (22:26 +0000)]
Merge "Update strings."
Fan Zhang [Mon, 28 Nov 2016 20:38:11 +0000 (12:38 -0800)]
Update strings.
Bug:
32841662
Test: RunSettingsRoboTests
Change-Id: I178070bfd5f20188e580f8a3a8dd442bd17f3632
Bartosz Fabianowski [Mon, 28 Nov 2016 20:13:30 +0000 (21:13 +0100)]
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
Robin Lee [Thu, 24 Nov 2016 15:46:54 +0000 (15:46 +0000)]
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
Robin Lee [Fri, 4 Nov 2016 15:48:44 +0000 (15:48 +0000)]
VpnSettings: slightly more robust callback context
Test: runtest -x com/android/settings/vpn2/VpnTests.java
Change-Id: I45fa0509c56211602f6abd55a2f44cdf76f28829
Robin Lee [Fri, 4 Nov 2016 14:48:02 +0000 (14:48 +0000)]
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
Tadashi G. Takaoka [Tue, 22 Nov 2016 14:53:36 +0000 (23:53 +0900)]
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
Fan Zhang [Wed, 23 Nov 2016 23:58:44 +0000 (23:58 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41 am:
f3e86ca481 am:
b69ec294c2
am:
660dad552b
Change-Id: Ied8736dd99e576f376cde15e51cf0d49e07814f6
Bill Yi [Wed, 23 Nov 2016 23:58:30 +0000 (23:58 +0000)]
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
Bill Yi [Wed, 23 Nov 2016 23:58:17 +0000 (23:58 +0000)]
Import translations. DO NOT MERGE am:
e7f9b0b30b -s ours am:
f8b4927683 -s ours am:
57b56329f3 -s ours
am:
9a1589ad6a -s ours
Change-Id: Iab860b955d46457f9ccf482394f5d45a9a1a1389
Steven Ng [Wed, 23 Nov 2016 23:58:03 +0000 (23:58 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am:
378dec1495 am:
046a63450f am:
26a3c28735
am:
e8928024c4
Change-Id: I9643fa546e1621577df2938687c09e08cfe935ad
Bill Yi [Wed, 23 Nov 2016 23:57:49 +0000 (23:57 +0000)]
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
Bill Yi [Wed, 23 Nov 2016 23:57:35 +0000 (23:57 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours am:
9a22968ff8 -s ours am:
88b043714b -s ours
am:
72976be89a -s ours
Change-Id: Idaf80586d8c9419cadcc2012663af3ad446bf1b8
Fan Zhang [Wed, 23 Nov 2016 23:45:30 +0000 (23:45 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41 am:
f3e86ca481
am:
b69ec294c2
Change-Id: I2c195509e31812f55b00a1ecc6bc1cdead3f90f4
Bill Yi [Wed, 23 Nov 2016 23:45:18 +0000 (23:45 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours am:
061b294714 -s ours am:
4666b50754 -s ours
am:
5cca5a64e8 -s ours
Change-Id: Ic72803a51ba93c56254173c8f428fb9a146bdc1a
Bill Yi [Wed, 23 Nov 2016 23:45:05 +0000 (23:45 +0000)]
Import translations. DO NOT MERGE am:
e7f9b0b30b -s ours am:
f8b4927683 -s ours
am:
57b56329f3 -s ours
Change-Id: I1d86bc055b65520c41615ddf919c64890f1b653f
Steven Ng [Wed, 23 Nov 2016 23:44:53 +0000 (23:44 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am:
378dec1495 am:
046a63450f
am:
26a3c28735
Change-Id: I490619e028e67635fbd97b9537e3f8435471c0b0
Bill Yi [Wed, 23 Nov 2016 23:44:38 +0000 (23:44 +0000)]
Import translations. DO NOT MERGE am:
a6d9842695 -s ours am:
c027907edc -s ours am:
f8032d0b15 -s ours
am:
71a0bb85a5 -s ours
Change-Id: I306a02fc5ca3330732fde9e8439b12e8a5f55389
Bill Yi [Wed, 23 Nov 2016 23:44:25 +0000 (23:44 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours am:
9a22968ff8 -s ours
am:
88b043714b -s ours
Change-Id: I733c0d9fc99ffe62dc43ff32e0d9067ab2e1fa23
Fan Zhang [Wed, 23 Nov 2016 23:29:22 +0000 (23:29 +0000)]
Fix crash when opening account sync detail for external app am:
c9cdc25f41
am:
f3e86ca481
Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
Bill Yi [Wed, 23 Nov 2016 23:29:07 +0000 (23:29 +0000)]
Import translations. DO NOT MERGE am:
bb6af9902d -s ours am:
061b294714 -s ours
am:
4666b50754 -s ours
Change-Id: I1aaca58936606507f763770e65dace147da5153a
Bill Yi [Wed, 23 Nov 2016 23:28:53 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
e7f9b0b30b -s ours
am:
f8b4927683 -s ours
Change-Id: I4be07f881fd515c3668c12ecab6d2af8452d1ec0
Steven Ng [Wed, 23 Nov 2016 23:28:38 +0000 (23:28 +0000)]
Nexus imprint setting is missing while adding corp account from SUW am:
378dec1495
am:
046a63450f
Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
Bill Yi [Wed, 23 Nov 2016 23:28:25 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
a6d9842695 -s ours am:
c027907edc -s ours
am:
f8032d0b15 -s ours
Change-Id: I0c7f588a8868df3a7235dbbac1eff725dc591070
Bill Yi [Wed, 23 Nov 2016 23:28:12 +0000 (23:28 +0000)]
Import translations. DO NOT MERGE am:
475763d01c -s ours
am:
9a22968ff8 -s ours
Change-Id: Ic98ab45a4b2e31007a18e7018ad5f31c2b82d2ae
TreeHugger Robot [Wed, 23 Nov 2016 23:07:10 +0000 (23:07 +0000)]
Merge "Fix DPM.ACTION_SET_NEW_PASSWORD"
Julia Reynolds [Wed, 23 Nov 2016 16:33:29 +0000 (11:33 -0500)]
Method rename
Test: make
Change-Id: Iec3a811004183c2691dc6776c7f3b620e60e4872
Tony Mak [Wed, 23 Nov 2016 11:36:18 +0000 (11:36 +0000)]
Fix DPM.ACTION_SET_NEW_PASSWORD
Problem:
SetNewPasswordActivity is the new entrance for
ACTION_SET_NEW_PASSWORD. And it starts ChooseLockGeneric with the
fingerprint extras. ChooseLockGeneric infers which user is starting it
and determine which user is setting password. However, it now always
think that it is current user as it is always SetNewPasswordActivity
in current user starting it.
Solution: Resolve the user id in SetNewPasswordActivity and forward it
to ChooseLockGeneric. SetNewPasswordActivity needs to know the user id
anyway in order to have the fingerprint checking in the correct user id.
Test: 1. make RunSettingsRoboTests
2. Manual Test
a. Start SET_NEW_PASSWORD intent in user 0, set password.
User 0 password is set.
b. Start SET_NEW_PASSWORD intent in work profile, set password.
work profile password is set.
c. SET_PROFILE_PARENT_NEW_PASSWORD is always setting parent
password.
d. If fingerprint is disabled, both intent should not show
fingerprint option
e. DO sync auth flow with google.com account, fingerprint option
is shown.
Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc
Fix:
32959373
TreeHugger Robot [Tue, 22 Nov 2016 19:05:27 +0000 (19:05 +0000)]
Merge "Make RemoveUserFragment public."
Fan Zhang [Tue, 22 Nov 2016 16:53:53 +0000 (08:53 -0800)]
Make RemoveUserFragment public.
Fixes:
33034368
Test: make RunSettingsRoboTests
Change-Id: Icbda53c1a5992774fb8bd638f6ab5ad6d4590cfb
Jean-Michel Trivi [Tue, 22 Nov 2016 16:28:44 +0000 (16:28 +0000)]
Merge "Add appOps settings for accessibility volume control"
TreeHugger Robot [Tue, 22 Nov 2016 14:59:31 +0000 (14:59 +0000)]
Merge "Link WIFI_SAVED_NETWORK_SETTINGS action with activity."
Neil Fuller [Tue, 22 Nov 2016 11:55:21 +0000 (11:55 +0000)]
Merge "Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int"
Fan Zhang [Fri, 18 Nov 2016 19:10:05 +0000 (11:10 -0800)]
Move date/time prefs to PreferenceController and add tests.
Bug:
32996243
Test: RunSettingsRoboTests
Change-Id: Ie537bbcc35a96a63251e46f84b57c0a861b9d013
Neil Fuller [Fri, 18 Nov 2016 16:05:40 +0000 (16:05 +0000)]
Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int
To better represent the possible settings values for the
"use 24 hour format" setting : "12", "24", unset (meaning
"use locale default") the platform is being changed.
The EXTRA_TIME_PREF_24_HOUR_FORMAT for the ACTION_TIME_CHANGED
is now an int, not a boolean. 0 means "12", 1 means "24" and
2 means "use locale default".
Bug:
32761619
Test: Manual test on device and make RunSettingsRoboTests
Change-Id: I9aae6f8d12c4724c829f2812626a6193e510dbf9
Bill Yi [Mon, 21 Nov 2016 01:38:38 +0000 (01:38 +0000)]
Import translations. DO NOT MERGE am:
001632d55c -s ours am:
9e17133192 -s ours
am:
d6de02579f -s ours
Change-Id: I75d1d24d5c4123d3aa782ec7c2850909ec14de89
Bill Yi [Mon, 21 Nov 2016 01:33:23 +0000 (01:33 +0000)]
Import translations. DO NOT MERGE am:
001632d55c -s ours
am:
9e17133192 -s ours
Change-Id: Idda03611e22b67dba524f61ac9884de84950d962
Bill Yi [Mon, 21 Nov 2016 01:28:26 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am:
001632d55c -s ours
Change-Id: Ib267ac961a6ef99c9c1401e8967725b0f7914bac