OSDN Git Service
Bill Yi [Sat, 27 Jan 2018 17:31:14 +0000 (17:31 +0000)]
Import translations. DO NOT MERGE am:
31abbee452 -s ours
am:
b2db5c0028 -s ours
Change-Id: I304c0388ef91b7c4e4cfadf0a8a24b9efd1566a8
Bill Yi [Sat, 27 Jan 2018 17:29:04 +0000 (17:29 +0000)]
Import translations. DO NOT MERGE
am:
31abbee452 -s ours
Change-Id: Ieefa67e07289212f8201836b1cdc0bc774c45a9b
Bill Yi [Sat, 27 Jan 2018 04:56:24 +0000 (20:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2d8c57680d1d98b74193654e9fe77016304f6ac5
Pavlin Radoslavov [Sat, 27 Jan 2018 00:16:29 +0000 (00:16 +0000)]
Merge "Updated the Bluetooth Settings owners list" am:
5a56c31913 am:
b1230be1b8
am:
ab399887b9
Change-Id: Ie5a17a94f9221097339eb37c327607a9417c8373
Pavlin Radoslavov [Sat, 27 Jan 2018 00:12:34 +0000 (00:12 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am:
e61ac8ec02 am:
a84302f194
am:
47a2c27af1 -s ours
Change-Id: I2bfe98b532c6fb16e7aaf67f20052271514daf45
Pavlin Radoslavov [Sat, 27 Jan 2018 00:08:34 +0000 (00:08 +0000)]
Merge "Updated the Bluetooth Settings owners list" am:
5a56c31913
am:
b1230be1b8
Change-Id: Idc872dced34147a2a55a8734f22e9d6131bf9142
Pavlin Radoslavov [Sat, 27 Jan 2018 00:02:16 +0000 (00:02 +0000)]
Merge "Add support for Multi-A2DP state machines per device" am:
e61ac8ec02
am:
a84302f194
Change-Id: I873b29a7c05454ed464fe0f242f0b334115d5f03
Pavlin Radoslavov [Sat, 27 Jan 2018 00:00:14 +0000 (00:00 +0000)]
Merge "Updated the Bluetooth Settings owners list"
am:
5a56c31913
Change-Id: I6c3c34d3c074f8d4cd928fb874035350d9f4e33d
Pavlin Radoslavov [Fri, 26 Jan 2018 23:53:46 +0000 (23:53 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
am:
e61ac8ec02
Change-Id: If1b5c0d5655ec7e2c465ef8b1633543ceba7181e
Pavlin Radoslavov [Fri, 26 Jan 2018 23:09:43 +0000 (23:09 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am:
f9504d8979 am:
0859a07a61
am:
718af4ba73 -s ours
Change-Id: I77cf919485c824de5a64859ae13e88eeda8f9aad
Treehugger Robot [Fri, 26 Jan 2018 23:01:43 +0000 (23:01 +0000)]
Merge "Updated the Bluetooth Settings owners list"
Pavlin Radoslavov [Fri, 26 Jan 2018 23:01:26 +0000 (23:01 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am:
f9504d8979
am:
0859a07a61
Change-Id: I4307481f6df9b2ef9d07eb6066e8fda025bcd4e8
Pavlin Radoslavov [Fri, 26 Jan 2018 22:53:49 +0000 (22:53 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
am:
f9504d8979
Change-Id: I4293debea1998c8d20542c29134a036361fdd6a0
Treehugger Robot [Fri, 26 Jan 2018 22:43:53 +0000 (22:43 +0000)]
Merge "Add support for Multi-A2DP state machines per device"
TreeHugger Robot [Fri, 26 Jan 2018 22:35:35 +0000 (22:35 +0000)]
Merge "Misc fixes for User page and my device info page"
Pavlin Radoslavov [Fri, 26 Jan 2018 21:27:26 +0000 (13:27 -0800)]
Updated the Bluetooth Settings owners list
Test: None
Change-Id: I94a11d51b6c7691f7e84e8afe71c7c8083255ef0
Pavlin Radoslavov [Fri, 26 Jan 2018 20:37:33 +0000 (12:37 -0800)]
Add support for Multi-A2DP state machines per device
Update usage of A2dpService API calls that take BluetoothDevice
as an additional argument. If the BluetoothDevice argument is null,
the API applies to the device that is currently the Active A2DP device.
Bug:
69269748
Test: Manual
Change-Id: I8031fa4b4256890dcb486228185baf93debb102d
Merged-In: I7417b7b0741f706df475cb2b27fbe6525f744269
Treehugger Robot [Fri, 26 Jan 2018 20:46:45 +0000 (20:46 +0000)]
Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP"
Fan Zhang [Fri, 26 Jan 2018 18:15:56 +0000 (10:15 -0800)]
Misc fixes for User page and my device info page
- Rename UserAndAccountDashboard* to AccountDashboard*
- Move emergency info from account to device info page
- Move auto sync data toggles (4 of them) from Account page to user page
- Move the controllers too. UserSettings is a not a DashboardFragment
so I had to manually call each controller method.
TODO: refactor UserSettings to a DashboardFragment
- Move legal information/regulatory info above advance button within device info page.
Fixes:
72523158
Bug:
71871075
Test: robotests
Change-Id: I1b8af8af61e49d17926f984978a09a974b6c62e1
Pavlin Radoslavov [Sun, 21 Jan 2018 10:04:45 +0000 (02:04 -0800)]
Add Settings support for Bluetooth Multi-A2DP and Multi-HFP
Test: Code compilation
Bug:
64767509
[NOTE: The cherry-pick removed changes to non-existent code and log
message description that doesn't apply here.]
Change-Id: Iee76286110ed87703d6a968f50273c22cd7c7086
Merged-In: Iee76286110ed87703d6a968f50273c22cd7c7086
(cherry picked from commit
4b796e5d2ea23d45f67bd46590eddcac8b3148b4)
Zhizhi Liu [Fri, 26 Jan 2018 18:16:42 +0000 (18:16 +0000)]
Merge "Migrate some suggestions related classes SettingsLib(II)"
TreeHugger Robot [Fri, 26 Jan 2018 17:50:55 +0000 (17:50 +0000)]
Merge "Revert "Add developer setting to set the default GPU renderer.""
TreeHugger Robot [Fri, 26 Jan 2018 01:54:56 +0000 (01:54 +0000)]
Merge "Fixes a broken test."
TreeHugger Robot [Fri, 26 Jan 2018 00:13:22 +0000 (00:13 +0000)]
Merge "Add a generic blue background on some homepage tiles"
Leif Hendrik Wilden [Fri, 26 Jan 2018 00:02:15 +0000 (16:02 -0800)]
Fixes a broken test.
Test: Verified it now passes reliably.
Change-Id: I0d4caf74bb972d0799ef9cbc1f0d915d3c785a7b
Julia Reynolds [Thu, 25 Jan 2018 23:46:13 +0000 (23:46 +0000)]
Merge "Use checkboxes on notification settings pages"
TreeHugger Robot [Thu, 25 Jan 2018 22:40:33 +0000 (22:40 +0000)]
Merge "Move users to system dashboard"
TreeHugger Robot [Thu, 25 Jan 2018 22:39:48 +0000 (22:39 +0000)]
Merge "Refactor the DataUsageBase"
TreeHugger Robot [Thu, 25 Jan 2018 22:28:18 +0000 (22:28 +0000)]
Merge "Misc fixes"
Fan Zhang [Thu, 25 Jan 2018 21:31:37 +0000 (13:31 -0800)]
Add a generic blue background on some homepage tiles
If a homepage tile is injected from external packages, we can't
control what their icons look like, so we put a generic blue circular
background to make it consistent with the other icons.
Change-Id: I2a935db37fff097ae15540262bff94efea55179a
Fixes:
69314641
Test: robotests
Zhizhi Liu [Thu, 18 Jan 2018 22:05:58 +0000 (14:05 -0800)]
Migrate some suggestions related classes SettingsLib(II)
Remove classes from Settings.
Test: mm Settings/tests/robotests
Change-Id: I0f046d6a750bc53251deb44887e8665e6d545515
TreeHugger Robot [Thu, 25 Jan 2018 21:30:22 +0000 (21:30 +0000)]
Merge "Changed DirectoryAccessDetails to handle children directory on external volumes."
Fan Zhang [Thu, 25 Jan 2018 20:38:04 +0000 (12:38 -0800)]
Move users to system dashboard
Bug:
71871075
Test: visual
Change-Id: I021bfdcce4fdb865f629c2da21149caad9b73b93
Fan Zhang [Thu, 25 Jan 2018 19:07:39 +0000 (11:07 -0800)]
Misc fixes
- remove useless intent-filters on a few activities
- Fix condition layout (icon size too big)
- clicking airplane condition card no longer crashes
Fixes:
72314527
Test: logcat | grep -i "TileUtils" and observe no more warning log
Change-Id: I3c6f9fb4f4e480ade220bc8602c04de5332d551c
jackqdyulei [Thu, 25 Jan 2018 18:55:59 +0000 (10:55 -0800)]
Refactor the DataUsageBase
1. Create a new DataUsageBaseFragment extending from DashboadFragment
2. Mark DataUsageBase as obsolete
3. Make DataUsageSummary use DataUsageBaseFragment
4. Deprecated DataPlanUsageSummary since it has been used nowhere.
Bug:
72497434
Test: robotest still pass
Change-Id: Ic67a3c90649ae84086dc60b1457566be8727c54b
Derek Sollenberger [Wed, 24 Jan 2018 21:40:15 +0000 (21:40 +0000)]
Revert "Add developer setting to set the default GPU renderer."
This reverts commit
f91b036177326b65518402ada527f5348e2a18c4.
Test: compile only
Reason for revert: removing the option from the developer settings UI
Change-Id: I8ce6d6e07e3495e973f9020b4f4f16f8c2075788
TreeHugger Robot [Thu, 25 Jan 2018 19:01:11 +0000 (19:01 +0000)]
Merge "Fix the UniquePreferenceTest."
Felipe Leme [Wed, 24 Jan 2018 20:17:29 +0000 (12:17 -0800)]
Changed DirectoryAccessDetails to handle children directory on external volumes.
Test: manual verification
Bug:
63720392
Change-Id: Ief4ee0fe271212e2eccbdcedea8ebb3374c4e69b
TreeHugger Robot [Thu, 25 Jan 2018 18:28:59 +0000 (18:28 +0000)]
Merge "Notification settings updates"
TreeHugger Robot [Thu, 25 Jan 2018 17:59:24 +0000 (17:59 +0000)]
Merge "Store location changer into Settings.Secure"
TreeHugger Robot [Thu, 25 Jan 2018 17:23:42 +0000 (17:23 +0000)]
Merge "Prevent crash in recent app list"
Julia Reynolds [Thu, 25 Jan 2018 16:07:55 +0000 (11:07 -0500)]
Use checkboxes on notification settings pages
Test: make RunSettingsRoboTests
Bug:
63927402
Change-Id: Id751b807eae8a7a9165b0d020f10dd42f51382d1
Julia Reynolds [Wed, 24 Jan 2018 11:14:45 +0000 (06:14 -0500)]
Notification settings updates
- remove duplicate settings
- move recent app list to bottom of the screen
- change dropdown fields to dialogs
Test: manual, make RunSettingsRoboTests
Change-Id: Ia07d56e39be10c7b8be58f9ec35114ca2eab7d5c
Fixes:
72402499
Pavlin Radoslavov [Fri, 5 Jan 2018 00:06:17 +0000 (16:06 -0800)]
Add support for Multi-A2DP state machines per device
Update usage of A2dpService API calls that take BluetoothDevice
as an additional argument. If the BluetoothDevice argument is null,
the API applies to the device that is currently the Active A2DP device.
Exempt-From-Owner-Approval: De-facto owner of the relevant changes is
the Bluetooth team.
Bug:
69269748
Test: Manual
Change-Id: I7417b7b0741f706df475cb2b27fbe6525f744269
TreeHugger Robot [Thu, 25 Jan 2018 07:30:33 +0000 (07:30 +0000)]
Merge "Fix null pointer from PowerUsageFeatureProvider"
Lifu Tang [Wed, 24 Jan 2018 05:12:14 +0000 (21:12 -0800)]
Store location changer into Settings.Secure
Bug:
68779883
Test: Manual
Change-Id: I6ec69d6c9f418a169b8bee71969716e8a44a14a5
TreeHugger Robot [Thu, 25 Jan 2018 04:05:01 +0000 (04:05 +0000)]
Merge "Move injected tiles under debug section"
TreeHugger Robot [Thu, 25 Jan 2018 03:08:06 +0000 (03:08 +0000)]
Merge "Remove location mode menu from location settings"
Daniel Nishi [Thu, 25 Jan 2018 02:10:51 +0000 (18:10 -0800)]
Fix the UniquePreferenceTest.
By adding in the About Phone v2 screen, we duplicated some settings.
This isn't actually a problem because when the flag to turn on V2 is on,
V1 goes away, and vice versa.
Change-Id: I9aa327ac532ed2ac240bb2d6cbb327f299438889
Bug:
72459760
Test: adb shell am instrument -w -e class
com.android.settings.core.UniquePreferenceTest
com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Salvador Martinez [Wed, 24 Jan 2018 18:24:04 +0000 (10:24 -0800)]
Fix null pointer from PowerUsageFeatureProvider
Some locations did not check if the returned value was null before
doing operations on them and could crash. This CL changes those
spots to take that into account.
Test: b/
72463854 will add in follow up to unblock dogfood
Bug:
72350595
Change-Id: I0ace5c0ab4a8aa9fd5b09d41d6f986143246f059
TreeHugger Robot [Thu, 25 Jan 2018 00:39:16 +0000 (00:39 +0000)]
Merge "AR/FR: Updated resources to confirm via component."
Leif Wilden [Thu, 25 Jan 2018 00:35:26 +0000 (00:35 +0000)]
Merge "Migrate to use instrumentation classes from settingslib."
Fan Zhang [Thu, 25 Jan 2018 00:34:13 +0000 (00:34 +0000)]
Merge "Make homepage icons more colorful!"
Antony Sargent [Thu, 25 Jan 2018 00:14:16 +0000 (16:14 -0800)]
Prevent crash in recent app list
In some situations if you have recently used an app and then uninstalled
it, the display of recent apps in Settings->Apps & notifications would
crash. This is due to a bug in recent CL that fixed b/
71591298.
Test: make -j64 RunSettingsRoboTests
Change-Id: Id04b073b2617eeff0e188b10d3743496a9f70d5e
Fixes:
72340364
TreeHugger Robot [Thu, 25 Jan 2018 00:10:43 +0000 (00:10 +0000)]
Merge "Add device name to About Phone page."
Maggie [Wed, 24 Jan 2018 20:05:45 +0000 (12:05 -0800)]
Remove location mode menu from location settings
Location modes were introduced in KitKat. It has made location settings over complicated. In P we are removing location modes to provide simple, meaningful and transparent controls for users.
Bug:
63818349
Bug:
70350519
Test: Robo
Test: Manual
Change-Id: Ic8a168b8eeb3cd2c8b1536c378c92a5f377d3bba
Fan Zhang [Wed, 24 Jan 2018 23:01:57 +0000 (23:01 +0000)]
Merge "2nd attempt to fix crash when getting unavailable service" am:
ec4e0d3008 am:
a9cb8d776b
am:
c1968ab9a0
Change-Id: Id2a769571957c59a209263432256f77a190b68e0
Fan Zhang [Wed, 24 Jan 2018 21:21:17 +0000 (13:21 -0800)]
Move injected tiles under debug section
Bug:
64762598
Test: atest UniquePreferenceTest
Change-Id: I6d6661b84c2a94bc66e1afe04c01fee39282506a
TreeHugger Robot [Wed, 24 Jan 2018 21:50:45 +0000 (21:50 +0000)]
Merge "Fix typo in the description of eSIM reset."
TreeHugger Robot [Wed, 24 Jan 2018 21:45:06 +0000 (21:45 +0000)]
Merge "Move to DisplayManager brightness APIs"
TreeHugger Robot [Wed, 24 Jan 2018 21:43:24 +0000 (21:43 +0000)]
Merge "Update layout config for suggestion card."
Fan Zhang [Wed, 24 Jan 2018 20:59:25 +0000 (20:59 +0000)]
Merge "2nd attempt to fix crash when getting unavailable service" am:
ec4e0d3008
am:
a9cb8d776b
Change-Id: Id944bc516fa093ce1421f40c2c6b05e277e94660
Fan Zhang [Wed, 24 Jan 2018 20:54:49 +0000 (20:54 +0000)]
Merge "2nd attempt to fix crash when getting unavailable service"
am:
ec4e0d3008
Change-Id: I05ace64e5d8979611df37a8618812910a6e905fa
Leif Hendrik Wilden [Thu, 11 Jan 2018 18:15:36 +0000 (10:15 -0800)]
Migrate to use instrumentation classes from settingslib.
Test: Compiles. Manually tested.
Change-Id: I70a6e76cc8440547746ecc008c32bd06a7de8161
Carlos Valdivia [Wed, 24 Jan 2018 01:17:56 +0000 (17:17 -0800)]
AR/FR: Updated resources to confirm via component.
Due to issues with an Intent filter not being configured with a category. We
needed to move to launching the confirmation activity via Component targeting
Intent. Hopefully this can be addressed post IC.
Manual Testing:
Start by navigating in Settings to:
Settings > System > Reset Options > Erase
Then click on "Reset Phone." At this point the behavior depends on the state of
GmsCore.
With forthcoming GmsCore changes (and accompanying SettingsGoogle changes), the user will see a prompt telling them that
they can confirm their credentials. Regardless of whether the user successfully
confirms or hits back, they will end up in the MasterClearConfirm UX. As per the
feature spec.
Test: make RunSettingsRoboTests -j40
Bug:
6393703
Change-Id: Idca02bda1fa2e388d612bd2014e16e2b6665fe70
Daniel Nishi [Thu, 18 Jan 2018 02:05:13 +0000 (18:05 -0800)]
Add device name to About Phone page.
The device name is reflected in three places: A Settings.Global flag
which can be read by third party apps, the Bluetooth device name, and
the Wi-Fi tethering hotspot name.
The Bluetooth and Wi-Fi names can be changed independently of the device
name, but if the user sets the device name, they are all changed in
parallel.
Due to the naming restrictions of Bluetooth devices and SSIDs, the SSID
naming restrictions apply to the device name.
Bug:
63819909
Test: Robotest
Change-Id: I3a81535fc07d183557a6fa5d54baef3c7868499c
Fan Zhang [Wed, 24 Jan 2018 19:08:46 +0000 (19:08 +0000)]
Merge "2nd attempt to fix crash when getting unavailable service"
TreeHugger Robot [Wed, 24 Jan 2018 18:39:18 +0000 (18:39 +0000)]
Merge "Add bluetooth as a supported Slice"
Fan Zhang [Wed, 24 Jan 2018 00:35:31 +0000 (16:35 -0800)]
Make homepage icons more colorful!
Change-Id: I84b4744abf8a2955e2a0c54cdfc9261ddd88d3bd
Fixes:
69314641
Test: visual
Daniel Nishi [Wed, 24 Jan 2018 18:22:15 +0000 (18:22 +0000)]
Merge "Add a new toggle for Bluetooth while driving."
TreeHugger Robot [Wed, 24 Jan 2018 18:02:18 +0000 (18:02 +0000)]
Merge "Fix the app ops settings tests by adding FLAG_ACTIVITY_NEW_TASK to Intents."
Dianne Hackborn [Wed, 24 Jan 2018 17:58:50 +0000 (17:58 +0000)]
Merge "Fix issue #
72116995: Add permission guarding Service#startForeground"
Qingxi Li [Wed, 24 Jan 2018 17:54:53 +0000 (09:54 -0800)]
Fix typo in the description of eSIM reset.
Bug:
72419412
Test: E2E
Change-Id: Iaa8005d343b454dccc65bffe046ab5836fbd04e8
TreeHugger Robot [Wed, 24 Jan 2018 17:06:57 +0000 (17:06 +0000)]
Merge "Add EID into SIM status dialog"
TreeHugger Robot [Wed, 24 Jan 2018 08:10:14 +0000 (08:10 +0000)]
Merge changes Ibd1291ff,I5224900b
* changes:
Add ability to show/hide System Update.
Clean up SystemUpdatePreferences tests.
TreeHugger Robot [Wed, 24 Jan 2018 06:09:21 +0000 (06:09 +0000)]
Merge "Added activity for the ACTION_DIRECTORY_ACCESS_SETTINGS intent."
TreeHugger Robot [Wed, 24 Jan 2018 03:53:39 +0000 (03:53 +0000)]
Merge "Fix the crash when editing or deleting APN."
TreeHugger Robot [Wed, 24 Jan 2018 03:46:34 +0000 (03:46 +0000)]
Merge "Update strings for suggestions."
TreeHugger Robot [Wed, 24 Jan 2018 03:36:41 +0000 (03:36 +0000)]
Merge "Tweak master switch's right padding"
TreeHugger Robot [Wed, 24 Jan 2018 03:10:27 +0000 (03:10 +0000)]
Merge "Turn on new battery settings page"
TreeHugger Robot [Wed, 24 Jan 2018 02:56:39 +0000 (02:56 +0000)]
Merge "Migrate functionality to Me Card fragment."
TreeHugger Robot [Wed, 24 Jan 2018 02:32:38 +0000 (02:32 +0000)]
Merge "Update string for work mode toggle"
TreeHugger Robot [Wed, 24 Jan 2018 02:31:35 +0000 (02:31 +0000)]
Merge "Remove all gesture suggestions"
Maggie Wang [Wed, 24 Jan 2018 01:47:54 +0000 (01:47 +0000)]
Merge "Remove location_modes_previous references"
Chad Brubaker [Wed, 24 Jan 2018 01:46:21 +0000 (01:46 +0000)]
Merge "Expose lockdown button in settings"
Matthew Fritze [Mon, 15 Jan 2018 22:27:30 +0000 (14:27 -0800)]
Add bluetooth as a supported Slice
To add bluetooth as a valid slice requires adding
support for Context-only preference controller
constructors, which was already planned work.
Fixes:
67997327
Test: robotests
Change-Id: I7efd20a05d5796c3327a26b1fc535d5436d1070f
Fan Zhang [Tue, 23 Jan 2018 22:42:30 +0000 (14:42 -0800)]
Tweak master switch's right padding
Change-Id: I635833fc61fd3e644d2f606bd78efc9d159a09de
Fixes:
69462439
Test: visual
Fan Zhang [Tue, 23 Jan 2018 22:26:30 +0000 (14:26 -0800)]
Remove all gesture suggestions
They are already removed from first 14 days category, now removing
permanently.
Change-Id: I1740d3bff59ff56142c10cce3b9617009c58f47d
Fixes:
72224790
Test: robotests
Beverly Tai [Tue, 23 Jan 2018 22:20:24 +0000 (22:20 +0000)]
Merge "Adding zen dialog in zen settings"
Julia Reynolds [Tue, 23 Jan 2018 22:08:32 +0000 (22:08 +0000)]
Merge "Remove unused intent."
TreeHugger Robot [Tue, 23 Jan 2018 22:03:17 +0000 (22:03 +0000)]
Merge "Add icon in RestrictedAppDetails"
Felipe Leme [Mon, 22 Jan 2018 18:26:29 +0000 (10:26 -0800)]
Added activity for the ACTION_DIRECTORY_ACCESS_SETTINGS intent.
Applications typically use this action to ask the user to revert the
"Do not ask again" status of directory access requested made by
StorageVolume.createAccessIntent(directory).
Test: adb shell am start -a android.settings.DIRECTORY_ACCESS_SETTINGS
Test: atest CtsAppSecurityHostTestCases:ScopedDirectoryAccessTest#testResetDoNotAskAgain
Bug:
63720392
Change-Id: Ib9007c2c08a75e2e54df6d6b5f465f9c3ccc82be
Fan Zhang [Tue, 23 Jan 2018 21:48:27 +0000 (13:48 -0800)]
2nd attempt to fix crash when getting unavailable service
Change-Id: I6abb16e1c84b82021ce2dd54097fe68857e69129
Fixes:
68013053
Test: robotests
Ben Lin [Tue, 23 Jan 2018 19:32:46 +0000 (11:32 -0800)]
Add ability to show/hide System Update.
This adds one flag:
config_show_system_update_settings
Which when set to false will hide "System update" from System page. This
is useful for devices that controls its system update elsewhere.
Bug:
69813881
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.deviceinfo
Change-Id: Ibd1291ffd8948419e8aa06d0721842246a069378
Ben Lin [Tue, 23 Jan 2018 20:01:19 +0000 (12:01 -0800)]
Clean up SystemUpdatePreferences tests.
SystemUpdatePrefenceControllerTest had some logic that seemed irrelevant
to its testing class, which seems to have moved to
AdditionalSystemUpdatePreferenceController. Removed the irrelevant
test cases and added additional test coverage on
AdditionalSystemUpdatePreferenceController.
Bug: None
Test: RunSettingsRoboTests
Change-Id: I5224900bc3449a9f329a1d02ee3cb597b4748d91
xiyuan.wang [Tue, 23 Jan 2018 21:16:36 +0000 (21:16 +0000)]
Merge "The text on toast should be changed when remains 1 time for SIM lock input" am:
6e6b1e2079 am:
15691a74b5 -s ours
am:
6407162f01
Change-Id: I6cd8ae2fb8161a7c7bcb30da8fcba96c90db997d
xiyuan.wang [Tue, 23 Jan 2018 21:07:52 +0000 (21:07 +0000)]
Merge "The text on toast should be changed when remains 1 time for SIM lock input" am:
6e6b1e2079
am:
15691a74b5 -s ours
Change-Id: Ied52d7a7c8080177e4d45b35280ca13222c175d0
Chad Brubaker [Thu, 11 Jan 2018 19:09:31 +0000 (11:09 -0800)]
Expose lockdown button in settings
Test: manually verified toggle controls lockdown button visibility
Test: make RunSettingsRoboTests
Bug:
37221346
Change-Id: Ie59f9c6a1df1d877b18986c6a58492a5aa789d34
yuemingw [Tue, 23 Jan 2018 18:58:38 +0000 (18:58 +0000)]
Fix the crash when editing or deleting APN.
Previously ApnPrefence starts an intent with URI content://telephony/carrier/filtered/id,
this URI is only implemented in telephony provider for query(), but not
for delete() or update(). This caused the crash when user tries to
update or delete an APN through this URI.
We should let ApnPrefence starts an intent with URI content://telephony/carrier/id, which
is a general telephony URI and all of query() add() delete() update() are implemented for
non-DPC mode. And let ApnPrefence starts an intent with URI content://telephony/carrier/filtered/id
in DPC mode(as the general URI can't access DPC-owned APN), when only DPC-owned APNs are
presented to user. In the DPC mode, user can't update, add or delete an APN, they can
only view(query) the APN, so it won't crash with URI_FILTERED.
Bug:
72387301
Test: manual. Tried update, delete, and add action in Access Point Name page, no crash occurs. Instrumentation test will be added in b/
72154761.
Change-Id: I9979cbffcc94a37b2bd96db766ececd0ac7b20e2
xiyuan.wang [Tue, 23 Jan 2018 20:31:59 +0000 (20:31 +0000)]
Merge "The text on toast should be changed when remains 1 time for SIM lock input"
am:
6e6b1e2079
Change-Id: Ic7f5ccda3111ebe6dc7934a2f50d7c2b76c2e70c