Commit Graph

37002 Commits

Author SHA1 Message Date
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
jackqdyulei
5fefa5337e Don't index High usage summary
Because the strings inside are dynamic

Bug: 62069270
Test: RunSettingsRoboTests still pass
Change-Id: I744179bef89cfaff403f9ce65fcfc0f03c04350b
2017-06-01 11:28:36 -07:00
jackqdyulei
b2acbb72ac Update strings for anomaly detection
Bug: 62069270
Test: Build
Change-Id: I7f5a00cfd39d85a08054e334ace76ebf7898850c
2017-06-01 11:27:32 -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
fac61b71e5 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: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:02:56 -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
Alison Cichowlas
9f36db1f4c Disallow buzz/beep/disturb changes for notifications with locked importance.
If mAppRow.lockedImportance (which comes from the whitelist config_nonBlockableNotificationPackages), don't allow sound, vibration, or override dnd to be changed.

Bug: 38480212
Test: manually verified for now
Change-Id: I04aa7f15f2480472ec6ee487472098e81ab3d99f
2017-06-01 10:52:15 -04:00
Esteban Talavera
9b86e9c822 Include disabled managed profiles in Accounts page
At the moment we include disabled profiles when deciding
whether the Work section needs to be added, and then only
include enabled ones when searching for the managed profile's
user handle

Change-Id: I96b0c36aad6b9326abc2992fa3309716f5cd1e74
Fix: 62021410
Test: m RunSettingsRoboTests
2017-06-01 09:52:45 +01: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
Lorenzo Colitti
0bde06cd59 Reduce jank in the wifi detail status page.
Currently, when anything changes, the wifi detail status page
removes and then redraws all IP address information. This causes
the whole screen to flicker. Instead, only add and remove things
when they actually change.

In order to do this, convert the IPv6 addresses from a list of
Preference objects to a single newline-separated text field.
This removes the need to keep track of addresses as they are
added and deleted, and also looks a bit better.

Also, minor correctness fixes:
- Get the gateway from the default route, not from the last route
  with a non-null gateway.
- Get the IPv4 subnet mask from the IPv4 address prefix, not from
  the last route with prefix length > 0.

Bug: 62171690
Test: make -j64 RunSettingsRoboTests
Test: IP information does not flicker when signal strength changes
Change-Id: Ia9f2a277e53a2800407ae327701c5b95a9eec20a
2017-06-01 12:08:41 +09: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
TreeHugger Robot
564d90faf0 Merge "Remove dynamic summary from Security Patch info" into oc-dev 2017-05-31 22:41:28 +00:00
Maurice Lam
15fbe83165 Merge "Center align icon and title in choose lock pattern" 2017-05-31 22:37:00 +00:00
Andrew Sapperstein
048f6fb8b3 Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-05-31 15:24:25 -07:00
Maurice Lam
1a07ab4790 String update for setup wizard
Test: Manual
Bug: 38503505
Change-Id: Idc881e5288ab205dee0a85a02d1365f6c4901c88
2017-05-31 14:59:37 -07:00