Sundeep Ghuman
b963c1190f
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
...
am: 1e561edb45
Change-Id: I9fa78596bdcbaeac90aaee55ddcde3f698ad907f
2017-06-30 00:04:37 +00:00
Sundeep Ghuman
1e561edb45
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
2017-06-29 23:56:51 +00:00
Salvador Martinez
cc7c9603db
Add BatteryInfo logging to settings
...
This Cl adds a few log statements to BatteryInfo to try
and determine what the bottleneck in the Battery Settings
Advanced page could be.
Test: robotests still pass
Bug: 62959645
Change-Id: I1ff712d97bc8be78873c63e187edbffa8e10cd21
2017-06-29 16:53:27 -07:00
Andrew Sapperstein
8e1c3b9b1b
Merge "Fix robotests." into oc-dr1-dev
...
am: db72caf3ea
Change-Id: I8893ca932f1cfcb20d72609eaf994bc7ddb9f143
2017-06-29 23:35:26 +00:00
Andrew Sapperstein
db72caf3ea
Merge "Fix robotests." into oc-dr1-dev
2017-06-29 23:27:24 +00:00
Andrew Sapperstein
51e4a66446
Fix robotests.
...
Change-Id: Ia0615bfdd303a19b145ead44979a03ccdd29bf41
Fixes: 63141368
Test: robotest
2017-06-29 16:24:32 -07:00
Lei Yu
34c96fff5c
Merge "Update strings for anomaly dialog" into oc-dr1-dev
...
am: 2354fae941
Change-Id: Ief85db7f1134036ced0eac6f07c0d6a15603ee73
2017-06-29 22:13:36 +00:00
Lei Yu
2354fae941
Merge "Update strings for anomaly dialog" into oc-dr1-dev
2017-06-29 22:08:40 +00:00
Shunta Sato
97419f8d52
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
...
am: 9638e020e5
Change-Id: I4c947cddb3ee000bc51dd8ea2f9eefbc54927824
2017-06-29 20:38:03 +00:00
TreeHugger Robot
9638e020e5
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
2017-06-29 20:31:18 +00:00
Daniel Nishi
7aad345862
Use normal layout for "Space Used" header.
...
This fixes the issue where the indentation was wrong.
Change-Id: Ie16bcdec87aa8605d65ac33a05c12d7a26b89b55
Fixes: 62548754
Test: Manual
2017-06-29 12:37:23 -07:00
Doris Ling
cf57e17791
Merge "Add account sync summary." into oc-dr1-dev
...
am: 5243d5dd85
Change-Id: I00eb5bae671c4e4427c8af04abb541b0f1e74d60
2017-06-29 19:02:29 +00:00
Daniel Nishi
05d49497b9
Storage item preferences should be 72dp tall.
...
In changing the layout, this also centers the icon properly.
Change-Id: I8fa36e18cf4a0d5765ccbe65a7975fd71832a9ae
Fixes: 62548432
Bug: 62581475
Test: Manual
2017-06-29 12:01:59 -07:00
TreeHugger Robot
5243d5dd85
Merge "Add account sync summary." into oc-dr1-dev
2017-06-29 18:58:58 +00:00
jackqdyulei
595def292b
Merge "Change the type of "hours" from long to double" into oc-dr1-dev
...
am: 1498e86530
Change-Id: I4bd802fa60da314a7997addbe2920b394d0e4209
2017-06-29 18:41:23 +00:00
TreeHugger Robot
1498e86530
Merge "Change the type of "hours" from long to double" into oc-dr1-dev
2017-06-29 18:38:39 +00:00
jackqdyulei
d26dcbd95f
Update strings for anomaly dialog
...
1. Add message for new force stop dialog, which is used for wakeup alarm
anomaly
2. Change message for background usage dialog by adding the force stop
action
Bug: 63037765
Test: screenshots
Change-Id: I8ecbf9c517eee7e31ae39509c9112b53ef1225c6
2017-06-29 10:02:25 -07:00
Andrew Sapperstein
115f0603eb
Merge "Use proper title for support page." into oc-dr1-dev
...
am: 05872fc1c7
Change-Id: Ie8d19b8925328b296879179d4c88af217d66edaa
2017-06-29 16:38:16 +00:00
TreeHugger Robot
05872fc1c7
Merge "Use proper title for support page." into oc-dr1-dev
2017-06-29 16:31:06 +00:00
Andrew Sapperstein
301dfdd8d1
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
...
am: 63c63ff640
Change-Id: I165409df28685c85ca2edc22971e4471d9ff549f
2017-06-29 04:48:30 +00:00
TreeHugger Robot
63c63ff640
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
2017-06-29 04:38:44 +00:00
Sundeep Ghuman
14cc864122
Don't scroll when removing saved networks.
...
Bug: b/62374459
Test: Open saved networks from WifiSettings. Remove a saved network.
Screen should not scroll to the top of the list.
Change-Id: Ia78fc0b5435f659c8fe31abee8b76006d7986b66
2017-06-28 20:27:15 -07:00
Shunta Sato
22080a1df5
Fix Wi-Fi list adds same AP repeatedly
...
When switch AP security mode, several same APs are shown.
To fix this issue, append security type to preference
key for avoiding different APs have same key.
git fetch
Cherrypick of:
https://partner-android-review.googlesource.com/#/c/799829/
Bug: 37558394
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I39621636f14b29e45ba96ff76dc3c21a4996a136
2017-06-28 20:21:46 -07:00
Maurice Lam
d3d1210fad
Merge "Read theme for lock screen flows" into oc-dr1-dev
...
am: 864d5c96d7
Change-Id: I5b70f7ac6ff0c4598f3f409d682c9ff2dec42471
2017-06-29 02:00:33 +00:00
Maurice Lam
864d5c96d7
Merge "Read theme for lock screen flows" into oc-dr1-dev
2017-06-29 01:47:14 +00:00
jackqdyulei
b58333f46e
Merge "Add metric action log for anomaly action" into oc-dr1-dev
...
am: 43afb664e6
Change-Id: I8cd38faa751b9fabbe9164d90b0e73199b28bf94
2017-06-29 01:15:33 +00:00
Doris Ling
5d66fa4c94
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
...
am: 9df70249b9
Change-Id: I4d245fa2b74d5e6967a522455584971b8c9fb711
2017-06-29 01:11:57 +00:00
TreeHugger Robot
43afb664e6
Merge "Add metric action log for anomaly action" into oc-dr1-dev
2017-06-29 01:10:42 +00:00
TreeHugger Robot
9df70249b9
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
2017-06-29 01:04:58 +00:00
Andrew Sapperstein
3d246e607d
Use proper title for support page.
...
Was using settings, now using "support & tips".
Change-Id: Ic79d256e841afb52048e9584279a111f6a121504
Fixes: 62903819
Test: manual
2017-06-28 17:57:53 -07:00
jackqdyulei
9d57855c96
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
...
am: 33c9b7a111
Change-Id: I63328028c7620792ca619cb63c5d0b048413eda5
2017-06-29 00:48:47 +00:00
TreeHugger Robot
33c9b7a111
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
2017-06-29 00:43:09 +00:00
Andrew Sapperstein
ebaab6aabd
Reduce number of wallpaper results in search.
...
Previously we indexed the intent in display settings and every
app that handled ACTION_SET_WALLPAPER. Now, we only index an
app that handles ACTION_SET_WALLPAPER and is the listed package in
config_wallpaper_picker_package.
Change-Id: Ife81702017e3e8be4a754873d9c453fddf1cbd9e
Fixes: 62793068
Test: manual, search wallpaper and observe results
2017-06-28 17:16:57 -07:00
Sundeep Ghuman
9ff2435ebc
Merge "Scroll to top when connecting to network." into oc-dr1-dev
...
am: ea3d314a10
Change-Id: I78adb370cf5261611ad0a56effae652c494e9592
2017-06-28 23:36:12 +00:00
TreeHugger Robot
ea3d314a10
Merge "Scroll to top when connecting to network." into oc-dr1-dev
2017-06-28 23:32:13 +00:00
jackqdyulei
8213f102dc
Change the type of "hours" from long to double
...
So we won't have the rounding issue here.
Bug: 63112264
Test: RunSettingsRoboTests
Change-Id: I85b3525781074294964a956dbe76f3b55f65704d
2017-06-28 16:20:34 -07:00
jackqdyulei
ac29684b14
Add metric action log for anomaly action
...
Change AnomalyAction to abstract class and log the action there.
Bug: 37681923
Test: RunSettingsRoboTests
Change-Id: Ied7a269d4a3f8fcb978165af6e17a9c9952fea49
2017-06-28 15:35:54 -07:00
Maurice Lam
9990f39722
Read theme for lock screen flows
...
Move the applyThemeResource calls up from the setup wizard specific
subclasses up to the settings classes so that it will get GLIF v2
theme on devices that request it.
Test: Manual
Bug: 62906814
Change-Id: I6ff4ff8d9ed3e6090b35b4ae7197e5d01f5a61f8
2017-06-28 15:06:09 -07:00
Daniel Nishi
7cc286bac7
Merge "Put the donut on a diet." into oc-dr1-dev
...
am: 2cbe278ad4
Change-Id: I156d0acacd4933247634d7915defa9fbe73a0ba0
2017-06-28 20:59:52 +00:00
Daniel Nishi
e440fdb769
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
...
am: ff8312b36b
Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5
2017-06-28 20:59:31 +00:00
Daniel Nishi
2cbe278ad4
Merge "Put the donut on a diet." into oc-dr1-dev
2017-06-28 20:54:57 +00:00
Daniel Nishi
ff8312b36b
Merge "Use the proper style for the SpacePreference." into oc-dr1-dev
2017-06-28 20:54:29 +00:00
Matthew Fritze
d4075ea983
Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
...
am: e2e54e17c7
Change-Id: Ib8b6696cc232ef492a75180c4ac18ee7685be047
2017-06-28 20:50:22 +00:00
TreeHugger Robot
e2e54e17c7
Merge "Add synchronous indexing api to SearchFeatureProvider" into oc-dr1-dev
2017-06-28 20:44:13 +00:00
Doris Ling
e76550a66e
Add account sync summary.
...
- Check for the number of sync adapter that is enabled for the account and
update the summary text for the account sync preference accordingly.
- Add divider above the Remove Account button.
Merged-In: Ic333f62cce9aed0a72771324976ebe3d8e586287
Change-Id: I003d6dd0a070bf123f178b8d9ba7b6657466b905
Fix: 62862167
Test: make RunSettingsRoboTests
2017-06-28 13:37:17 -07:00
Matthew Fritze
46483a1a29
Merge "Add list-select as an inline result" into oc-dr1-dev
...
am: e455c8f377
Change-Id: I2b1e27042120dcb8121565ff58c21de0077837f3
2017-06-28 20:33:36 +00:00
TreeHugger Robot
e455c8f377
Merge "Add list-select as an inline result" into oc-dr1-dev
2017-06-28 20:27:00 +00:00
jackqdyulei
881b581e0a
Merge "Hide the IDLE in "app list"" into oc-dr1-dev
...
am: 9a30ceab83
Change-Id: I3e1b14434ae00357f0193bb917469319a212b155
2017-06-28 19:45:17 +00:00
jackqdyulei
9d4a2806a8
Merge "Update the UI for battery header" into oc-dr1-dev
...
am: 923f50fce6
Change-Id: Iee54c0fa4ff744ecadefe8fa75e069920569cb9e
2017-06-28 19:44:55 +00:00
TreeHugger Robot
9a30ceab83
Merge "Hide the IDLE in "app list"" into oc-dr1-dev
2017-06-28 19:38:20 +00:00