Commit Graph

18891 Commits

Author SHA1 Message Date
Charles He
170801b6f8 Fix PIN/password lock UI update when locked out.
The ConfirmLockPassword screen (responsible for both PIN and password
locks) should not accept any input during the lock-out period after
consecutive incorrect unlock attempts. However, this is broken if the
activity is resumed from a paused state (e.g. from Recents).

In this CL, we clean up the logic around updating the UI controls, which
fixes the issue above and also hopefully simplifies potential future
work.

Bug: 63277910
Test: make RunSettingsRoboTests
Test: manual, both unified and separate work challenge
Change-Id: I752a5911d4445bf0caeea299ca3eb182e1defc62
2017-07-13 11:44:08 +01: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
Tony Mantler
12672f4d85 Add ADB enable/disable PreferenceController
Bug: 34203528
Test: EnableAdbControllerTest
Change-Id: I086403f7c4c9cf2f6f04b246e29b0d7ec4ab5b51
2017-07-12 14:36:57 -07: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
Ajay Nadathur
0bde6dcb18 Merge "Do not show options if screen lock types is empty" into oc-dr1-dev 2017-07-12 17:53:07 +00:00
Geoffrey Pitsch
8d973761ad Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.

Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-12 13:42:34 -04:00
Daniel Nishi
e70a06a5d5 Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev am: bce83f8c71
am: eba886f045

Change-Id: Ib1b6f17ef73222cfeebe163c6a43112f74ffa898
2017-07-12 17:33:32 +00:00
Daniel Nishi
eba886f045 Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
am: bce83f8c71

Change-Id: I9ab99b706f8d545294ebacc5e204d90e94c9ea32
2017-07-12 17:26:57 +00:00
Daniel Nishi
bce83f8c71 Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev 2017-07-12 17:13:46 +00:00
Geoffrey Pitsch
329bab9e1b Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
am: 00ac782f3e

Change-Id: I5151ab5ba2ed2dfb94460a118705b3f68a18f777
2017-07-12 16:59:26 +00:00
TreeHugger Robot
4ee9134749 Merge "Use pref controller to get non-indexable in network setting" 2017-07-12 16:59:24 +00:00
Geoffrey Pitsch
00ac782f3e Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev 2017-07-12 16:50:48 +00:00
Nobuyuki Nakamura
2c872109eb Show help string when onEnrollmentHelp() is called
The help string is not shown when onEnrollmentHelp() is called
between onEnrollmentProgressChange() and mTouchAgainRunnable#run().
To fix this issue, showError() should be called.

Bug: 30274453
Test: manual - start enrolling fingerprint and move finger fast on the sensor

Change-Id: Ie604532940e40cca66dc54b56c3cb4b828a07987
2017-07-12 05:42:37 +00:00
mingliang.x.lei
36c25af6a1 Fix memory leak in Bluetooth settings
Bluetooth settings screen has two categories. Each category should call
removeAll() method to unregister a callback from CachedBluetoothDevice.
But the method is not called for mPairedDevicesCategory.

Bug: 30004142
Test: manual - connect to Bluetooth device and then
               open and close Bluetooth settings screen repeatedly

Change-Id: I5a72994473ee2bb5fc3ad00176d9a930b4839099
2017-07-12 05:42:14 +00:00
Doris Ling
a674aa69c2 Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
am: 91ca9f60e9

Change-Id: I65e88eb8e4d65641beace03ab8f0782efa00db62
2017-07-12 03:13:51 +00:00
TreeHugger Robot
91ca9f60e9 Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev 2017-07-12 02:58:28 +00:00
Ajay Nadathur
17d66bea42 Do not show options if screen lock types is empty
Bug: 63311251
Test: Manually tested on device
Change-Id: Ia56a0791b89635efb4f8305f39b586b8054271cf
2017-07-11 18:09:49 -07:00
TreeHugger Robot
30e0986078 Merge "Update spacing and background color for condition/suggestion." 2017-07-12 00:25:13 +00:00
jackqdyulei
7811db450e Merge "Remove obsolete bluetooth pages" into oc-dr1-dev
am: c2e0e41446

Change-Id: Ibc5adabb7cfb83815423a30bd4bd94c4b6d7d8fa
2017-07-12 00:12:26 +00:00
Daniel Nishi
6f3900f6b5 Fix filter bug for non-internal app filtering.
By default, the filter would show all non-categorized apps. This,
however, regressed the external storage apps view which does not have
categorization (yet). By adding back in a legacy option to use the old
purely UUID filtering, we can fix the regression.

Change-Id: I72d8d3bc08fbdff53374eb1e973bce9f8d7e2e79
Fixes: 63542896
Test: Settings unit test
2017-07-11 17:11:28 -07:00
TreeHugger Robot
c2e0e41446 Merge "Remove obsolete bluetooth pages" into oc-dr1-dev 2017-07-12 00:01:47 +00:00
Soroosh Mariooryad
9fb52be032 Merge "Adding warmup call API for Settings search ranking." 2017-07-11 23:01:12 +00:00
Doris Ling
df055c8655 Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:50:48 -07:00
Doris Ling
78e08f0f0a Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Bug: 63393599
Test: make RunSettingsRoboTests
Change-Id: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:22:53 -07:00
jackqdyulei
4eba1d469c Merge "Bind service in onCreate" into oc-dr1-dev
am: 4e4c73bfc7

Change-Id: Id317c4003fd560c5cff4da7191198aa17ea97f7b
2017-07-11 22:08:19 +00:00
Lei Yu
6fab00e64b Merge "Remove obsolete bluetooth pages" 2017-07-11 22:05:25 +00:00
TreeHugger Robot
ade7f5b531 Merge "Automatically play the gesture video when the setting is launched." 2017-07-11 22:05:22 +00:00
TreeHugger Robot
4e4c73bfc7 Merge "Bind service in onCreate" into oc-dr1-dev 2017-07-11 22:02:35 +00:00
jackqdyulei
07fffc3877 Remove obsolete bluetooth pages
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests

Future cl will remove the page switch API in BluetoothFeatureProvider

Bug: 63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Merged-In: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
2017-07-11 15:01:59 -07:00
Fan Zhang
af6fce6335 Use pref controller to get non-indexable in network setting
Change-Id: I2bcc9047146f4ad014d5929e66ee895ee497b641
Fix: 62555826
Test: robotests
2017-07-11 14:58:38 -07:00
Jack He
549d864bbf Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev am: 86fd147ac6
am: 99eab3d5f9

Change-Id: I7c78e818010bb513dd2ac1d65baa00f4159073b1
2017-07-11 21:26:09 +00:00
Jack He
99eab3d5f9 Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
am: 86fd147ac6

Change-Id: Ib56a1d03e9e74632137117802a5baab3870947bb
2017-07-11 21:22:40 +00:00
Michael Wachenschwanz
a203093d75 Update FakeUid to implement getForegroundServiceTimer
Simple change. Override the getForegroundServiceTimer method in FakeUid

Test: bit FrameworksCoreTests:com.android.internal.os.BatteryStatsNoteTest
Bug: 38313557
Change-Id: I8a3142e61ed67109629c683384734f749eaafb3f
2017-07-11 14:17:19 -07:00
TreeHugger Robot
86fd147ac6 Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev 2017-07-11 21:16:32 +00:00
Stephen Chen
e549e732bd Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am: 89fdea9807

Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
2017-07-11 20:27:39 +00:00