OSDN Git Service
Jeff Sharkey [Mon, 3 Apr 2017 23:19:17 +0000 (17:19 -0600)]
Don't try using a detached fragment.
Test: builds, boots
Bug:
36486843
Change-Id: I3e2d2bcd56edcc86370f4b64dabdf155d63f40d3
Amin Shaikh [Fri, 31 Mar 2017 20:56:53 +0000 (13:56 -0700)]
Fix NPE when forgetting networks.
- Fixed disablement of ephemeral networks
- Exit out of the fragment when Forget is pressed
Bug:
36723238
Test: m RunSettingsRoboTests and manual testing
Change-Id: I83c09a44dbef0f02a452dc8c3163523a27bd4b63
Jesse Evans [Sun, 2 Apr 2017 16:13:53 +0000 (16:13 +0000)]
Merge "Removes summary text from Instant Apps details" into oc-dev
Charles He [Sat, 1 Apr 2017 17:52:25 +0000 (18:52 +0100)]
VPN settings: add missing string resource
Previously, a string resource was deleted by mistake in commit
cce4e61260153dc4826e648f733f7451f73dfa01. This bug went uncaught by
local and presubmit build checks. We add the missing string back to
strings.xml to fix the build. The affected string is referenced in
ManageablePreference.java.
Apologies for any inconvenience.
Test: make SettingsRoboTests; manually navigate through VPN settings
Bug:
36815998
Change-Id: Ibc2ef9ad43cad73ef5f078714faf5c52bc7198c6
TreeHugger Robot [Sat, 1 Apr 2017 05:17:09 +0000 (05:17 +0000)]
Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 05:12:38 +0000 (05:12 +0000)]
Merge "Device management info: Refer to current user, not primary user" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:59:52 +0000 (04:59 +0000)]
Merge "Adds the lightning badge for Instant Apps" into oc-dev
TreeHugger Robot [Sat, 1 Apr 2017 04:59:30 +0000 (04:59 +0000)]
Merge "Disabling switch preference when unknown sources are blocked" into oc-dev
Suprabh Shukla [Mon, 13 Mar 2017 22:11:08 +0000 (15:11 -0700)]
Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.
Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test
Bug:
34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
Merged-In: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
TreeHugger Robot [Sat, 1 Apr 2017 02:03:26 +0000 (02:03 +0000)]
Merge "Update text for USB mode selection dialog." into oc-dev
Stephen Chen [Fri, 31 Mar 2017 21:42:20 +0000 (14:42 -0700)]
Improve responsiveness of toggling wifi and refactor user restriction logic.
Moved logic for handling wifi state changes into correct listener
method. Changed logic for handling isUiRestricted. This should
streamline toggling flow for WiFi both when Wifi Scanning is on and off,
and in guest mode.
Bug:
36724409
Bug:
36711085
Bug:
36398321
Test: make, test cases in tracking bug
Change-Id: I69fe07369db192c94f81dd678087ac4e8c35197b
Doris Ling [Fri, 31 Mar 2017 18:09:07 +0000 (11:09 -0700)]
Update text for USB mode selection dialog.
- create separate strings to be used for the USB preference summary.
- reverted the previous changes made to change the verb in the usb
preference title.
- updated the summary text for the usb selection description for charge
only.
Bug:
36234108
Test: builds
Change-Id: I4a57ecd6f9be4b3c10885ac1bbba76ff3df02b84
TreeHugger Robot [Fri, 31 Mar 2017 17:54:13 +0000 (17:54 +0000)]
Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev
Bartosz Fabianowski [Thu, 30 Mar 2017 08:33:28 +0000 (10:33 +0200)]
Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.
Bug:
32692748
Test: m RunSettingsRoboTests
Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
(cherry picked from commit
b836da263d8559255c528fe68410649d979cf123)
Jesse Evans [Tue, 28 Mar 2017 17:22:12 +0000 (10:22 -0700)]
Removes summary text from Instant Apps details
Test: Robolectric test to ensure header item is GONE.
Bug:
36512295
Change-Id: I020e90d6521c853e67ae600e5786445a8469a934
(cherry picked from commit
14a258443fa4f512531a99b0c11ac7d2b06ce378)
Jesse Evans [Wed, 29 Mar 2017 00:30:09 +0000 (17:30 -0700)]
Adds the lightning badge for Instant Apps
Adds the lightning bolt badge for Instant Apps to the
InstalledAppDetails page.
Test: Robolectric test to ensure the badge is shown for Instant Apps
and also that it is not shown for installed apps.
Bug:
36512295
Change-Id: I8496d684fa3a9dc316fa5af16399e6d07f68255a
(cherry picked from commit
2400d31651142214159ec571064485a4346cb732)
TreeHugger Robot [Fri, 31 Mar 2017 01:57:06 +0000 (01:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 31 Mar 2017 01:00:16 +0000 (01:00 +0000)]
Merge "Fix mvno match data is incorrect for APNs" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 23:59:33 +0000 (23:59 +0000)]
Merge "Fix write wifi config to nfc." into oc-dev
Wei Huang [Mon, 23 Jan 2017 11:26:20 +0000 (20:26 +0900)]
Fix mvno match data is incorrect for APNs
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.
[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.
Bug:
34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
Bill Yi [Thu, 30 Mar 2017 22:09:46 +0000 (15:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic117b670e525612d9f243eff4f151d9ee616d198
Auto-generated-cl: translation import
Amin Shaikh [Thu, 30 Mar 2017 21:44:42 +0000 (14:44 -0700)]
Fix write wifi config to nfc.
aog/340881 converts the NFC token hex string to lowercase instead of
uppercase. This change updates Settings to encode the password as a
lowercase hex string.
Bug:
35725168
Test: m RunSettingsRoboTests and manually testing writing GIN-2G to nfc
Change-Id: I85e991c4b8a3d7634dea7f945a23a2ef3d3fe448
TreeHugger Robot [Thu, 30 Mar 2017 19:57:00 +0000 (19:57 +0000)]
Merge "Remove android:visibility attributes from Preferences" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 18:19:43 +0000 (18:19 +0000)]
Merge "Add link speed to Wifi details page." into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 18:08:46 +0000 (18:08 +0000)]
Merge "Do not show progress bar when disabling wifi." into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 17:57:15 +0000 (17:57 +0000)]
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
Lei Yu [Thu, 30 Mar 2017 17:20:40 +0000 (17:20 +0000)]
Merge "Update string for battery main page" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 16:48:52 +0000 (16:48 +0000)]
Merge "Reserve full indexing for SearchFragment" into oc-dev
Julia Reynolds [Thu, 30 Mar 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Redirect zen mode suggestion" into oc-dev
Robin Lee [Thu, 30 Mar 2017 14:13:07 +0000 (15:13 +0100)]
VPN: uncheck lockdown if always-on is off
Change-Id: I00933e0c8567997d800f9f31f78c7b19922a52b8
Fix:
36713605
Test: make RunSettingsRoboTests -j30
Julia Reynolds [Thu, 30 Mar 2017 14:29:02 +0000 (10:29 -0400)]
Redirect zen mode suggestion
Test: manual, click on DND suggestion
Bug:
36737163
Change-Id: I67f0ed801b05bb502af21952aa2050ae5e09df88
Bartosz Fabianowski [Fri, 24 Mar 2017 17:32:50 +0000 (18:32 +0100)]
Remove android:visibility attributes from Preferences
The android:visibility attribute is not applicable to Preferences and
does nothing.
Bug:
32692748
Test: None
Change-Id: I9aa6c3df824b61f96466cc7de6c046870a46678c
(cherry picked from commit
28a03aeb4854685fe30c334eea4f538da563a1e9)
Bartosz Fabianowski [Fri, 24 Mar 2017 17:04:31 +0000 (18:04 +0100)]
Keep EnterprisePrivacySettingsActivity always enabled
The existing code checks during Settings startup whether the device is
managed. If it is not, EnterprisePrivacySettingsActivity is disabled.
If the device then becomes managed, Settings will not notice until
the next restart, causing any attempt to launch this Activity via an
Intent to crash.
This CL changes things so that the Activity is always enabled but
simply does nothing when launched on a non-managed device.
Bug:
34122104
Test: Integration test coming in a separate CL
Change-Id: I0a1dfcb41b405d981309696d97678df6787b4f72
(cherry picked from commit
92d25fb5f324f1e996e2cdf2e95d829860abb952)
TreeHugger Robot [Thu, 30 Mar 2017 01:39:01 +0000 (01:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 01:17:20 +0000 (01:17 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
Lei Yu [Thu, 30 Mar 2017 01:14:35 +0000 (01:14 +0000)]
Merge "Hide Wifi and Systemui in settings main page" into oc-dev
Lei Yu [Thu, 30 Mar 2017 01:14:24 +0000 (01:14 +0000)]
Merge "Add summary for categories in battery advanced page" into oc-dev
Matthew Fritze [Tue, 28 Mar 2017 00:42:36 +0000 (17:42 -0700)]
Reserve full indexing for SearchFragment
Full Index should only be accessible from Search Fragment,
and when only full index should declare a locale to be
indexed.
Test: make RunSettingsRoboTests
Fixes:
36656637
Change-Id: Ie673067118ac6b184570e116ea24a169be027053
Stephen Chen [Wed, 29 Mar 2017 23:53:45 +0000 (16:53 -0700)]
Do not show progress bar when disabling wifi.
Bug:
34286786
Test: make, test on device.
Change-Id: I109ac05ce3565abc3d80ecec2879c2f7c8bc1724
Bill Yi [Wed, 29 Mar 2017 23:33:00 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibb35af37750b62e22f828448b8230dc67b2de5c2
Auto-generated-cl: translation import
Stephen Chen [Wed, 29 Mar 2017 21:35:06 +0000 (14:35 -0700)]
Add link speed to Wifi details page.
Also make detail items unselectable.
Bug:
36444504
Test: make RunSettingsRoboTests
Change-Id: I393a3a25c8c036da1df1dc2788accfecb3563e14
Lei Yu [Wed, 29 Mar 2017 23:16:29 +0000 (23:16 +0000)]
Merge "Create Controller for app buttons" into oc-dev
Pavlin Radoslavov [Fri, 24 Feb 2017 18:25:09 +0000 (10:25 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: I6e3144ff93bfc289fb25f4961fc00f39e8222290
(cherry picked from commit
b0d8cdf8f81070dd2384f7ab756d0afdc1384107)
Christine Franks [Wed, 29 Mar 2017 22:41:40 +0000 (22:41 +0000)]
Merge "Disable default indicator for night display" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 21:00:55 +0000 (21:00 +0000)]
Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev
Peter Qiu [Tue, 14 Mar 2017 22:53:20 +0000 (15:53 -0700)]
wifi: managed Passpoint configurations in "Saved Networks" page
Instead of going through WifiTracker to retrieve saved network
configurations (including both WiFi networks and Passpoint provider
configurations), use the WifiManager's APIs to retrieve the
configurations directly, to avoid any unnecessary complexities.
Also update to use the appropriate APIs for configuration removal
based on the configuration type.
Bug:
34207710
Test: manual test by removing a Passpoint configuration from
"Saved Networks" page.
Change-Id: I549cc484d8825b6c38895428c1b7941390bb5f1f
jackqdyulei [Wed, 29 Mar 2017 00:50:04 +0000 (17:50 -0700)]
Update string for battery main page
Bug:
36576021
Test: Build
Change-Id: I60c43868dd54bfaf75648a9ac70a3ff5815180b6
(cherry picked from commit
630a8c054b7be4ac6b8baf32b5f85ff6844c4ddf)
Doris Ling [Wed, 29 Mar 2017 20:33:21 +0000 (20:33 +0000)]
Merge "Only register conditions receiver when needed." into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 20:26:10 +0000 (20:26 +0000)]
Merge "Increase the char limit for the bluetooth tethering strings." into oc-dev
jackqdyulei [Mon, 27 Mar 2017 23:38:47 +0000 (16:38 -0700)]
Hide Wifi and Systemui in settings main page
Also move the systemui to category system
Fix:
36644740
Fix:
36645264
Test: RunSettingsRoboTests
Change-Id: I6b64a7dca58091f3a1d8b7d99c8bae7ddf9169f9
(cherry picked from commit
1e95b74f774b2b8b97b8f512451313696ed97c50)
jackqdyulei [Mon, 27 Mar 2017 21:00:29 +0000 (14:00 -0700)]
Add summary for categories in battery advanced page
If the category only contains one app, show usage time, otherwise
show app with maximum usage.
Also add usage time for apps in battery settings page.
Bug:
35396770
Test: RunSettingsRoboTests
Change-Id: I43fe9c2289535be2c1b95ffded6b52b0ff099589
(cherry picked from commit
3bbaca9c7c863c802f2897ac30daa2c59e2115c1)
jackqdyulei [Wed, 15 Mar 2017 22:13:10 +0000 (15:13 -0700)]
Create Controller for app buttons
These two buttons(uninstall + forcestop) are used in both battery page
and app page, we should move the logic for these two buttons into one
place.
This cl creates the AppButtonsPreferenceController for the above
purpose. This cl only copies the logic to controller but hasn't make
InstalledAppDetails use this controller.
Since DialogFragment could not use function in controller directly,
the controller expose DialogListener and all the fragments must
implement this interface. Then they can delegate the method call
to controller directly.
The following cl will:
1. Make the InstalledAppDetails be compatible to controller
2. Make the InstalledAppDetails use this controller.
Bug:
35810915
Test: RunSettingsRoboTests
Change-Id: Ie2aa8064bcec3003233896c18be772825b12930a
(cherry picked from commit
82d07983b46b4c6a1b7a3c431c57ff45e84e72be)
Christine Franks [Wed, 29 Mar 2017 18:35:57 +0000 (11:35 -0700)]
Disable default indicator for night display
Bug:
36695989
Test: make -j100, and manually verified that default indicator no
longer appears on the SeekBar.
Change-Id: I574938bc664f8b750a3fe9ab52f361f46ad1f327
Stephen Chen [Tue, 28 Mar 2017 21:14:35 +0000 (14:14 -0700)]
Connect immediately after pressing on previously connected saved networks.
Bug:
34287193
Test: manual inspection
Change-Id: Idf7156fa48640a34ce11cbf2f9683cfc6525a7b5
TreeHugger Robot [Wed, 29 Mar 2017 18:19:03 +0000 (18:19 +0000)]
Merge "Don't run postexecute if activity is gone." into oc-dev
Doris Ling [Tue, 28 Mar 2017 23:02:04 +0000 (16:02 -0700)]
Only register conditions receiver when needed.
1. Update the dnd receiver to listen when dashboard summary running.
- remove the dnd receiver from Android manifest, and create it inside
the dnd condition.
- add lifecycle implementation to condition manager, so that the dnd
condition can know when to register and unregister the receiver.
- remove getReceiverClass() from dnd condition so that its receiver will
not be disabled by the default condition handling when condition is
silenced.
2. Remove all other conditions receiver from Android manifest.
- the broadcast receivers for HotspotCondition, AirplaneModeCondition,
CellularDataCondition from the manifest and create them inside the
condition classes.
- update Condition.onSilenceChanged() to register/unregister the
receivers instead of enable/disable the receiver class.
Change-Id: Iea6288382680df2b02884d1934b8db85daae404c
Fix:
35968517
Test: make RunSettingsRoboTests
Maurice Lam [Wed, 29 Mar 2017 15:45:21 +0000 (15:45 +0000)]
Merge "Revert choose lock header file to non-setup theme" into oc-dev
Julia Reynolds [Wed, 29 Mar 2017 14:41:22 +0000 (10:41 -0400)]
Don't run postexecute if activity is gone.
Change-Id: I9133a4d9e4e0fd2a92cc4df786e0bc5407d981fe
Fixes:
36551766
Test: monkey tests
Doris Ling [Mon, 27 Mar 2017 23:14:01 +0000 (16:14 -0700)]
Increase the char limit for the bluetooth tethering strings.
Longer summary text for the bluetooth tethering should be supported for
translation to other languages.
Bug:
36626585
Bug:
36627493
Bug:
36635108
Test: builds
Change-Id: Ia1409520443fd05c54a6c28fc292dd39b1c198b2
(cherry picked from commit
6d17af4d642302c8947f088c7336db8c5e6f2061)
Maurice Lam [Tue, 28 Mar 2017 23:27:03 +0000 (16:27 -0700)]
Revert choose lock header file to non-setup theme
The activity ChooseLockGeneric which inflates the layout file
choose_lock_generic_fingerprint_header is not setup themed, and
therefore should not use setup resources.
Test: Run ChooseLockGenericTest via `am instrument`
Bug:
36688431
Change-Id: I7286958345d1762d4a93176afe300d1e4d168f6d
TreeHugger Robot [Wed, 29 Mar 2017 02:20:09 +0000 (02:20 +0000)]
Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev
Stephen Chen [Wed, 29 Mar 2017 00:20:41 +0000 (17:20 -0700)]
Do not disable toggle when Wi-Fi is enabling and disabling.
The toggle disabling of Wi-Fi in its ENABLING and DISABLING states
are not in sync with the loading of access points, and so removed
the disabling entirely.
Bug:
34287227
Test: manual inspection.
Change-Id: Ibcb401eaaa34be79e1e73a947b2ea845cca79996
TreeHugger Robot [Tue, 28 Mar 2017 23:21:00 +0000 (23:21 +0000)]
Merge "Set flagForceAscii for device password entries" into oc-dev
TreeHugger Robot [Tue, 28 Mar 2017 20:38:24 +0000 (20:38 +0000)]
Merge "Remove delayed processing of UI events in onStop" into oc-dev
Doris Ling [Tue, 28 Mar 2017 19:53:31 +0000 (19:53 +0000)]
Revert "Convert BT preference to use TwoTargetPreference"
This reverts commit
09c7f15b121a531b17e39ba1dd3f54ae42472e3d.
Change-Id: I29aa67f026c0b54da08b19657f9916275e5a3459
Amin Shaikh [Tue, 28 Mar 2017 18:41:32 +0000 (11:41 -0700)]
Remove delayed processing of UI events in onStop
Bug:
36682492
Test: manually; test tracking in b/
36403635
Change-Id: Ia369cd61a6473ae2af4891cf6b923900504921c1
Doris Ling [Tue, 28 Mar 2017 18:14:34 +0000 (11:14 -0700)]
Add null check for the media player when surface texture is available.
- Call to MediaPlayer.create() method can return null, and hence we need
to check the return value before trying access the media player.
Change-Id: I4a5e0edbd6db21b678efb05ea733187f34185432
Fix:
36668356
Test: make RunSettingsRoboTests
Yohei Yukawa [Tue, 21 Mar 2017 23:47:20 +0000 (16:47 -0700)]
Set flagForceAscii for device password entries
Since the beginning [1], ChooseLockPassword#validatePassword() has never
accepted non-ASCII characters [2]. Hence we can safely specify
EditorInfo#IME_FLAG_FORCE_ASCII so that IMEs can optimize their UX based
on this flag. Note that EditorInfo#IME_FLAG_FORCE_ASCII is just a hint
for the IME so there should be no behavior change in the system side.
Note also that EditorInfo#IME_FLAG_FORCE_ASCII has been used in KeyGuard
(keyguard_password_view.xml) since JB MR-1 [3] so this flag is considered
to be well tested.
[1]:
00d2476d8fc122b4eef59d6be6f7aa41e9c56fde
[2]: Only character c where 32 <= c <= 126 is accepted
[3]: Id75286113771ca1407e9db182172b580f870b612
Test: Run `adb shell dumpsys input_method` when the password entry
field is focused to make sure that 'imeOptions' parameter
has 0x80000000 bit. Tested the following scenarios:
- PIN on a direct-boot disabled device
- PIN on a direct-boot enabled device
- Password on a direct-boot disabled device
- Password on a direct-boot enabled device
Fixes:
27858858
Change-Id: I3075e24c6dac4d49f4d0e56a0d4d8434a323754d
Amin Shaikh [Tue, 28 Mar 2017 01:07:46 +0000 (18:07 -0700)]
Use Collator to sort saved networks.
Bug:
36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
(cherry picked from commit
0c0fc19aef603470fc42ca33771e57c3656510eb)
fen wang [Tue, 28 Mar 2017 05:19:49 +0000 (05:19 +0000)]
Merge "Initialize LDAC to ABR mode" am:
f80b445166 am:
8bed25af1f
am:
9660f0ee80
Change-Id: I4ff3e93ae7093deb94006c4ddf651045a1c0ad13
fen wang [Tue, 28 Mar 2017 05:11:38 +0000 (05:11 +0000)]
Merge "Initialize LDAC to ABR mode" am:
f80b445166
am:
8bed25af1f
Change-Id: Iab167bc1688e87ea0aeb44853dda3854d1601fc9
fen wang [Tue, 28 Mar 2017 05:03:43 +0000 (05:03 +0000)]
Merge "Initialize LDAC to ABR mode"
am:
f80b445166
Change-Id: If89ff9a484b13a61e783c0eaf251e6fd9fbb6ea8
Treehugger Robot [Tue, 28 Mar 2017 04:54:19 +0000 (04:54 +0000)]
Merge "Initialize LDAC to ABR mode"
TreeHugger Robot [Tue, 28 Mar 2017 02:05:49 +0000 (02:05 +0000)]
Merge "Changed Night display strings to "Night Light""
fen wang [Mon, 13 Mar 2017 10:57:25 +0000 (19:57 +0900)]
Initialize LDAC to ABR mode
Bug:
35381097
Change-Id: Idcc2fabe86acaf441f5a71f5d2bb66ad29252cdb
Steven Moreland [Tue, 28 Mar 2017 01:27:24 +0000 (01:27 +0000)]
Merge "Revert "Development Options: toggle binderized hals"" am:
21de66bc0c am:
68b580f346
am:
efb7925e7a
Change-Id: I0d97c4ecfb4cd04ee0a19468c0c8382e61f4ae79
TreeHugger Robot [Tue, 28 Mar 2017 01:22:46 +0000 (01:22 +0000)]
Merge "Changes to installed app details screen for instant apps"
Steven Moreland [Tue, 28 Mar 2017 01:21:58 +0000 (01:21 +0000)]
Merge "Revert "Development Options: toggle binderized hals"" am:
21de66bc0c
am:
68b580f346
Change-Id: I95ed12e6c619397a1434d30c714f8f8424036647
Steven Moreland [Tue, 28 Mar 2017 01:18:00 +0000 (01:18 +0000)]
Merge "Revert "Development Options: toggle binderized hals""
am:
21de66bc0c
Change-Id: If9288dda590a4f7fe5a60faeec695045e038ead1
Treehugger Robot [Tue, 28 Mar 2017 01:12:13 +0000 (01:12 +0000)]
Merge "Revert "Development Options: toggle binderized hals""
TreeHugger Robot [Tue, 28 Mar 2017 00:46:52 +0000 (00:46 +0000)]
Merge "Update settings tests to use new constructor."
TreeHugger Robot [Tue, 28 Mar 2017 00:31:05 +0000 (00:31 +0000)]
Merge "Fix forget button on wifi details page."
TreeHugger Robot [Mon, 27 Mar 2017 23:35:44 +0000 (23:35 +0000)]
Merge "Move automatic rules to main DND settings page."
Amin Shaikh [Mon, 27 Mar 2017 17:24:49 +0000 (10:24 -0700)]
Fix forget button on wifi details page.
- Corrected logic for forgetting the current network in the network
details page
- After a user has forgotten a network, the button becomes disabled
(TODO final UX on this - go/remaining-wifi-picker-work tracks this)
- Added unit tests for forgetting network flow
- Fixed bug where the current tethering WifiConfiguration was associated
with the currrent network
Bug:
36458941
Test: m RunSettingsRoboTests
Change-Id: Ie3c4bae8b295908b17179e60359c8bc599519744
Daniel Nishi [Mon, 27 Mar 2017 22:20:08 +0000 (22:20 +0000)]
Merge "Badge the icons for profile storage screen."
Antony Sargent [Wed, 8 Mar 2017 22:34:10 +0000 (14:34 -0800)]
Changes to installed app details screen for instant apps
Bug:
35098444
Test: make RunSettingsRoboTests
This implements the following changes to the app details screen:
-Suppresses the "Uninstall" and "Force Stop" buttons
-Adds "Install app" and "Clear app" buttons
-Adds a mechanism for showing a link to the store's app details
page that can be different from the default for installed apps.
Change-Id: Icea83f7d1fde62d4101cb0c8a6d03849f6c56bca
Sean Stout [Mon, 27 Mar 2017 20:59:09 +0000 (13:59 -0700)]
Changed Night display strings to "Night Light"
Bug:
34900174
Test: manual
Change-Id: Ia7757474b34c5dae3335102c598bc7f1f0da5a75
Doris Ling [Mon, 27 Mar 2017 20:38:24 +0000 (20:38 +0000)]
Merge "Fix crash when selecting Settings->Display->Brightness level."
Maurice Lam [Mon, 27 Mar 2017 20:27:21 +0000 (20:27 +0000)]
Merge "Support center alignment"
Doris Ling [Mon, 27 Mar 2017 20:22:19 +0000 (13:22 -0700)]
Fix crash when selecting Settings->Display->Brightness level.
System UI updated the intent string for launching the brightness dialog.
Update the corresponding intent in the settings manifest to match the
change.
Change-Id: I4f8a2d5f424b2a0613d77ff7ca69a9c6237ef8fe
Fix:
36647069
Test: manual
TreeHugger Robot [Mon, 27 Mar 2017 20:04:21 +0000 (20:04 +0000)]
Merge "Expand Wifi Picker Menu by default."
Julia Reynolds [Wed, 22 Mar 2017 18:05:46 +0000 (14:05 -0400)]
Move automatic rules to main DND settings page.
Change-Id: I32b103714d4864ab32e2c85d86106dc118f9c338
Fixes:
31050255
Test: manual
Stephen Chen [Mon, 27 Mar 2017 18:26:46 +0000 (11:26 -0700)]
Expand Wifi Picker Menu by default.
Bug:
36575182
Test: make SettingsFunctionalTests and ran tests on device.
Change-Id: I256ea82a8e4478d81497b9a56cc4fb7755839f1c
Jeff Davidson [Mon, 27 Mar 2017 17:17:43 +0000 (10:17 -0700)]
Fix build breakage in branches downstream of
R.string.background_activity_summary was deleted in master, but is
still referenced by res/xml/power_usage_details.xml. master builds
because the stale translations are currently still present, but will
suddenly fail to build as soon as the translations are updated.
Downstream branches of master which don't have translations configured
are already broken.
Reintroduce the old string to fix the builds.
Change-Id: I20c6aa41c97644a2733ff92a459587e3cb6bf7a0
Test: Will rely on TreeHugger
Fixes:
36619997
Robin Lee [Mon, 27 Mar 2017 16:35:34 +0000 (17:35 +0100)]
resolve merge conflicts of
90f009ebb5 to master
Test: make RunSettingsRoboTests
Change-Id: I7f0eece61918c29d33316fa755eca2e8f4deba46
Robin Lee [Mon, 27 Mar 2017 16:25:24 +0000 (16:25 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled" am:
fb81f50c27
am:
c834ed1e4e
Change-Id: I32ddda40ed4654288eef45dfdb2f53b2f9aba988
Robin Lee [Mon, 27 Mar 2017 16:22:56 +0000 (16:22 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
am:
fb81f50c27
Change-Id: I588fc958daacfd0b7859c00c6b5b164e6e02a33d
Robin Lee [Mon, 27 Mar 2017 16:18:19 +0000 (16:18 +0000)]
Merge "[VpnSettings]Crash when activity has been recycled"
TreeHugger Robot [Mon, 27 Mar 2017 15:48:54 +0000 (15:48 +0000)]
Merge "Populate summary for top level wifi picker options"
TreeHugger Robot [Sat, 25 Mar 2017 20:35:02 +0000 (20:35 +0000)]
Merge "Add strings that will be needed for screen saver settings"