OSDN Git Service
TreeHugger Robot [Fri, 7 Apr 2017 02:28:46 +0000 (02:28 +0000)]
Merge "Add test to verify no crash on selecting brightness level." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:27:54 +0000 (02:27 +0000)]
Merge "Update USb preference controller to use the new summary texts." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 02:09:35 +0000 (02:09 +0000)]
Merge "Update summary text for Trust agent." into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 01:41:50 +0000 (01:41 +0000)]
Merge "Add subtext to Default apps." into oc-dev
Lei Yu [Fri, 7 Apr 2017 01:34:36 +0000 (01:34 +0000)]
Merge "Remove PowerUsageDetail.java" into oc-dev
TreeHugger Robot [Fri, 7 Apr 2017 00:42:04 +0000 (00:42 +0000)]
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
Doris Ling [Thu, 6 Apr 2017 21:22:18 +0000 (14:22 -0700)]
Update summary text for Trust agent.
Update the summary text to show the number of active trust agent.
Bug:
36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
Doris Ling [Wed, 5 Apr 2017 23:03:02 +0000 (16:03 -0700)]
Add subtext to Default apps.
Retrieve the default Sms app, default Browser app, and default Phone app
and append the label together to form the summary text for Default apps
settings.
Bug:
36376411
Test: make RunSettingsRoboTests
Change-Id: I8ccf71dde43bba04c4bc4a900c9a181513e7710b
Daniel Nishi [Thu, 6 Apr 2017 23:19:17 +0000 (23:19 +0000)]
Merge ""% used" instead of "% full" in storage donut." into oc-dev
Daniel Nishi [Thu, 6 Apr 2017 22:49:23 +0000 (22:49 +0000)]
Merge "Re-add the option to migrate data back." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 22:25:55 +0000 (22:25 +0000)]
Merge "Update foreground string in battery page" into oc-dev
Doris Ling [Thu, 6 Apr 2017 22:10:29 +0000 (15:10 -0700)]
Add test to verify no crash on selecting brightness level.
Add UI test to launch Settings->Display->Brightness level and Settings
app does not crash.
Change-Id: I526f44961bd0efbcacde334affbe2b7a93da0ce3
Fix:
36647069
Test: make SettingsTests
TreeHugger Robot [Thu, 6 Apr 2017 21:50:06 +0000 (21:50 +0000)]
Merge "Fix crash when clicking item in Battery screen" into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Daniel Nishi [Thu, 2 Mar 2017 23:58:23 +0000 (15:58 -0800)]
Re-add the option to migrate data back.
Currently, users can use an SD card or USB drive and adopt it as
internal storage using existing flows. They can manage this drive
perfectly fine using the old storage screen, which is still around.
One functionality that was lost was the ability to migrate data from
the adopted drive back to the private internal storage. This appeared
in a dropdown in the old storage settings.
By duplicating the code to create just that specific menu item and its
click behavior, we can restore this functionality to the new storage
view.
Change-Id: Id0e01c560e7249acccfe86c5da44466dd58fe5d4
Merged-In: I4b8c06912d2c0b2c5be5bce8b217d45accf34d4b
Fixes:
35926028
Test: Settings Robotest
Doris Ling [Thu, 6 Apr 2017 20:03:23 +0000 (20:03 +0000)]
Merge "Add summary text to Display->Brightness level." into oc-dev
jackqdyulei [Thu, 6 Apr 2017 19:48:52 +0000 (12:48 -0700)]
Fix crash when clicking item in Battery screen
"last full charge/Screen usage since full charge" goes crash when
clicking on it. This is because The default behaviour for
PowerGaugePreference is to start detail page and the above two items
are PowerGaugePreference.
This cl set these two items as non-selectable.
Bug:
37080048
Test: make -j40 SettingsTest
Change-Id: Ide4e151dcd0b44fb795a5753c91f2197b2a24a56
Bill Yi [Thu, 6 Apr 2017 19:36:34 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
36981734
Change-Id: I2d0ef02f962fd737c6269feb97dc9ca9336671a5
Doris Ling [Thu, 6 Apr 2017 18:35:52 +0000 (18:35 +0000)]
Merge "Update summary for Connected devices->Printing." into oc-dev
Doris Ling [Thu, 6 Apr 2017 17:04:44 +0000 (17:04 +0000)]
Merge "Update Wifi off summary text." into oc-dev
Doris Ling [Thu, 6 Apr 2017 17:01:45 +0000 (17:01 +0000)]
Merge "Re-order the display settings items." into oc-dev
Christine Franks [Thu, 6 Apr 2017 16:47:52 +0000 (16:47 +0000)]
Merge "Prevent apps from displaying over Settings" into oc-dev
Marie Janssen [Thu, 23 Mar 2017 21:36:45 +0000 (14:36 -0700)]
Bluetooth: only unregisterReceiver if we register
We can get to onDestroy() without registering now.
Test: none
Fixes:
36501241
Change-Id: I90da3b350f9951993238d51f9fde86ccb335cafd
(cherry picked from commit
af34ed06f1b4b3734d883c7398b713b20585e1bd)
TreeHugger Robot [Thu, 6 Apr 2017 01:41:42 +0000 (01:41 +0000)]
Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 01:41:27 +0000 (01:41 +0000)]
Merge "Update saved networks screen after forget." into oc-dev
TreeHugger Robot [Thu, 6 Apr 2017 01:25:06 +0000 (01:25 +0000)]
Merge "Add resource string for Security dashboard summary." into oc-dev
Christine Franks [Wed, 15 Mar 2017 22:13:44 +0000 (15:13 -0700)]
Prevent apps from displaying over Settings
Specifically, the DrawOverlayDetails fragment only.
Bug:
36070413
Test: make RunSettingsRoboTests -j100
Change-Id: I0069f0cacf8c963c8c6878dc89a32b205983a568
TreeHugger Robot [Wed, 5 Apr 2017 22:45:46 +0000 (22:45 +0000)]
Merge "Fix crash when opening battery page" into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 22:13:00 +0000 (22:13 +0000)]
Merge "Ui changes in battery main page" into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Lower case the first letter of storage type." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 21:27:36 +0000 (21:27 +0000)]
Merge "Create Espresso test class for WifiSettings." into oc-dev
TreeHugger Robot [Wed, 5 Apr 2017 21:20:09 +0000 (21:20 +0000)]
Merge "wifi: allow manual connection to a Passpoint provided network" into oc-dev
jackqdyulei [Wed, 5 Apr 2017 21:20:06 +0000 (14:20 -0700)]
Remove PowerUsageDetail.java
Now we use AdvancedPowerUsageDetail instead.
This cl also:
1. Remove PowerUsageDetail in SearchIndexableResources since we
don't want to index PowerUsageDetail
2. Add AdvancedPowerUsageDetail in SettingsGateway
Bug:
36992358
Test: Build
Change-Id: I598bb159aa2b5a4889071ae9a17d29554e6afe11
jackqdyulei [Fri, 31 Mar 2017 21:26:38 +0000 (14:26 -0700)]
Fix crash when opening battery page
The settings crashes when opening battery usage detail page from
installed app page. Main reason is that it trying to open obsolete
page. This cl directs it to open AdvancedPowerUsageDetail instead.
Following cl will make InstalledAppDetail show calibrated percentage,
which is trakced in b/
36816681
Bug:
36792973
Test: RunSettingsRoboTests
Change-Id: Ie63e64e543ed3b28974ffdda8b42c97e7749a0f7
(cherry picked from commit
fac713318c8834ded349bc6d187499f61d399748)
TreeHugger Robot [Wed, 5 Apr 2017 20:25:36 +0000 (20:25 +0000)]
Merge "Removed deprecated auto(F)ill settings." into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 20:10:58 +0000 (20:10 +0000)]
Merge "Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"" into oc-dev
Daniel Nishi [Wed, 5 Apr 2017 20:04:55 +0000 (20:04 +0000)]
Revert "renaming/removing fingerprints should be reflected in UI if fingerprintservice lags"
This reverts commit
bb994166cb12378be5c3b0372379f5cdb0ffceb0.
Change-Id: I713012a3c449311b5daf8af81b97c050889560c7
Daniel Nishi [Wed, 5 Apr 2017 19:59:12 +0000 (19:59 +0000)]
Merge "Fix a unit test regression." into oc-dev
Doris Ling [Wed, 5 Apr 2017 19:57:58 +0000 (12:57 -0700)]
Add resource string for Security dashboard summary.
Add the summary text to be shown when fingerprint sensor is not
available.
Bug:
36889582
Test: builds
Change-Id: I868ced81ad3b3177c8ca366adba937342b67ce65
Amin Shaikh [Wed, 5 Apr 2017 18:35:08 +0000 (11:35 -0700)]
Update saved networks screen after forget.
Bug:
36891459
Test: m RunSettingsRoboTests and manual testing
Change-Id: Ie125bd9e66ddbb25a1bbad93af19d4eb1e0a8c8b
Kevin Chyn [Thu, 23 Mar 2017 18:12:26 +0000 (11:12 -0700)]
renaming/removing fingerprints should be reflected in UI if fingerprintservice lags
Bug:
30252265
Test: manual
Change-Id: I27761608e52f1437fc7a43bfb48a1f09922d1c0f
Amin Shaikh [Wed, 5 Apr 2017 00:54:44 +0000 (17:54 -0700)]
Link to "scanning settings" when Wi-Fi is off.
Always link to scanning settings when wifi is off. Previously, the link
was only shown when wifi was off and scanning settings were on.
Bug:
36033488
Test: m RunSettingsRoboTests and manually testing on device
Change-Id: I0abc6f4a25072c78fea6a971621cebc1a97b658b
Felipe Leme [Tue, 4 Apr 2017 23:39:21 +0000 (16:39 -0700)]
Removed deprecated auto(F)ill settings.
Bug:
35956626
Test: manual verification
Test: mmm -j90 packages/apps/Settings/tests/robotest
Change-Id: I5d0a02477204d273f331d8af93737c88e5af90e8
TreeHugger Robot [Tue, 4 Apr 2017 21:25:16 +0000 (21:25 +0000)]
Merge "Merge intent filters so intent forwarding works." into oc-dev
Peter Qiu [Tue, 4 Apr 2017 20:58:02 +0000 (13:58 -0700)]
wifi: allow manual connection to a Passpoint provided network
While connected to other WiFi network, a Passpoint AP with its
provider installed will shown as "<SSID> available via
<Provider Name>", since the installed provider contained
necessary credentials needed to connect to that AP.
This CL will trigger a connection to that AP when the user
taps on it for manual connection.
Bug:
36357280
Test: manual connecting to a Passpoint network while connected
to other network
Change-Id: Idec440aa1606e80bcea56054e77ef2dc50a7ac93
Daniel Nishi [Tue, 4 Apr 2017 20:50:54 +0000 (13:50 -0700)]
"% used" instead of "% full" in storage donut.
This aligns the string with the summary text on the top level
Settings view.
Change-Id: If7316bff48c9174cb9f72b5bf80e13f0c7b97066
Fixes:
36873524
Test: None for this string change.
TreeHugger Robot [Tue, 4 Apr 2017 20:31:41 +0000 (20:31 +0000)]
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
Kenny Guy [Tue, 4 Apr 2017 17:01:13 +0000 (18:01 +0100)]
Merge intent filters so intent forwarding works.
Settings forwards intent filters from work to
personal profile based on intent filter returned
from resolving activities.
Test: CTSVerifier, Open BYOD Managed Provisioning test, Click on "Cross profile intent filters are set " test.
Bug:
36275359
Change-Id: I83b7112c4a00a08f0af2be59669a073691fbda0b
TreeHugger Robot [Tue, 4 Apr 2017 17:50:00 +0000 (17:50 +0000)]
Merge "Adds the Clear App dialog for Instant Apps" into oc-dev
TreeHugger Robot [Tue, 4 Apr 2017 17:49:54 +0000 (17:49 +0000)]
Merge "Removes instant apps from certain screens" into oc-dev
Christine Franks [Tue, 4 Apr 2017 17:24:39 +0000 (17:24 +0000)]
Merge "Changed description for system alert window setting" into oc-dev
Sean Stout [Tue, 4 Apr 2017 17:19:43 +0000 (17:19 +0000)]
Merge "Added Night Light Suggestion and tests" into oc-dev
jackqdyulei [Tue, 28 Mar 2017 23:22:20 +0000 (16:22 -0700)]
Ui changes in battery main page
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer
Also update the method name in test file, and this ui changes
also fix the header flash problem.
Bug:
36576021
Bug:
36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
(cherry picked from commit
edfd09d5908746ea688494b39fe905ad0150e7d4)
Tony Mantler [Fri, 31 Mar 2017 20:54:17 +0000 (13:54 -0700)]
Add AvailableVirtualKeyboardFragment to TV
Allows enabling/disabling IMEs on TV.
Moves InputMethodPreference to SettingsLib.
Also minor code tidying
Bug:
36079941
Test: Keyboard settings still work on Fugu and Ryu
Change-Id: Idf42cf5c46d5bb32db59924819d64f73d533d105
(cherry picked from commit
2ec69563cdfbeae7cf4f729d93b4cf32f7065698)
Jesse Evans [Fri, 31 Mar 2017 00:09:12 +0000 (17:09 -0700)]
Removes instant apps from certain screens
Removes instant apps from the Special Access screens, as well as
notifications.
Test: make RunSettingsRoboTests
Bug:
36515324
Change-Id: I5b2f0ee3219acd89e2cbdcefed4d9608450395c0
(cherry picked from commit
1c9b6092eeb4a6eea7ba0d1db5fbe01c73adff37)
Jesse Evans [Wed, 29 Mar 2017 02:53:09 +0000 (19:53 -0700)]
Adds the Clear App dialog for Instant Apps
Adds a confirmation dialog for the user when tapping clear app.
From this dialog the user can either cancel, or confirm they
want to clear the app.
Test: make RunSettingsRoboTests
Bug:
36536695
Change-Id: Idffcf5ef318578ae2e075ea2cbb35323d41acade
Christine Franks [Fri, 31 Mar 2017 18:39:19 +0000 (11:39 -0700)]
Changed description for system alert window setting
Bug:
36070413
Test: make -j100, updated string appears in Settings
Change-Id: I962b17344ea5fc948c35e4d779ed5686df0d09a3
jackqdyulei [Tue, 4 Apr 2017 01:59:47 +0000 (18:59 -0700)]
Update foreground string in battery page
Change foreground app title to "While in active use"
Bug:
36781909
Test: Build
Change-Id: Ideadc5f6efafe22b014380a5c023e4e5e6a47df5
Jack He [Tue, 4 Apr 2017 01:06:06 +0000 (18:06 -0700)]
Fix a crash when an app requests Bluetooth to be discoverable
* When an app requests Bluetooth to be discoverable with a timeout and a
non null EXTRA_PACKAGE_NAME, Settings app should put in the correct
timeout values in the dialog string
Bug:
36870303
Test: make, try making Bluetooth discoverable via
ACTION_REQUEST_DISCOVERABLE intent
Change-Id: I0cebc2f20371c9de5f28feb26425422c0777aa45
TreeHugger Robot [Tue, 4 Apr 2017 01:18:11 +0000 (01:18 +0000)]
Merge "Don't try using a detached fragment." into oc-dev
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
Doris Ling [Mon, 3 Apr 2017 22:21:18 +0000 (15:21 -0700)]
Add summary text to Display->Brightness level.
Get the current brightness level from settings provider and set it to
the brightness preference summary.
Change-Id: Ieb4fbc132ec120cf839548f64e9c5f5b52b2f9c2
Fix:
36650108
Test: make RunSettingsRoboTests
Sean Stout [Wed, 15 Feb 2017 22:04:25 +0000 (14:04 -0800)]
Added Night Light Suggestion and tests
Bug:
34900174
Test: make ROBOTEST_FILTER=SettingsSuggestionsTest RunSettingsRoboTests
Change-Id: I5b2d4e5debc1403cfcbf9c6ecf9397d1074e3a29
Doris Ling [Fri, 31 Mar 2017 19:54:11 +0000 (12:54 -0700)]
Update USb preference controller to use the new summary texts.
- since the choose usb mode dialog and the preference summary use
separate strings now, the two classes can have their own handling
for getting the title/summary text and hence revert the earlier
change that move the setTitle() and setSummary() from the activity
to controller
- only show summary for the option for "supply power", and don't set
summary for all other options
- update the controller to use the new summary text.
- update test correspondingly.
Change-Id: Ie56eb33ba24262e6f3a2259e4ee5ad6f3bfb8061
Fix:
36234108
Test: make RunSettingsRoboTests
Doris Ling [Mon, 3 Apr 2017 20:38:06 +0000 (13:38 -0700)]
Update summary for Connected devices->Printing.
The summary text now shows the number of enabled print services. Update
the flag to only select enabled service from PrintManager.
Bug:
36234108
Test: make RunSettingsRoboTests
Change-Id: I81e1584182edd1f290faa941c7d3ee711a9d67b8
Daniel Nishi [Mon, 3 Apr 2017 18:42:17 +0000 (11:42 -0700)]
Fix a unit test regression.
This fixes a StorageSettingsTest regression where the percentage
was no longer being formatted correctly for the test.
Change-Id: I71e03926ad8b3691cebc26aea11e8557c2ba0fea
Fixes:
36858638
Test: Settings Robotest
Sundeep Ghuman [Wed, 22 Mar 2017 01:29:31 +0000 (18:29 -0700)]
Create Espresso test class for WifiSettings.
Bug: b/
36403696
Test: runtest --path
packages/apps/Settings/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I91306880f620c4a05bfdce35360a1edbcd8a15b7
Doris Ling [Mon, 3 Apr 2017 18:38:10 +0000 (11:38 -0700)]
Update Wifi off summary text.
Changed the test from "disabled" to off when wifi is turned off.
Fix:
36296257
Test: make RunSettingsRoboTests
Change-Id: Iae421c15b812fa7a5c3ec841e9d2c28d21063884
TreeHugger Robot [Mon, 3 Apr 2017 18:23:56 +0000 (18:23 +0000)]
Merge "Add friction icon for metered networks." into oc-dev
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 [Sat, 1 Apr 2017 00:13:15 +0000 (17:13 -0700)]
Add friction icon for metered networks.
Also modified colors for dark theme compatibility.
Bug:
36100548
Bug:
36099721
Test: make, screenshot
Change-Id: Ib19ba8d5f34ad6d7461849c9137520308f1e5e34
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 20:14:03 +0000 (13:14 -0700)]
Re-order the display settings items.
Move Night light and Adaptive brightness up.
Change-Id: Ic5302e26e1c5c6c74fea955ad90723c2eeb94a31
Fix:
35959978
Test: visual
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
Daniel Nishi [Wed, 29 Mar 2017 00:07:30 +0000 (17:07 -0700)]
Lower case the first letter of storage type.
In the app details, the first letter of the storage type was
capitalized, causing an odd string of "X used in Internal storage."
Change-Id: Ibcac54259403f6d0f39df8fa2d3af10304a46057
Merged-In: I2b4f23ea1799dc1730fdab596e4a87a0cb673c68
Fixes:
36001265
Test: Settings robotest
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