Fan Zhang
8b0df6a4df
Fix settings robotest am: 4e34839a1e
...
am: 517daf43a4
2017-06-30 03:53:57 +00:00
Fan Zhang
517daf43a4
Fix settings robotest
...
am: 4e34839a1e
2017-06-30 03:49:57 +00:00
Fan Zhang
4e34839a1e
Fix settings robotest
...
Change-Id: I0685b1f47ae286a4fdf78a57c21f7a656804754f
Fix: 63146944
Test: robotest
2017-06-30 01:27:20 +00:00
Sundeep Ghuman
0a1003a8df
Merge "Don't scroll when removing saved networks." into oc-dr1-dev am: 1e561edb45
...
am: b963c1190f
2017-06-30 00:12:41 +00:00
Sundeep Ghuman
b963c1190f
Merge "Don't scroll when removing saved networks." into oc-dr1-dev
...
am: 1e561edb45
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
Andrew Sapperstein
b2c69878d1
Merge "Fix robotests." into oc-dr1-dev am: db72caf3ea
...
am: 8e1c3b9b1b
2017-06-29 23:42:57 +00:00
Andrew Sapperstein
8e1c3b9b1b
Merge "Fix robotests." into oc-dr1-dev
...
am: db72caf3ea
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
Fan Zhang
2b3ce72787
Merge "Change the way we generate stable id for DashboardSummary"
2017-06-29 23:21:44 +00:00
Lei Yu
6f19d968bf
Merge "Update strings for anomaly dialog" into oc-dr1-dev am: 2354fae941
...
am: 34c96fff5c
2017-06-29 22:17:33 +00:00
Lei Yu
34c96fff5c
Merge "Update strings for anomaly dialog" into oc-dr1-dev
...
am: 2354fae941
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
Fan Zhang
a29346bab8
Change the way we generate stable id for DashboardSummary
...
- The countItem() method generates id based on position of Tile. This is
not truely stable.
- Added stable id constants for static views, and use hash of title as
stable id for tiles.
Bug: 33861822
Test: robotests
Change-Id: Ibbc88c82655503dc3964cb0c430c779dc9c93d41
2017-06-29 14:21:43 -07:00
Shunta Sato
6d1bb15f3b
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev am: 9638e020e5
...
am: 97419f8d52
2017-06-29 20:42:16 +00:00
Shunta Sato
97419f8d52
Merge "Fix Wi-Fi list adds same AP repeatedly" into oc-dr1-dev
...
am: 9638e020e5
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
Doris Ling
9d7280c43d
Merge "Add account sync summary." into oc-dr1-dev am: 5243d5dd85
...
am: cf57e17791
2017-06-29 19:05:56 +00:00
Doris Ling
cf57e17791
Merge "Add account sync summary." into oc-dr1-dev
...
am: 5243d5dd85
2017-06-29 19:02:29 +00:00
TreeHugger Robot
5243d5dd85
Merge "Add account sync summary." into oc-dr1-dev
2017-06-29 18:58:58 +00:00
jackqdyulei
82b7f4ae04
Merge "Change the type of "hours" from long to double" into oc-dr1-dev am: 1498e86530
...
am: 595def292b
2017-06-29 18:46:28 +00:00
jackqdyulei
595def292b
Merge "Change the type of "hours" from long to double" into oc-dr1-dev
...
am: 1498e86530
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
TreeHugger Robot
b5ef73ebcb
Merge "Add ordering attribute to sound setting preferences."
2017-06-29 17:12:36 +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
2a800052ad
Merge "Use proper title for support page." into oc-dr1-dev am: 05872fc1c7
...
am: 115f0603eb
2017-06-29 16:49:31 +00:00
Andrew Sapperstein
115f0603eb
Merge "Use proper title for support page." into oc-dr1-dev
...
am: 05872fc1c7
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
cc7adfd9e0
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am: 63c63ff640
...
am: 301dfdd8d1
2017-06-29 04:52:32 +00:00
Andrew Sapperstein
301dfdd8d1
Merge "Reduce number of wallpaper results in search." into oc-dr1-dev
...
am: 63c63ff640
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
21bd3994c4
Merge "Read theme for lock screen flows" into oc-dr1-dev am: 864d5c96d7
...
am: d3d1210fad
2017-06-29 02:07:19 +00:00
Maurice Lam
d3d1210fad
Merge "Read theme for lock screen flows" into oc-dr1-dev
...
am: 864d5c96d7
2017-06-29 02:00:33 +00:00
TreeHugger Robot
4ef813efdc
Merge "Disable SmartSuggestion conditionally"
2017-06-29 01:55:52 +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
0e852e4113
Merge "Add metric action log for anomaly action" into oc-dr1-dev am: 43afb664e6
...
am: b58333f46e
2017-06-29 01:19:16 +00:00
jackqdyulei
b58333f46e
Merge "Add metric action log for anomaly action" into oc-dr1-dev
...
am: 43afb664e6
2017-06-29 01:15:33 +00:00
Doris Ling
bcd2322fa6
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev am: 9df70249b9
...
am: 5d66fa4c94
2017-06-29 01:15:23 +00:00
Fan Zhang
2e72dda1aa
Add ordering attribute to sound setting preferences.
...
The ordering helps injected settings show up before work profile
settings.
Change-Id: Id840b721fc3ef82f53591a16b385965f7a719b67
Fix: 62997256
Test: visual
2017-06-28 18:14:18 -07:00
Doris Ling
5d66fa4c94
Merge "Change to use new suggestion/condition UI." into oc-dr1-dev
...
am: 9df70249b9
2017-06-29 01:11:57 +00:00
TreeHugger Robot
2d6930b2df
Merge "Add account sync summary."
2017-06-29 01:11:43 +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
985aa11e1a
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev am: 33c9b7a111
...
am: 9d57855c96
2017-06-29 00:53:14 +00:00
jackqdyulei
9d57855c96
Merge "Fix the getForegroundActivityTotalTimeMs" into oc-dr1-dev
...
am: 33c9b7a111
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
