Commit Graph

19117 Commits

Author SHA1 Message Date
Andrew Sapperstein
0f13525842 Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev
am: 3daceaec5f

Change-Id: Iabce075585a4cca4c0876999f6b9e9f031fe2c10
2017-08-02 06:07:23 +00:00
TreeHugger Robot
3daceaec5f Merge "Refactoring DoubleTwistPreferenceController." into oc-dr1-dev 2017-08-02 06:02:29 +00:00
Fan Zhang
2fa45c92e6 Delete unused classes
Change-Id: I014136b02ffc7f4d10ac450c9583b883c84d22a1
Fix: 32700131
Test: rerun robotest
2017-08-01 17:59:34 -07:00
Daniel Nishi
93d95b515b Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55 am: db1158f855
am: 85cd1b7d39

Change-Id: I6721eddb38547d8b7c2bc7513b1ea40c81a89cc8
2017-08-01 23:44:16 +00:00
TreeHugger Robot
c7e7f28e88 Merge "Convert more pages to use ActionButtonPreference" 2017-08-01 23:40:59 +00:00
Daniel Nishi
85cd1b7d39 Merge "Make nfc toggability logic static and public." into oc-dr1-dev am: b27d65fa55
am: db1158f855

Change-Id: I39a83eff9705f8ed5e66a4ea4aeada9f262d12aa
2017-08-01 23:27:41 +00:00
Fan Zhang
26a1deffe6 Support dynamic summary and icon for injected tiles
Bug: 63758074
Test: robotests
Change-Id: I2fa27812800c12606a613896ea2aa69dda393944
2017-08-01 16:19:37 -07:00
Daniel Nishi
ea39f74a42 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Id09171357fb772cc05ec668eafa10e5320cefeb5
2017-08-01 23:18:58 +00:00
Daniel Nishi
db1158f855 Merge "Make nfc toggability logic static and public." into oc-dr1-dev
am: b27d65fa55

Change-Id: Ie3f854c21d7a099095202a9005cea6a8aec670c2
2017-08-01 23:18:57 +00:00
Fan Zhang
defb1183ec Remove code for old wifi tether feature
Change-Id: If92798ddf075801e66cd97ecacff2f8df1e41985
Fix: 64032458
Test: rerun robotests
2017-08-01 16:18:24 -07:00
Daniel Nishi
b27d65fa55 Merge "Make nfc toggability logic static and public." into oc-dr1-dev 2017-08-01 23:11:18 +00:00
Fan Zhang
ac06e1eeae Convert app storage page to use generic ActionButtonPref
Change-Id: I2154bbbc5c78fe313b22f1d66229d6da7586279f
Fix: 63991885
Test: robotests
2017-08-01 15:51:33 -07:00
Fan Zhang
1105a1a465 Convert more pages to use ActionButtonPreference
- text to speech page
- blue tooth detail page
- installed app page

Change-Id: Ib743a144cc6025055cd496ec077f13fce4db0c69
Bug: 63991885
Test: robotests
2017-08-01 14:27:42 -07:00
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
Salvador Martinez
6db99201aa Merge "Shorten main settings battery string" into oc-mr1-dev
am: 4e963f8f91

Change-Id: I00e0b8126679815d460336d1cc2b01fc5abf55bd
2017-08-01 20:01:13 +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
Fan Zhang
bbd92b5748 Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev
am: 7fbfda67da

Change-Id: Idac94b7754631c7bb0c0f91e8aa17b9d300b6c30
2017-08-01 19:24:23 +00:00
TreeHugger Robot
7fbfda67da Merge "Disable AssistGestureSetting search if not supported" into oc-mr1-dev 2017-08-01 19:09:31 +00: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
54ed30e735 Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev am: 21b22f0154
am: 8c0d24cb6d

Change-Id: I1e020f900c7d0ad91821a26d424b361efad45ff1
2017-08-01 01:13:22 +00:00
Matthew Fritze
8c0d24cb6d Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev
am: 21b22f0154

Change-Id: I9f203d14386598c0cb9c3264350564d75280e9a7
2017-08-01 01:01:35 +00:00
Matthew Fritze
21b22f0154 Merge "Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"" into oc-mr1-dev 2017-08-01 00:59:44 +00:00
Matthew Fritze
fdbf4f057b Revert "resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev"
This reverts commit a504291eef.

Reason for revert: <Build breaking>

Change-Id: I5da4f902d2fbcaffa44761b3f6ed8820ddb927bf
2017-08-01 00:51:34 +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
Fan Zhang
1f62645592 Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev
am: 5e9b138691

Change-Id: Ie4577a62d3bd9219dd80cd22857b2eccdd9b410f
2017-08-01 00:41:26 +00:00
Matthew Fritze
68ae06ab17 resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev am: a504291eef
am: 44a17e6c51

Change-Id: I59261466d74d408e75c935045984b979a4be9362
2017-08-01 00:39:55 +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
Matthew Fritze
5d4a45da39 Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp
am: 7907bd215d

Change-Id: Ida01ce711fb56538558eb7314bb50d0ece122849
2017-08-01 00:35:36 +00:00
Matthew Fritze
44a17e6c51 resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev
am: a504291eef

Change-Id: Ia3de4132ddd615ee5f148d1871f170cb36023eda
2017-08-01 00:35:20 +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
Matthew Fritze
7907bd215d Merge "resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp 2017-08-01 00:28:57 +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
Matthew Fritze
57b641eee8 resolve merge conflicts of a03a707f74 to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icca7a8cc2632b35c54421cb8398c8deb4e670032
2017-07-31 17:24:17 -07:00