Commit Graph

2364 Commits

Author SHA1 Message Date
Fan Zhang
c1d04860d5 Fix a bug where bt name is updated to wrong preference.
am: f6e6ae2441

Change-Id: Ida538c867c7f68f7327e7f5a402023aa69ba41ed
2017-07-18 00:57:59 +00:00
Fan Zhang
f6e6ae2441 Fix a bug where bt name is updated to wrong preference.
Change-Id: Ica0ef6763e8868fc33773f2db917aba29193b632
Fix: 63772093
Test: robotests
2017-07-17 23:06:07 +00:00
Doris Ling
e8d37d9d75 Merge "Add background color to suggestion/condition view." into oc-dr1-dev
am: edad87c4b0

Change-Id: I612dbb1e3347e2052eec5df9b10b43d679b8585b
2017-07-17 22:24:53 +00:00
TreeHugger Robot
edad87c4b0 Merge "Add background color to suggestion/condition view." into oc-dr1-dev 2017-07-17 22:18:31 +00:00
Matthew Fritze
c44f8c8256 Add gestures as inline actions for Phone Buddy
am: 469e4ea228

Change-Id: I1effb7de88e56bb95b19ab6b6d008ee736046d7b
2017-07-17 17:46:32 +00:00
Matthew Fritze
469e4ea228 Add gestures as inline actions for Phone Buddy
Add the following gestures as inline:
- Assist gesture
- Double tap power
- Double tap screen
- Pickup
- Swipe for notification

Bug:62022517
Test: make RunSettingsRoboTests
Change-Id: Ib246b97a0b924bf18f464d3548b7e4c393fc1931
2017-07-17 08:48:42 -07:00
Doris Ling
1b6685f4a4 Add background color to suggestion/condition view.
- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual
2017-07-14 15:34:42 -07:00
Doris Ling
5436dacf2c Merge "Fix crash on expanding settings conditions." into oc-dr1-dev
am: 77a34f69c6

Change-Id: Ibfd77b5c2ab16dbc55f0874350bd6025fee463f7
2017-07-14 22:23:36 +00:00
TreeHugger Robot
77a34f69c6 Merge "Fix crash on expanding settings conditions." into oc-dr1-dev 2017-07-14 22:18:26 +00:00
Salvador Martinez
1cd965b519 Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev
am: 4d3b534325

Change-Id: Ief931efc6ecad6e878015b22dea113f0ca0c99fe
2017-07-14 21:56:53 +00:00
TreeHugger Robot
4d3b534325 Merge "Fix enhanced estimate discharge text showing while charging" into oc-dr1-dev 2017-07-14 21:47:50 +00:00
Doris Ling
01fe5b45b4 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
Merged-In: Icdb8ad485af436f5d84ce0a746081fc59bd613db
Fix: 63674269
Test: make RunSettingsRoboTests
2017-07-14 13:04:30 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
jackqdyulei
4eba1d469c Merge "Bind service in onCreate" into oc-dr1-dev
am: 4e4c73bfc7

Change-Id: Id317c4003fd560c5cff4da7191198aa17ea97f7b
2017-07-11 22:08:19 +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
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
TreeHugger Robot
89fdea9807 Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev 2017-07-11 20:21:01 +00:00
jackqdyulei
50b0daee90 Bind service in onCreate
This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.

Bug: 62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Merged-In: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
2017-07-11 13:17:38 -07:00
Daniel Nishi
4961451a4e Merge "Expand ASM activation warning." into oc-dr1-dev
am: 64acb2906c

Change-Id: I980227fd99274364a7160a0e896b9518c2de1dd0
2017-07-11 19:56:41 +00:00
Daniel Nishi
64acb2906c Merge "Expand ASM activation warning." into oc-dr1-dev 2017-07-11 19:46:19 +00:00