Commit Graph

2808 Commits

Author SHA1 Message Date
Doris Ling
a54ebe87f2 Merge "Fix crash on expanding settings conditions." 2017-07-14 19:53:39 +00:00
TreeHugger Robot
f7921b12be Merge "Load only unique dictionary words" 2017-07-14 18:59:41 +00:00
Fan Zhang
880e8c212c Hide memory setting in app detail unless dev option is on.
Change-Id: I785be8bc5228fa87e783f5ddbc41284346b8c8f1
Fix: 62059976
Test: robotests
2017-07-14 11:13:06 -07:00
Eric Schwarzenbach
4fefb21547 Merge "Change header of wifi detail page to "Network info"." 2017-07-14 18:06:24 +00:00
Jeff Sharkey
fc5a1740be Merge "Move "metered" persistence to WifiConfiguration." 2017-07-14 17:47:54 +00:00
Salvador Martinez
8ccb5a4698 Fix enhanced estimate discharge text showing while charging
In the PowerUsageAdvanced screen the text showing whether your time
remaining information is enhanced or not should not show when the
device is plugged in. This CL fixes a bug in that logic that would
show the text when it wasn't supposed to.

Test: robotests still pass, manual verification
Bug: 63176050
Change-Id: I33fb31671cd9c29aed20483301e51ae1ded1f1b6
2017-07-14 10:30:29 -07:00
Eric Schwarzenbach
f6c0004d91 Change header of wifi detail page to "Network info".
Creates a lifecycle observer to modify the action bar.

Bug: 37252029
Test: make -j40 RunSettingsRoboTests
Change-Id: Iff48ed51f533c3b7b2a099f83c3216ae975f061f
2017-07-14 09:16:30 -07:00
Jeff Sharkey
dc09269c81 Move "metered" persistence to WifiConfiguration.
For a long time we've had a nasty tangled dependency between Wi-Fi
and NPMS, since they both persisted different details for configured
networks.  As part of preparing for new carrier data plan APIs, move
the tracking of meteredness over to WifiConfiguration.

We've never really supported "unmetered" mobile networks inside the
framework, so remove the option to configure those flags.

Replace MeteredPreference.notifyChanged() with explicit listener
to avoid confusing an invalidation pass as expression of user intent
to change metered values.

Bug: 63391323
Test: builds, boots, Wi-Fi policy is upgraded
Exempt-From-Owner-Approval: No owner was found for changed files.
Change-Id: If8a6e12650d1d060a729ed1a80f07ebb65e0ffd7
2017-07-14 09:47:03 -06:00
Philipp Weiß
036304f32d Merge "Bluetooth Settings Policy Transparency" 2017-07-14 09:51:14 +00:00
Rajeev Kumar
c57fa7f90c Merge "Data plans sync time settings preference." 2017-07-14 01:58:46 +00:00
Jeff Davidson
0c716a748a Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev am: 98f83d6129
am: 1b1e9928ab

Change-Id: I460c2575a83d0d2ea8d4e4108b2eb40748a16a91
2017-07-14 01:11:41 +00:00
Jeff Davidson
1b1e9928ab Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev
am: 98f83d6129

Change-Id: I2387b8d7cd32b9a7550e6a72c3189c6792bfd1ca
2017-07-14 01:09:09 +00:00
TreeHugger Robot
98f83d6129 Merge "Don't show "Wipe eSIMs" checkbox for developers." into oc-dr1-dev 2017-07-14 01:02:07 +00:00
Doris Ling
11f4619816 Fix crash on expanding settings conditions.
Check for non-empty suggestions instead of non-null suggestions when
trying to determine whether to show conditions or suggestions list.

Change-Id: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Fix: 63674269
Test: make RunSettingsRoboTests
2017-07-13 16:16:12 -07:00
Rajeev Kumar
a8ba46b355 Data plans sync time settings preference.
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
Change-Id: Id52789f2a96dea5ff8c29699ac6fab79e3c5d1bf
2017-07-13 16:11:59 -07:00
TreeHugger Robot
7eee73a0c8 Merge "Don't use framework strings for formatting file sizes" 2017-07-13 23:11:42 +00:00
Fan Zhang
6539c9a1d0 Load only unique dictionary words
- Move UserDictionarySettings to sub package
- Convert cursor to loader

Fix: 22058788
Test: robotests

Change-Id: I1e8828abee58362b815abc210c044b678bf9d578
2017-07-13 16:05:35 -07:00
Rajeev Kumar
bb90de3a4c Merge "Manage data plans settings preference." 2017-07-13 22:59:01 +00:00
Fan Zhang
a7b04ed692 Merge "Show default app icon in default app screen." 2017-07-13 22:41:16 +00:00
Doris Ling
36c1934162 Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev am: a7f5953a02
am: be7044845d

Change-Id: I64412b26bacf567973989fbeaa2cfe2ca42e87b4
2017-07-13 21:28:54 +00:00
Doris Ling
be7044845d Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev
am: a7f5953a02

Change-Id: Ie6a5feec8bb8404ba2a2102c4311950dadf78a7d
2017-07-13 21:23:54 +00:00
TreeHugger Robot
a7f5953a02 Merge "Fix mokey crash on swiping settings condition." into oc-dr1-dev 2017-07-13 21:14:45 +00:00
TreeHugger Robot
cbedc3f0aa Merge "Fix failing user settings test cases." 2017-07-13 20:59:24 +00:00
Rajeev Kumar
36a808a81e Manage data plans settings preference.
Change-Id: I4e15921e793c8c336325e14bec8638d5f71dae17
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-13 13:56:01 -07:00
Fan Zhang
2ea6700336 Show default app icon in default app screen.
- Renamed AdvancedAppSettings to DefaultAppSettings.
- Add logic to DefaultAppPreferenceController to also display icon.
- Modified DefautlAssistPrefController to suppress gear icon, and use
  the controller in default app setting UI to display icon.
- Remove dynamic injected payment setting activity and create the
  setting statically in xml.
- Add DefaultPaymentSettingsPreference to display default payment app
  title (no icon because we can't get it)

Change-Id: I6b8c768da0bafe5ec9a85ba9c79c7993b449be25
Fix: 36458534
Test: robotests
2017-07-13 13:49:28 -07:00
Fan Zhang
303c330068 Merge "UI refresh on bluetooth list page" into oc-dr1-dev
am: c0ca084622

Change-Id: I92846eec6bcbb67862b8ad1cf6447623a2dc3ab0
2017-07-13 20:17:28 +00:00
TreeHugger Robot
c0ca084622 Merge "UI refresh on bluetooth list page" into oc-dr1-dev 2017-07-13 20:05:25 +00:00
Antony Sargent
27afdf0c26 Merge "Make sure PIN edit control is focused" into oc-dr1-dev am: 61e61d96d1
am: d1b5116213

Change-Id: I1df59b4c237b0daff4f5c44a444d35df8cc77cb0
2017-07-13 20:00:37 +00:00
Antony Sargent
d1b5116213 Merge "Make sure PIN edit control is focused" into oc-dr1-dev
am: 61e61d96d1

Change-Id: Ib144b0ad110528d4d72fb15c5e463f0b24d5baed
2017-07-13 19:54:27 +00:00
Doris Ling
83327ec2ab Fix failing user settings test cases.
Update preference text to match latest label.

Change-Id: I3de544bea99c193507ee3b1451dd3c67049af07c
Fix: 63665308
Test: make SettingsTests
2017-07-13 12:03:08 -07:00
Fan Zhang
7b9568c10d UI refresh on bluetooth list page
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref

Merged-In: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Change-Id: I9cb67cc557a9b932d7cf795a8d4a6fb5215c4365
Fix: 62890841
Fix: 62891178
Test: robotests
2017-07-13 11:08:18 -07:00
Doris Ling
84c7739986 Fix mokey crash on swiping settings condition.
When the condition card is being swiped, add null check for the
retrieved Condition to ensure it is still valid before trying to
dismiss it.

Change-Id: I265091a5fe290e359fa9a6e16b1d87c03894c1b8
Fix: 63624859
Test: make RunSettingsRoboTests
2017-07-13 11:00:29 -07:00
phweiss
df4bb2a84f Bluetooth Settings Policy Transparency
If handleStateChanged() is called after
maybeEnforceRestriction, the disabled switch will be
enabled again, only to be disabled when the user touches it.

Bug: 37737621
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=*BluetoothEnablerTest

Change-Id: I3086806dfd6d911d6d7fca1f1d30fa7d8b8757d1
2017-07-13 18:47:30 +02:00
Antony Sargent
4d7df06eb4 Make sure PIN edit control is focused
When doing Bluetooth pairing and the dialog reqesting a PIN comes up, we
want the PIN field to be focused and the keyboard to be shown. This fixes
a regression from N.

Bug: 62857671
Test: make RunSettingsRoboTests
Change-Id: I00dabfda737b6ac61b50518e11f21e5f9a5a1be1
2017-07-12 17:34:36 -07:00
TreeHugger Robot
a2070f9a4f Merge "UI refresh on bluetooth list page" 2017-07-12 23:05:58 +00:00
Roozbeh Pournader
ded99003c4 Don't use framework strings for formatting file sizes
Modify various formatters to avoid using framework strings for
formatting file sizes.

Also update README instructions for running unit tests.

Bug: 36994779
Test: adb shell am instrument -w -e class com.android.settings.utils.FileSizeFormatterTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Test: make -j RunSettingsRoboTests
Change-Id: I4035f26d29408b64389892a4a2379b4823f8ac96
2017-07-12 15:58:21 -07:00
jackqdyulei
236be82872 Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev am: 0e467d594e
am: ba757bb235

Change-Id: I64e8378be62775844191b8394cae203c58e4b2fd
2017-07-12 22:28:28 +00:00
jackqdyulei
ba757bb235 Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
am: 0e467d594e

Change-Id: I692d1064b16ed98104eed14ec57caa250e2a703c
2017-07-12 22:26:28 +00:00
TreeHugger Robot
0e467d594e Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev 2017-07-12 22:20:00 +00:00
Rajeev Kumar
82ee7cf14f Merge "Data plans setting peference." 2017-07-12 20:53:52 +00:00
Salvador Martinez
42e65d11b9 Merge "Fix mistake in conditional + test" into oc-dr1-dev am: ab2d96de83
am: 96e4b8f9f4

Change-Id: I751d0464ce85d6838bd045cbc431f3dc4c3b1405
2017-07-12 20:49:51 +00:00
Salvador Martinez
96e4b8f9f4 Merge "Fix mistake in conditional + test" into oc-dr1-dev
am: ab2d96de83

Change-Id: I3514020da43434388b8be25a281c28d3d3b6deea
2017-07-12 20:47:14 +00:00
TreeHugger Robot
ab2d96de83 Merge "Fix mistake in conditional + test" into oc-dr1-dev 2017-07-12 20:41:27 +00:00
Fan Zhang
f57e167375 UI refresh on bluetooth list page
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref

Change-Id: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Bug: 62890841
Bug: 62891178
Test: robotests
2017-07-12 13:24:25 -07:00
jackqdyulei
5fbdfddb13 Fix bug in DevicePickerFragment
BluetoothProgressCategory will add a no device preference if it is
not scanning and no device is added to the list. Since
DeviceListFragment doesn't report its scanning status correctly, it will
show "No nearby device" even though it is scanning.

This cl add control code for BluetoothProgressCategory in
DeviceListFragment, which avoid the unnecessary no device preference.

Bug: 62492822
Test: RunSettingsRoboTests
Change-Id: Ic49f21cb58a80dcd37c5737800181263ae876ebc
2017-07-12 12:38:12 -07:00
TreeHugger Robot
85c0be9bf4 Merge "Disable lift-to-wake when always-on is checked" 2017-07-12 19:34:54 +00:00
Rajeev Kumar
c6f0b9d6f3 Data plans setting peference.
Change-Id: Ieb2aa67ab98140aa90501227345a15ad64cf124c
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: make RunSettingsRoboTests -j40
2017-07-12 11:48:23 -07:00
Salvador Martinez
433288a76e Fix mistake in conditional + test
This CL fixes a mixup that was in a conditional that determined
what was shown on the battery settings page. Additionally, it adds
a simple test to help ensure that this does not regress in the
future.

Test: Robotest
Bug: 63158794
Change-Id: I8af4843ef6d798b5114c97b2f1b99dd29fa5f412
2017-07-12 11:31:02 -07:00
Ajay Nadathur
00dda696cd Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am: 0bde6dcb18
am: 3d627974d6

Change-Id: Ib062bcdfc23008dab14622e4741fca6dc30e5950
2017-07-12 18:11:47 +00:00
Ajay Nadathur
3d627974d6 Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
am: 0bde6dcb18

Change-Id: I7b2ba35b04f53e28ad98eec54b8fe42811a6eb8d
2017-07-12 18:04:26 +00:00