Commit Graph

34170 Commits

Author SHA1 Message Date
Daniel Nishi
b57795c311 Merge "Update the spacing on the Storage header." 2017-03-17 19:41:20 +00:00
Doris Ling
4d07b42a41 Update strings for Apps & notifications screen.
Bug: 36376411
Test: builds
Change-Id: I92c08bfc0c6c85db07fede31eeef7fb9c0babbea
2017-03-17 12:26:25 -07:00
Julia Reynolds
521c8751b3 Show channel description.
Test: manual
Change-Id: I0965b0ad2c64571a01a5f221f8d344c60d54b53d
2017-03-17 15:10:29 -04:00
William Luh
45f4e1241d Cache the summary and icons for Security Settings injected tiles.
This helps the summary and icons load more smoothly when resuming
from recents.

Bug: 35994047
Test: make RunSettingsRoboTests
Change-Id: I763f7dd19f64007959e1281f0ff04ecd19bbfbfc
2017-03-17 12:09:58 -07:00
Fan Zhang
499c8d54e8 Remove "remove account" from account sync detail page
Change-Id: I40cc9d3d593c31a5e3b02553ac12f77c0825ed51
Fix: 36375879
Test: make RunSettingsRoboTests
2017-03-17 11:02:46 -07:00
Lei Yu
dc8d9b138d Merge "Change ripple in battery pages" 2017-03-17 17:11:46 +00:00
Paul Duffin
6b58b5c9f7 Remove ambiguous wildcard import of org.mockito.Matchers.*
The recent upgrade to Mockito 2.7.13 has caused some problems
for grok (and new javac toolchain). The changed files used
wildcard imports to import the same methods from both Matchers
and Mockito.

This was not a problem previously because in the previous
version of Mockito the Mockito class extended the Matchers class
and so even though two methods with the same name were imported
they were not treated as a conflict because they were treated as
being the same method. In 2.7.13 the Mockito class no longer
extends the Matchers class instead they both extend the
ArgumentMatchers class and so for some reason javac no longer
treats them as the same method.

This was not detected by presubmit builds because jack is
still treating the methods as being the same.

Bug: 32912773
Test: m -j32 ANDROID_FORCE_JACK_ENABLED=disabled FrameworksWifiTests
Change-Id: I8c2b1dd39d2d653fe0fba19ed6421b7de25bb82f
2017-03-17 13:10:03 +00:00
TreeHugger Robot
d964467622 Merge "Fix NPE when building suggestion identifier." 2017-03-17 01:47:59 +00:00
TreeHugger Robot
0fea0d33e5 Merge "Add "Use open Wi-Fi automatically" setting." 2017-03-17 01:34:25 +00:00
Fan Zhang
264c0c2bbe Fix NPE when building suggestion identifier.
And refactored the getIdent logic into feature provider.

Change-Id: Id6f66a6942cbaf6d26ae4dca62037a6cf01179a5
Fix: 36314240
Test: make RunSettingsRoboTests
2017-03-16 17:12:22 -07:00
TreeHugger Robot
0fa7262c49 Merge "Listen to mobile data enabled flag change." 2017-03-17 00:09:54 +00:00
Amin Shaikh
1cf25748d6 Add "Use open Wi-Fi automatically" setting.
- Add toggle to ConfigureWifiSettings for "Use open Wi-Fi automatically"
- Start ACTION_CUSTOM_ENABLE activity and handle result to set the
USE_OPEN_WIFI_PACKAGE setting.

Bug: 34773276
Test: make
Change-Id: I602e271d5113e415d290468548e35059bd45d8b8
2017-03-16 16:54:20 -07:00
Daniel Nishi
17529b7dc1 Add lifecycle methods for managing the options menu.
Test: Settings robotests
Change-Id: I087cd0ec097041a4c4e0dd561dd2ec62f45f5390
2017-03-16 16:13:20 -07:00
jackqdyulei
26bc34a8b4 Change ripple in battery pages
1. Add ripple for battery header
2. Remove ripple for battery usage graph

Bug: 35959227
Bug: 35957849
Test: Manual
Change-Id: I7b9965304d0c79b59bdac92719e303931206b672
2017-03-16 16:08:42 -07:00
TreeHugger Robot
8c451742d0 Merge "Purify SettingsActivity from old search code." 2017-03-16 23:01:45 +00:00
Fan Zhang
917721c8d6 Listen to mobile data enabled flag change.
The listener is necessary to show/hide the gear icon on top of billing
cycle settings screen as user turn on/off mobile data from QS.

code cleanup: remove dividedCategory

Fix: 28066849
Test: make RunSettinsgRoboTests

Change-Id: I3b7075512042127fd711a8a70a572adfed069502
2017-03-16 15:08:49 -07:00
TreeHugger Robot
99977126be Merge "Change name of NetworkScorerPicker." 2017-03-16 21:55:00 +00:00
Matthew Fritze
0b431fc003 Purify SettingsActivity from old search code.
Bug:35763944, 32590887
Test: make RunSettingsRoboTests
Change-Id: Id8140b68a676e595bff095546fa119cd3ced2c4a
2017-03-16 14:14:44 -07:00
Stephen Chen
d4c7e5cec1 Change name of NetworkScorerPicker.
Bug: 36028168
Test: n/a
Change-Id: I8eb8c1ebf703692882b025bebecb0953f934dcd6
2017-03-16 13:24:33 -07:00
TreeHugger Robot
d764c57dcc Merge "Remove ranking code for Old Search" 2017-03-16 20:15:02 +00:00
Fan Zhang
4eb22906bb Merge "Fix a crash when resuming sound setting with AfW on Ryu" 2017-03-16 20:13:36 +00:00
Maurice Lam
3ad2b442b0 Merge "Remove unused ExploreByTouchHelper class" 2017-03-16 19:47:00 +00:00
TreeHugger Robot
89052d7268 Merge "Update some strings to match spec" 2017-03-16 18:30:09 +00:00
Fan Zhang
dc9a82f5b0 Fix a crash when resuming sound setting with AfW on Ryu
Also renamed a few xmls

Change-Id: I8ff5a778a39ea45471a27048be4ea2f21075872a
Fix: 36357493
Test: make RunSettingsRoboTests
2017-03-16 11:26:33 -07:00
TreeHugger Robot
7c22d1f181 Merge "packages/apps/Settings: Add APCT tests to the device-tests suite." 2017-03-16 18:06:24 +00:00
liurong
36bf4178d0 Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a am: 7e51242c05
am: e821a7af23

Change-Id: I9f042c269caa25c2824e62e06e4fb775124310b7
2017-03-16 17:33:53 +00:00
Maurice Lam
e8c3a7c2d3 Remove unused ExploreByTouchHelper class
Framework bug fixes removed the need for this copy, and
it's not referenced anyway.

Test: Existing tests pass
Change-Id: I1dd5045246ed737b30da2d558d14bc2c86af4f31
2017-03-16 17:33:45 +00:00
liurong
e821a7af23 Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a
am: 7e51242c05

Change-Id: Ide77fb0f05a8eeb2df4ab24dc1831cd734c95362
2017-03-16 17:30:51 +00:00
liurong
7e51242c05 Merge "Optimized Code: call direct method to get integer extra"
am: b7fa46453a

Change-Id: Ib7194de15766eb4912e7bbd43b308bd51dd5496a
2017-03-16 17:27:51 +00:00
Treehugger Robot
b7fa46453a Merge "Optimized Code: call direct method to get integer extra" 2017-03-16 17:23:30 +00:00
Fan Zhang
50f82ac557 Update some strings to match spec
Change-Id: Iba242871fce9c9bca8fbbc5d3ad3f7948f35d3d0
Fix: 36234108
Test: make RunSettingsRoboTests
2017-03-16 09:59:42 -07:00
Matthew Fritze
aa15a8e9c6 Remove ranking code for Old Search
Test: make RunSettingsRoboTests
Bug:35763944
Change-Id: I30b1d22f2de293bd6ff03352ca5793b00beec61a
2017-03-16 08:53:14 -07:00
Christine Franks
52aaa9cc31 Merge "Change strings for system alert window setting" 2017-03-16 15:25:51 +00:00
Julia Reynolds
8973e2786d Notification channel settings updates
- Show a deleted count instead of individual deleted channels
- Make the link to app settings more prominent
- Reload settings onresume

Change-Id: I4f493181194943310ba536eb2bca270cec7cafce
Fixes: 36119790
Fixes: 36191444
Test: manual
2017-03-16 14:31:00 +00:00
Julia Reynolds
2194f3db37 Display channel/group names only.
Test: manual
Change-Id: I7da68f71ddb78f3150ebc64af40310de65cd010c
2017-03-16 14:21:56 +00:00
liurong
c2daeaf7e7 Optimized Code: call direct method to get integer extra
Description: Make the default preferred sim slot as the first one(0) when get PREFERRED_SIM.

Test: NA
Change-Id: Id54bdbefd413c58ecd637cb8ff522861ead79331
Signed-off-by: liurong <liurong@xiaomi.com>
2017-03-16 22:02:32 +08:00
Saige McVea
8ba1bf34b4 Merge "Fixes string reference in SEARCH_INDEX_DATA_PROVIDER and minor changes to UI based on UX review." 2017-03-16 00:49:36 +00:00
TreeHugger Robot
94d2dece74 Merge "Create robolectric tests for WifiNetworkDetailsFragment." 2017-03-16 00:46:38 +00:00
Christine Franks
b0a1e8e09a Change strings for system alert window setting
Bug: 36070413
Test: Settings reflects new strings, and make RunSettingsRoboTests
Change-Id: I94a92ecee4d37fff2a0c128061d90ed6ef1cc016
2017-03-16 00:30:08 +00:00
TreeHugger Robot
54c962f55e Merge "SearchFragment removes stale data from the database" 2017-03-16 00:17:12 +00:00
TreeHugger Robot
b1427f0034 Merge "Disable collapse when fragment is opened from search" 2017-03-16 00:13:19 +00:00
Daniel Nishi
af051f1a32 Add borders to the Automatic Storage Management switch.
This adds a top and bottom line to the switch.

Change-Id: Ida01c3f28c201a9203b06c9e0c147b5171fe3781
Fixes: 36223332
Test: Manual
2017-03-15 17:01:11 -07:00
Daniel Nishi
f1050cb7c7 Use total size and not free in Storage summary.
Fixes: 36223330
Test: Settings Robotest
Change-Id: I4406dc673961db0f91ae37da3abd0e1541517c7d
2017-03-15 16:51:21 -07:00
Marie Janssen
68a414e86c Merge "Bluetooth: leave screen off for permission request" am: 172b01035d am: 09f5638b92
am: 895ac35f4d

Change-Id: I9e162f37b76ad8e7adc438d082d8352720916df0
2017-03-15 23:02:23 +00:00
Marie Janssen
895ac35f4d Merge "Bluetooth: leave screen off for permission request" am: 172b01035d
am: 09f5638b92

Change-Id: I5af6b6f3d6463cd33c9074d31ba0e8c16eb6c9a7
2017-03-15 23:00:06 +00:00
Marie Janssen
09f5638b92 Merge "Bluetooth: leave screen off for permission request"
am: 172b01035d

Change-Id: Id768f3a4cdbb4286cd1096f94b6fb5b11bae6cc8
2017-03-15 22:57:38 +00:00
Treehugger Robot
172b01035d Merge "Bluetooth: leave screen off for permission request" 2017-03-15 22:49:57 +00:00
Daniel Nishi
32992593d3 Add new strings.
Bug: 36197674
Test: Manual
Change-Id: Id198ae9a38caece97435b60561c1273f9408ef90
2017-03-15 15:48:57 -07:00
Daniel Nishi
fa0ae30061 Update the spacing on the Storage header.
This updates the spacing between the summary text.

Bug: 36223821
Test: Manual

Change-Id: I30640964ee05b1e49038ceb67c9c7bf86f637b5a
2017-03-15 15:41:15 -07:00
Matthew Fritze
ebb5b7f73d SearchFragment removes stale data from the database
When search fragment is created, it will get a list of
the non-indexable keys and verify that each of the results
are not a part of that list.

This CL moves the non-indexable keys logic into a
controller for shared use between SearchFragment
and DatabaseIndexingManager.

Bug:33209418
Test: make RunSettingsRoboTests
Change-Id: I4ed3812ecc5ee9e63b75ba6edbc7ff8712e8e9c9
2017-03-15 15:34:49 -07:00