Antony Sargent
04a3b2199e
Add a new Bluetooth device details page
...
Bug: 35877479
Test: make RunSettingsRoboTests
The existing behavior is to bring up a dialog with Bluetooth device
details with checkboxes for each supported profile. This adds a new page
that serves the same purpose with a switch for each profile and a footer
containing the MAC address.
Whether to use the new page or old dialog is controlled by a flag
accessible via BluetoothFeatureProvider.
Change-Id: I026c363d4cd33932a84017a67cbef51c258bad10
2017-06-05 11:17:06 -07:00
TreeHugger Robot
8d9177a06e
Merge "Hide saved network preference when there is none."
2017-06-01 21:41:39 +00:00
Matthew Fritze
5baaa7aef9
Merge "Prevent crash when removing duplicates" into oc-dev am: 7a148b9e09
...
am: 752b18191b
-s ours
Change-Id: I05c487d4a8fc39944065a7f305afb87128e25400
2017-06-01 21:29:35 +00:00
Matthew Fritze
752b18191b
Merge "Prevent crash when removing duplicates" into oc-dev
...
am: 7a148b9e09
Change-Id: I9ea047489b44bc538033343a6350a5abb8afef63
2017-06-01 21:24:36 +00:00
TreeHugger Robot
7a148b9e09
Merge "Prevent crash when removing duplicates" into oc-dev
2017-06-01 21:12:11 +00:00
Fan Zhang
396938f29b
Merge "Add method to disable "disable" button in installed app UI" into oc-dev am: e12790e34f
...
am: 7d190dd69d
-s ours
Change-Id: Ib535478ef6de2a75d8675553d0f350f636d12e63
2017-06-01 20:34:53 +00:00
Andrew Sapperstein
c0a9fe9926
Merge "Initial search bar implementation." into oc-dev am: 91fe76263f
...
am: 9448f68171
-s ours
Change-Id: I45f0f3381052d2a57612134cf0ffe45711f50311
2017-06-01 20:28:37 +00:00
Fan Zhang
7d190dd69d
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
...
am: e12790e34f
Change-Id: I4a5223a27c98f7ae9422fb017f4206721080890a
2017-06-01 20:28:34 +00:00
TreeHugger Robot
e12790e34f
Merge "Add method to disable "disable" button in installed app UI" into oc-dev
2017-06-01 20:24:06 +00:00
TreeHugger Robot
f43f4c3131
Merge "Move BatteryInfo to settings from settingslib"
2017-06-01 20:16:42 +00:00
xudiwen
52c031edae
Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01
am: 957c4d7720
am: 0ff0487b51
...
am: ecfbe17684
Change-Id: I0ecfb03dfdc7cafeb82a771ff87a33bf0408b961
2017-06-01 20:02:14 +00:00
Andrew Sapperstein
9448f68171
Merge "Initial search bar implementation." into oc-dev
...
am: 91fe76263f
Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
2017-06-01 20:01:49 +00:00
jackqdyulei
3e36c649c5
Merge "Add method to calculate last full charge time" into oc-dev am: d4991dc24d
...
am: 42790ccd84
-s ours
Change-Id: I09c4fdc402133470177817ca4fd713c372be2015
2017-06-01 20:01:42 +00:00
TreeHugger Robot
ee8ac88f82
Merge "Add search bar to SearchActivity."
2017-06-01 19:57:20 +00:00
Andrew Sapperstein
91fe76263f
Merge "Initial search bar implementation." into oc-dev
2017-06-01 19:52:07 +00:00
Fan Zhang
015c7706e4
Hide saved network preference when there is none.
...
We already do this when wifi is enabled. This change brings same
behavior when wifi is off.
Change-Id: I44301fe46a6183735f8be71c80cfe719ad0e82b4
Fix: 62094681
Test: runtest --path tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
2017-06-01 12:38:08 -07:00
TreeHugger Robot
b42162c819
Merge "Pass component name into SuggestionFeatureProvider"
2017-06-01 19:33:29 +00:00
xudiwen
ecfbe17684
Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01
am: 957c4d7720
...
am: 0ff0487b51
Change-Id: I22cd436533a745a415a49122fe2469ef9a96cdc9
2017-06-01 19:09:25 +00:00
jackqdyulei
42790ccd84
Merge "Add method to calculate last full charge time" into oc-dev
...
am: d4991dc24d
Change-Id: I4d8bd3099f493497adeb9afe42395225d7fb949c
2017-06-01 19:05:44 +00:00
xudiwen
0ff0487b51
Merge "NullPointerException when running monkey test in IccLockSettings" am: 2c8d826b01
...
am: 957c4d7720
Change-Id: I6f872dc828e25a849cfa5f2a4c56961f94b63541
2017-06-01 19:05:23 +00:00
TreeHugger Robot
21fc59464b
Merge "Bluetooth string changes"
2017-06-01 19:04:07 +00:00
xudiwen
957c4d7720
Merge "NullPointerException when running monkey test in IccLockSettings"
...
am: 2c8d826b01
Change-Id: I8d54ebc4a699bd57631acc2150662cb923ca0015
2017-06-01 19:01:50 +00:00
TreeHugger Robot
d4991dc24d
Merge "Add method to calculate last full charge time" into oc-dev
2017-06-01 18:55:54 +00:00
Treehugger Robot
2c8d826b01
Merge "NullPointerException when running monkey test in IccLockSettings"
2017-06-01 18:51:44 +00:00
Salvador Martinez
0e8c88376c
Move BatteryInfo to settings from settingslib
...
This CL simply moves BatteryInfo from settingslib to settings and
makes sure the tests still pass. No other changes are made other than
imports or minor changes needed to make sure existing code does not
break.
Test: Robotests still pass
Bug: 38399275
Bug: 38398949
Bug: 38399654
Change-Id: I59803348e2780b7676ccc6c43234a586c184d71f
2017-06-01 11:34:08 -07:00
Matthew Fritze
ebd80e68ab
Prevent crash when removing duplicates
...
The method that crashes is removed in O-DR, and thus
does not need to be merged down.
Change-Id: If30bd8bd92d578133984f7f35e7ec5288adfc390
Fixes: 62100634
Test: make RunSettingsRoboTests
Merged-In: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
2017-06-01 11:13:37 -07:00
Andrew Sapperstein
893cb0987a
Add search bar to SearchActivity.
...
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:01:00 -07:00
Daniel Nishi
1e6b7171ff
Merge "Fix a bug where cache was double-counted." into oc-dev am: 7035a41715
...
am: 0a8b12a30a
Change-Id: I3f17e10a9aaf011aee587dbe0e36d18a3a27c42f
2017-06-01 17:48:41 +00:00
Daniel Nishi
0a8b12a30a
Merge "Fix a bug where cache was double-counted." into oc-dev
...
am: 7035a41715
Change-Id: I2c465b9561cea69e5772efd08af7794f762758ca
2017-06-01 17:42:55 +00:00
Daniel Nishi
7035a41715
Merge "Fix a bug where cache was double-counted." into oc-dev
2017-06-01 17:30:33 +00:00
Antony Sargent
e90f29bacf
Bluetooth string changes
...
This includes:
-Title string for device details page
-MAC address string for device details page
Bug: 35876580
Test: make RunSettingsRoboTests
Change-Id: I360996915d1dfa59bbb12f33f42afc4aa0bde64b
2017-06-01 10:28:29 -07:00
TreeHugger Robot
9ccd8ab619
Merge "Add search index for support dashboard activity."
2017-06-01 17:03:06 +00:00
TreeHugger Robot
0a53489248
Merge "Use a common style for custom preference icon layouts"
2017-06-01 08:40:46 +00:00
Kevin Chyn
7359c0d5f4
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev am: 98b67a4e94
...
am: 618467daff
Change-Id: I78b14e932635fd316fa96fc2cfadcdf9567e724c
2017-06-01 08:25:07 +00:00
Kevin Chyn
618467daff
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
...
am: 98b67a4e94
Change-Id: Ic3497ccbd63ba4e56ad1923f6b4d082e78c95b70
2017-06-01 08:17:06 +00:00
TreeHugger Robot
98b67a4e94
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
2017-06-01 08:09:52 +00:00
TreeHugger Robot
181ea4509a
Merge "Update bluetooth strings"
2017-06-01 07:25:59 +00:00
TreeHugger Robot
d2b751ebd1
Merge "Add method to calculate last full charge time"
2017-06-01 07:11:37 +00:00
TreeHugger Robot
8306791889
Merge "Remove night display headers and change strings"
2017-06-01 06:45:14 +00:00
TreeHugger Robot
fca1b78d94
Merge "Initial search bar implementation."
2017-06-01 06:43:22 +00:00
Daniel Sheng
b01bf85a15
Merge "Added strings for gesture suggestions"
2017-06-01 05:39:02 +00:00
Kevin Chyn
bb846a6608
Add onResume to FingerprintEnrollEnrolling
...
Fixes: 62233947
Test: revoke usb permissions, start enrolling, attach usb,
press ok, continue enroll. enroll should be able to continue
and complete
onPause was added in b/38102355, but onResume was not added. We should
set the listener in onResume()
Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
2017-05-31 17:11:03 -07:00
Fan Zhang
c2b0c7bf31
Use a common style for custom preference icon layouts
...
Change-Id: Ief3bc54f700cb891041adf92846149c6f41caad0
Fix: 35961001
Test: instrumentation test
2017-05-31 17:09:15 -07:00
jackqdyulei
ab1df0bbd3
Update bluetooth strings
...
Update based on new change in doc:
1. revert "visible as" string
2. change "device mac" string
Bug: 35876580
Test: RunSettingsRoboTests
Change-Id: I8950ed3e2e9c000ab25ea0a3d0d15f69fc075fda
2017-05-31 16:41:33 -07:00
Christine Franks
c101dda9f7
Merge "Allow FR in carrier demo mode" into oc-dev am: 9ef166a578
...
am: d974ccb625
Change-Id: I8d693fd2d41f73b53416ee83d7b289496765c660
2017-05-31 22:54:31 +00:00
Matthew Fritze
3c666f0b27
Merge "Remove dynamic summary from Security Patch info" into oc-dev am: 564d90faf0
...
am: 6a50c4555c
Change-Id: Iaf810111f5c4d5e820a0d336eb3029b9474757f3
2017-05-31 22:52:58 +00:00
Christine Franks
d974ccb625
Merge "Allow FR in carrier demo mode" into oc-dev
...
am: 9ef166a578
Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992
2017-05-31 22:52:57 +00:00
Doris Ling
a72775a47a
Merge "Add new strings to highlight gestures in settings."
2017-05-31 22:47:55 +00:00
Christine Franks
9ef166a578
Merge "Allow FR in carrier demo mode" into oc-dev
2017-05-31 22:47:43 +00:00
Matthew Fritze
6a50c4555c
Merge "Remove dynamic summary from Security Patch info" into oc-dev
...
am: 564d90faf0
Change-Id: I91993bdbf7de1256fb8149478126ec507833611b
2017-05-31 22:47:27 +00:00