Andrew Sapperstein
9c9549bd29
Refactoring DoubleTwistPreferenceController.
...
Made the availability and setting logic static so that
it can be invoked without creating a controller.
Bug: 62022517
Test: robotests
Change-Id: I3a51c61849e6ba8b8aa850ca22d666a9f84d252f
2017-08-01 13:56:51 -07:00
Salvador Martinez
fec50f4248
Merge "Shorten main settings battery string" into oc-mr1-dev am: 4e963f8f91
...
am: 6db99201aa
Change-Id: I82bf5cfe72cfd8ec774c6c7d21c17bd946163903
2017-08-01 20:15:41 +00:00
Fan Zhang
16e0ef2b7d
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev am: 7fbfda67da
...
am: bbd92b5748
Change-Id: I15a40bcae625d5bacb0217c0a5f8ea16862e2fc4
2017-08-01 19:46:36 +00:00
TreeHugger Robot
4e963f8f91
Merge "Shorten main settings battery string" into oc-mr1-dev
2017-08-01 19:45:59 +00:00
TreeHugger Robot
7fbfda67da
Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
2017-08-01 19:09:31 +00:00
Bill Yi
0c15c622ad
Import translations. DO NOT MERGE
...
Change-Id: Ie52cecfa47dc7d0a982d8f36a12b1b024bfbfd0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:32:34 -07:00
Bill Yi
0607783046
Import translations. DO NOT MERGE
...
Change-Id: I2583b083c748943ce33715d13cf2f1c5cb9591dc
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-08-01 11:31:16 -07:00
Bill Yi
b9fa3d1115
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64073208
Change-Id: Idb323f93239f5c66ae4fb53f37bff242d5839198
2017-08-01 11:15:13 -07:00
Salvador Martinez
dcb96058ef
Shorten main settings battery string
...
This string will be too long in other languages so we're shortening
it for the main settings screen.
Test: robotests updated
Bug: 64124535
Change-Id: I5ccad99b1023f84ee72a144e07b1ea60f3fc01d5
2017-08-01 10:29:44 -07:00
Tony Mantler
c5dc1dc250
Merge changes from topics 'SystemPropPoker', 'DevSettingsPrefsFile'
...
* changes:
Refactor SystemPropPoker
Remove development settings prefs file
2017-08-01 16:12:14 +00:00
Geoffrey Pitsch
2db7b43623
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
am: 07052239fd
...
am: 5e6449b4f8
Change-Id: I2120ba6c52db5e012e3b467163594187c79664f1
2017-08-01 14:26:16 +00:00
Geoffrey Pitsch
5e6449b4f8
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev am: 6d62355313
...
am: 07052239fd
Change-Id: Id42693f5c0ba902f57c5c30a69ca19dba1d9e340
2017-08-01 14:16:59 +00:00
Geoffrey Pitsch
cf83f9dd12
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
2017-08-01 14:08:10 +00:00
Geoffrey Pitsch
07052239fd
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
...
am: 6d62355313
Change-Id: Iad2c8b60c899314b5089d28b3697f7bfed9013b3
2017-08-01 14:07:37 +00:00
Geoffrey Pitsch
6d62355313
Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
2017-08-01 14:00:18 +00:00
Jeff Davidson
03c29c8089
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
am: cebb6a4f9c
...
am: 6f95de16b5
Change-Id: I7f486df805f9b6724cf8b0f432745e8024b4ea26
2017-08-01 03:07:44 +00:00
jackqdyulei
26e7518f76
Merge "Add shadow and wrapper classes" into oc-dr1-dev
...
am: 0782535daf
Change-Id: I9f9337b3abc97652a1105c001fbe41d15b3e262d
2017-08-01 02:44:11 +00:00
TreeHugger Robot
0782535daf
Merge "Add shadow and wrapper classes" into oc-dr1-dev
2017-08-01 02:37:37 +00:00
Jeff Davidson
6f95de16b5
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev am: cd4fbd90e7
...
am: cebb6a4f9c
Change-Id: I083d1356461b78dec175a770643a1d52949f93e4
2017-08-01 02:35:01 +00:00
Jeff Davidson
cebb6a4f9c
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
...
am: cd4fbd90e7
Change-Id: I65f2baef41c86ebcc4d6f427fa806441123621f0
2017-08-01 02:32:04 +00:00
Jeff Davidson
470c87cfea
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
...
am: cd4fbd90e7
Change-Id: Id37f4182ed523bbf263d6eb6c1517bbbfabf0ca4
2017-08-01 02:32:04 +00:00
TreeHugger Robot
cd4fbd90e7
Merge "Remove eSIM reset checkbox and always perform the reset." into oc-dr1-dev
2017-08-01 02:25:02 +00:00
Matthew Fritze
9245af8ce5
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
...
am: 57992394bf
Change-Id: Ifedaad6a1a9fd628daef1d369009b3ddad2acee5
2017-08-01 00:45:29 +00:00
Fan Zhang
a0a165b71a
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev am: 5e9b138691
...
am: 1f62645592
Change-Id: I8a75ba151ca17fa2225cb5f09c6c90ac8b811bf0
2017-08-01 00:42:41 +00:00
TreeHugger Robot
5e9b138691
Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
2017-08-01 00:38:45 +00:00
TreeHugger Robot
57992394bf
Merge "Fix DataUsageSummary non-indexable keys" into oc-dr1-dev
2017-08-01 00:37:26 +00:00
Eric Schwarzenbach
7f509d341e
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev am: 5e888ad7b6
...
am: 666d70ea76
Change-Id: I110bab77af455eac81d918abd080d9cdf37cda92
2017-08-01 00:29:04 +00:00
jackqdyulei
d6084baa89
Add shadow and wrapper classes
...
These classes are used for accessibility service. Also
add a new Availablity type.
Bug: 62022517
Test: Build
Change-Id: Ia2ff72dd04fd99b17809822907746c2411cecb62
Merged-In: Ia2ff72dd04fd99b17809822907746c2411cecb62
2017-07-31 17:25:54 -07:00
TreeHugger Robot
5e888ad7b6
Merge "Make only the "Add Network" WifiDialog fullscreen." into oc-mr1-dev
2017-08-01 00:02:38 +00:00
jackqdyulei
30420ae268
Merge "Add shadow and wrapper classes" into oc-mr1-dev am: 1b2408433a
...
am: 04c28ab23c
Change-Id: If01fbb956c5171a1fe9b64794e80a8b734ca6b54
2017-07-31 23:52:47 +00:00
Matthew Fritze
334db456a6
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev am: 2972b5c992
...
am: 56f5ac21a5
Change-Id: I6c0130746d4a5dc6324ef330384cf77b7b64c18e
2017-07-31 23:52:20 +00:00
jackqdyulei
c65e873d3e
Merge "Use package from sipper if default is null" into oc-dr1-dev
...
am: ca24d0435b
Change-Id: Idfa84fd3c07b228ddc689244b7d33ca66463d25f
2017-07-31 23:49:07 +00:00
TreeHugger Robot
1b2408433a
Merge "Add shadow and wrapper classes" into oc-mr1-dev
2017-07-31 23:44:43 +00:00
TreeHugger Robot
ca24d0435b
Merge "Use package from sipper if default is null" into oc-dr1-dev
2017-07-31 23:42:49 +00:00
TreeHugger Robot
2972b5c992
Merge "Fix DataUsageSummary non-indexable keys" into oc-mr1-dev
2017-07-31 23:35:29 +00:00
Fan Zhang
eef16a8b0f
Disable AssistGestureSetting search if not supported
...
Change-Id: Id5f79506635592d98783b2b99b7ee09dd223c43c
Fixes: 64066820
Test: robotests
2017-07-31 15:46:46 -07:00
Matthew Fritze
621c24861c
Fix DataUsageSummary non-indexable keys
...
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.
Manual merge for: ag/2631595
Change-Id: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests
2017-07-31 14:20:31 -07:00
Matthew Fritze
5c6af383af
Fix DataUsageSummary non-indexable keys
...
Indexing in DataUsage was not conventional, since it
blocked adding XML based on current sim status rather than
indexing everything and changing non-indexabe keys.
Change-Id: I2097a3ac4ffd714b60299c07b29c81f246e414eb
Merged-In: I7bb3cdb0f11772bbaefb6c21c61eb63bd0b17c7e
Fixes: 64193449
Test: robotests
2017-07-31 21:18:54 +00:00
Tony Mantler
3d84d56336
Remove development settings prefs file
...
Move DevelopmentSettingsEnabler to SettingsLib
Bug: 64159590
Test: DevelopmentSettingsEnablerTest
Change-Id: Id609266019e05a3e06b4ee3bc10de9c019628a42
2017-07-31 14:01:09 -07:00
Sundeep Ghuman
45bb3a1a77
onConnectedChanged should not update access points
...
In WifiSettings, invocation of onConnectedChanged should not update
access points. This is controller by another callback,
onAccessPointsChanged. Furthermore, this is fired before any changes
have even been made to the AccessPoints.
This is exacerbating a problem where old scan results are not shown in
the WifiPicker, or sometimes the platform does not return any scan
results.
Bug: b/38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Ibbc067d9952525b4edd85389996509e9b17bb1bd
2017-07-31 13:23:02 -07:00
Alex Kulesza
b509f87040
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e
am: b76fe783e0
...
am: 5252372c15
Change-Id: I9ec7bf6f03d0c08b77db145abdbc1557beaa30aa
2017-07-31 20:22:49 +00:00
Fan Zhang
543d7f1414
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
am: 1b62cfb973" into oc-mr1-dev-plus-aosp
...
am: 6d591a3682
Change-Id: Ib7739df2540340e6ef7eea921f8833572864196d
2017-07-31 20:22:05 +00:00
jackqdyulei
7620f6555a
Merge "Merge "Create wrapper and shadow for AccessibilityManager" into oc-dr1-dev am: d6c9a8b5b2
am: 68af5f3a5d" into oc-mr1-dev-plus-aosp
...
am: d8664d6cba
Change-Id: I73affa5a3fb146ac4ddc62a96b16b54a4554b224
2017-07-31 20:20:47 +00:00
jackqdyulei
2955995268
Merge "Use package from sipper if default is null" into oc-mr1-dev am: 8be9d6519f
...
am: 6399937d47
Change-Id: I54392bce57eb20c96e51ee5270cc19d4b8d2b933
2017-07-31 20:20:20 +00:00
Alex Kulesza
5252372c15
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e
...
am: b76fe783e0
Change-Id: I1f56ef0bd997293c0f1912abc2c5fc193c060684
2017-07-31 19:33:55 +00:00
jackqdyulei
1f0f6317f6
Use package from sipper if default is null
...
The BatteryEntry need a background thread to update the
package name and icon. However in InstalledAppDetails we
don't have this thread and it is unnecessary because we
already has the package name.
This cl:
1. Use the mPackageName from InstalledAppDetails directly in
BatteryEntry
2. Double check the defaultPackageName in AdvancedPowerUsageDetail,
use packageName from sipper if default is null
Bug: 64127162
Test: RunSettingsRoboTests
Change-Id: I5d21afca17f177817976758c28ed86b3a10e95eb
Merged-In: I5d21afca17f177817976758c28ed86b3a10e95eb
2017-07-31 12:33:10 -07:00
Alex Kulesza
e9216ccbd3
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
...
am: 8fd9c28b7e
Change-Id: I47a18bcfc174e06964aaa3a7140ebcf5be12919c
2017-07-31 19:30:16 +00:00
Alex Kulesza
b76fe783e0
Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev
...
am: 8fd9c28b7e
Change-Id: I8a24c0d388524c34d19a2f1bfd0e8f53b6c9304c
2017-07-31 19:30:16 +00:00
Android Build Merger (Role)
6d591a3682
Merge "Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
am: 1b62cfb973" into oc-mr1-dev-plus-aosp
2017-07-31 19:28:45 +00:00
Fan Zhang
b43867dc5e
Merge "Remove DND and all gesture suggestions from Settings" into oc-dr1-dev am: 9064072ed7
...
am: 1b62cfb973
Change-Id: I2911fd45b056eb9ecf8f523a824878cf23747b8d
2017-07-31 19:28:28 +00:00