Commit Graph

1206 Commits

Author SHA1 Message Date
Matthew Fritze
78bc33c327 Merge "Reindex on OTA and locale change" into oc-dev am: f84c8d3480
am: 5bb64aeb59

Change-Id: I5551e8502a162a40e80f0c1c5637fd22f5545094
2017-04-11 00:37:41 +00:00
TreeHugger Robot
f84c8d3480 Merge "Reindex on OTA and locale change" into oc-dev 2017-04-10 23:54:55 +00:00
Matthew Fritze
a0d03178d0 Reindex on OTA and locale change
When the user gets an OTA or changes language, settings
will clear the database and reindex it.

Test: make RunSettingsRoboTests
Change-Id: I379ece86b2d41d673bbbffbcf947774f3ccd4cb9
Fixes: 36859162
2017-04-10 14:28:39 -07:00
Daniel Nishi
84aba27da4 Merge "Add user icon to the other user preferences." into oc-dev am: b1c336de5f
am: f4af2774ee

Change-Id: I1ff26ce55a3b1ade531745e091e5c6e2de243593
2017-04-10 17:37:54 +00:00
Daniel Nishi
b1c336de5f Merge "Add user icon to the other user preferences." into oc-dev 2017-04-10 17:27:25 +00:00
Lei Yu
cce44a57bf Merge "Add log for BatteryUtils" into oc-dev am: 27dc9b69ac
am: 964de0d7be

Change-Id: I11d8232ca7b1d96625cec881d085269fb81e8322
2017-04-10 17:17:52 +00:00
Lei Yu
27dc9b69ac Merge "Add log for BatteryUtils" into oc-dev 2017-04-10 17:06:45 +00:00
Daniel Nishi
fe33c58a18 Add user icon to the other user preferences.
This icon is loaded in the background to avoid doing IO on
the main thread. Once we know there are more users and also
have the icon loaded, we add the category to the view.

Fixes: 36252572
Test: Robotest

Change-Id: Ib50287bb7ed323f22fbe407b56be1bf2fe98f121
2017-04-07 14:57:07 -07:00
Doris Ling
0ec7d2eb0d Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
am: f8dead2f40

Change-Id: Id623c73b1bce56b3ec25a5b0dc7f4016a5fce72e
2017-04-07 20:12:28 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
Daniel Nishi
27d8d2b46e Merge "Update the automatic storage management preferences." into oc-dev am: 7badf46542
am: af587b0cfc

Change-Id: Icec5b8d5118497a7e4af21cc1c262400695b75e1
2017-04-07 19:50:05 +00:00
Daniel Nishi
7badf46542 Merge "Update the automatic storage management preferences." into oc-dev 2017-04-07 19:38:27 +00:00
Daniel Nishi
a480952e3d Merge "Fake the cache size to be 0 bytes when cleared." 2017-04-07 19:34:58 +00:00
jackqdyulei
5d2918a675 Add log for BatteryUtils
This cl add logs to get more data for app usage time.

Also refactor BatteryUtils to singleton pattern because we need
to extract package name from uid.

Bug: 36909166
Test: RunSettingsRoboTests
Change-Id: I6ede354035c46e46cb856b7cf57bd1b7ccbd6d4f
2017-04-07 11:18:39 -07:00
Doris Ling
cee83e4bbf Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Lei Yu
e0e4c5d3eb Merge "Remove misc data in battery main page." into oc-dev am: abde170529
am: 52e096284f

Change-Id: I7f1665ea0864ff726a2964952c43fbb69d95e6f1
2017-04-07 18:03:21 +00:00
Lei Yu
abde170529 Merge "Remove misc data in battery main page." into oc-dev 2017-04-07 17:37:18 +00:00
Filip Pavlis
5a2590dfdb Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev am: f023f50787
am: 7ae53e7df7

Change-Id: I9f075fbb5abe2767db1cd743a8c828d6f77fb9de
2017-04-07 10:45:07 +00:00
Filip Pavlis
f023f50787 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev 2017-04-07 10:31:45 +00:00
Doris Ling
d49dfb1472 Merge "Add test to verify no crash on selecting brightness level." into oc-dev am: 43146c4972
am: 272d65c0bc

Change-Id: I5dc16b17576273d7b3e43bae69e8bc60f29ccd5d
2017-04-07 02:37:13 +00:00
Doris Ling
0c39be8889 Merge "Update USb preference controller to use the new summary texts." into oc-dev am: e94ba3b55f
am: 8f3be96ba8

Change-Id: I6b8a83881fae1fea4cd1776fa28b354cae67dae9
2017-04-07 02:36:58 +00:00
TreeHugger Robot
43146c4972 Merge "Add test to verify no crash on selecting brightness level." into oc-dev 2017-04-07 02:28:47 +00:00
TreeHugger Robot
e94ba3b55f Merge "Update USb preference controller to use the new summary texts." into oc-dev 2017-04-07 02:27:55 +00:00
Doris Ling
388a138fd6 Merge "Update summary text for Trust agent." into oc-dev am: b9a54bae08
am: 4e33cc1279

Change-Id: I71cebb56677c1cc9f502c1578f2de3fbcfa88f26
2017-04-07 02:21:17 +00:00
TreeHugger Robot
b9a54bae08 Merge "Update summary text for Trust agent." into oc-dev 2017-04-07 02:09:36 +00:00
Doris Ling
222fe7d8a1 Merge "Add subtext to Default apps." into oc-dev am: 1e775c117a
am: 3da90f7f1c

Change-Id: Id89a509fa97edc1a31223bc25225a75f166e3f9c
2017-04-07 02:03:00 +00:00
Doris Ling
2db8c867d1 Update summary text for Trust agent.
Update the summary text to show the number of active trust agent.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
2017-04-06 17:29:12 -07:00
Doris Ling
d007ff9395 Add subtext to Default apps.
Retrieve the default Sms app, default Browser app, and default Phone app
and append the label together to form the summary text for Default apps
settings.

Bug: 36376411
Test: make RunSettingsRoboTests
Change-Id: I8ccf71dde43bba04c4bc4a900c9a181513e7710b
2017-04-07 00:10:39 +00:00
jackqdyulei
9d78a655fa Merge "Fix crash when clicking item in Battery screen" into oc-dev am: bac9b527e7
am: 23f8052652

Change-Id: Ie1895e12f4628dd80aca7eeb41bcbeac9599dc0e
2017-04-06 23:03:55 +00:00
Daniel Nishi
c660755348 Merge "Re-add the option to migrate data back." into oc-dev 2017-04-06 22:49:24 +00:00
Doris Ling
de03809396 Add test to verify no crash on selecting brightness level.
Add UI test to launch Settings->Display->Brightness level and Settings
app does not crash.

Change-Id: I526f44961bd0efbcacde334affbe2b7a93da0ce3
Fix: 36647069
Test: make SettingsTests
2017-04-06 15:10:29 -07:00
jackqdyulei
ab5ca9f5cd Remove misc data in battery main page.
The removed types are:
1. DrainType.UNACCOUNTED
2. DrainType.OVERCOUNTED

This cl removes the above types in PowerUsageSummary and
PowerUsageAdvanced

Bug: 36874846
Test: RunSettingsRoboTests
Change-Id: I1807c44a2c0a9c2fa124cdef962a6411ae6830ca
2017-04-06 15:09:57 -07:00
TreeHugger Robot
bac9b527e7 Merge "Fix crash when clicking item in Battery screen" into oc-dev 2017-04-06 21:50:07 +00:00
Daniel Nishi
f6b12274f1 Re-add the option to migrate data back.
Currently, users can use an SD card or USB drive and adopt it as
internal storage using existing flows. They can manage this drive
perfectly fine using the old storage screen, which is still around.

One functionality that was lost was the ability to migrate data from
the adopted drive back to the private internal storage. This appeared
in a dropdown in the old storage settings.

By duplicating the code to create just that specific menu item and its
click behavior, we can restore this functionality to the new storage
view.

Change-Id: Id0e01c560e7249acccfe86c5da44466dd58fe5d4
Merged-In: I4b8c06912d2c0b2c5be5bce8b217d45accf34d4b
Fixes: 35926028
Test: Settings Robotest
2017-04-06 13:57:00 -07:00
Doris Ling
76c325d46c Merge "Add summary text to Display->Brightness level." into oc-dev am: ad69c46712
am: c48ef6dda1

Change-Id: Id4d194f010c07d7d731238600f80dd18589a0358
2017-04-06 20:37:22 +00:00
Daniel Nishi
bf1f8e9ca7 Fake the cache size to be 0 bytes when cleared.
The fast track storage calculation returns a non-zero answer after
the storage has been cleared. The simplest workaround here is to
fake the size as 0 bytes in the view after cache clearing.

It will not be zero if the user exits and comes back, but this
should be fine.

MARK IT ZERO!

Change-Id: Ia012c2cf2842040d5eac3d4a72539ec7dcfb9570
Fixes: 34965659
Test: Settings Robotest
2017-04-06 13:35:09 -07:00
Doris Ling
ad69c46712 Merge "Add summary text to Display->Brightness level." into oc-dev 2017-04-06 20:03:24 +00:00
jackqdyulei
fefdd5d47f Fix crash when clicking item in Battery screen
"last full charge/Screen usage since full charge" goes crash when
clicking on it. This is because The default behaviour for
PowerGaugePreference is to start detail page and the above two items
are PowerGaugePreference.

This cl set these two items as non-selectable.

Bug: 37080048
Test: make -j40 SettingsTest
Change-Id: Ide4e151dcd0b44fb795a5753c91f2197b2a24a56
2017-04-06 12:52:50 -07:00
Doris Ling
eff691280a Merge "Update summary for Connected devices->Printing." into oc-dev am: 4bbfdb13e7
am: 38fc861a62

Change-Id: I6329d63106ce55d324c284126459f03aea614ef5
2017-04-06 19:21:53 +00:00
Doris Ling
4bbfdb13e7 Merge "Update summary for Connected devices->Printing." into oc-dev 2017-04-06 18:35:53 +00:00
Doris Ling
8071d18ad5 Merge "Update Wifi off summary text." into oc-dev am: 28e35fcf05
am: 0950fa569b

Change-Id: I439f95faddf7848e14d7f94a37e65f5b93394645
2017-04-06 17:20:52 +00:00
Christine Franks
fbf21f4c85 Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5
am: 8606c652d5

Change-Id: Idb0cbf6b0467f9fd43b1e9e40e622146640a9a7e
2017-04-06 17:19:25 +00:00
Doris Ling
28e35fcf05 Merge "Update Wifi off summary text." into oc-dev 2017-04-06 17:04:45 +00:00
Christine Franks
c50403c606 Prevent apps from displaying over Settings
Specifically, the DrawOverlayDetails fragment only.

Bug: 36070413
Test: make RunSettingsRoboTests -j100
Change-Id: I0069f0cacf8c963c8c6878dc89a32b205983a568
2017-04-05 17:55:24 -07:00
TreeHugger Robot
418e5bffda Merge "Fix crash when opening battery page" into oc-dev 2017-04-05 22:45:46 +00:00
Sundeep Ghuman
5c2245fca3 Merge "Create Espresso test class for WifiSettings." into oc-dev am: 8b06cbd3a9
am: 904320244d

Change-Id: Icf6780556873c04819216cfd9a162234d6106978
2017-04-05 22:16:59 +00:00
TreeHugger Robot
f297e843e9 Merge "Ui changes in battery main page" into oc-dev 2017-04-05 22:13:01 +00:00
Daniel Nishi
4c52af621a Merge "Lower case the first letter of storage type." into oc-dev 2017-04-05 22:06:55 +00:00
TreeHugger Robot
8b06cbd3a9 Merge "Create Espresso test class for WifiSettings." into oc-dev 2017-04-05 21:27:40 +00:00
jackqdyulei
cdbc114376 Fix crash when opening battery page
The settings crashes when opening battery usage detail page from
installed app page. Main reason is that it trying to open obsolete
page. This cl directs it to open AdvancedPowerUsageDetail instead.

Following cl will make InstalledAppDetail show calibrated percentage,
which is trakced in b/36816681

Bug: 36792973
Test: RunSettingsRoboTests
Change-Id: Ie63e64e543ed3b28974ffdda8b42c97e7749a0f7
(cherry picked from commit fac713318c)
2017-04-05 14:12:26 -07:00