Commit Graph

40453 Commits

Author SHA1 Message Date
Matthew Fritze
80e54df833 Move the indexing back into DatabaseIndexingManager
For the sake of incremental updates, we moved all of the
conversion from PreIndexData to IndexData, and the
insertion of the rows into the SQLite DB into a new class,
IndexDataConverter. However, it's real role is just to
convert PreIndexData into IndexData.

So this CL moves the insertion of the rows back into
DatabaseIndexingManager.

Again, for the sake of simplicity, I did not change the
conversion flow. Rather, instead of inserting a row at the
end of the conversion, I just put it into a list which is
then returned. This lets me move the tests to appropriate
locations, without having to change them too much.

In the tests, the references to real xml layouts are
changed to fake references. Hooray for being less brittle.
IndexDataConverter now just tests that the IndexData
has the appropriate data from PreIndexdData.

Independently, we test that IndexData gets inserted in
DatabaseIndexingManager.

In the next CL, I'll refactor the conversion
flow for readability.

Bug: 33577327
Test: make RunSettingsRoboTests
Test: Took a database dump before and after change,
      and they were the same. Cool.

Change-Id: I39cc812d1f736e13a0a51af50984c239961ecf7a
2017-09-25 16:48:22 -07:00
jeffreyhuang
914d9fa55e Introduce WifiRoamScansPreferenceController
- Create new WifiRoamScansPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I967944e8d22d985035c94874d13e02c3f5e70781
2017-09-25 16:43:55 -07:00
Jeffrey Huang
07aba19287 Merge "Introduce WifiDisplayCertPreferenceController" 2017-09-25 22:31:22 +00:00
Jeffrey Huang
ae51e78998 Merge "Introduce CameraLaserSensorPreferenceControllerV2" 2017-09-25 21:24:21 +00:00
jeffreyhuang
d61c360385 Introduce WifiDisplayCertPreferenceController
- Create new WifiDisplayCertificationPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I34688131054e1a9d660482b04ad4b792235c445a
2017-09-25 13:55:28 -07:00
jeffreyhuang
c215b3c4e9 Introduce CameraLaserSensorPreferenceControllerV2
- Create new CameraLaserSensorPreferenceControllerV2
 - Copy logic from CameraLaserSensorPreferenceController with slight
 modifications for dashboard fragment compatibility
 - Deprecate CameraLaserSensorPreferenceController

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8854d3e891afab607025a427a376e33e9b61dcc3
2017-09-25 12:42:47 -07:00
Jeffrey Huang
8ac9352b02 Merge "Introduce DisableAutoUpdatesPreferenceController" 2017-09-25 19:19:38 +00:00
Rajeev Kumar
298ffee39e Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
This preference is not needed for Data plan settings page. This change
fixes the NPE which happens because we try to remove a preference which
is not added to the settings preference fragment.
Test: make RunSettingsRoboTests -j40
Bug: 64068792

Change-Id: Ibbcf1637b8aed1a94542ea3786170f2f318df4a9
2017-09-25 11:34:10 -07:00
Adrian Roos
c1b9a8e538 Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev am: eafcc98ab8
am: fce69dbb56

Change-Id: I43cef01451f2dead8a2a0a6abf745daa2f2090bb
2017-09-25 11:19:04 +00:00
Adrian Roos
fce69dbb56 Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev
am: eafcc98ab8

Change-Id: I3da818a64d47a397c2380cbd0ae36a714612d8f0
2017-09-25 11:17:22 +00:00
TreeHugger Robot
eafcc98ab8 Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev 2017-09-25 11:11:53 +00:00
Colin Cross
6be287a209 Remove unnecessary core-oj library
core-oj is part of the default java libraries and should not be
explicitly included by a package.

Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
2017-09-23 22:09:31 -07:00
Ng Zhi An
15b71d0305 Merge "Reflect device encryption status" into oc-mr1-dev am: 3de3cf85f4
am: 7c94fcc9bc

Change-Id: I44690e80e84d9de842d04bb349581cbfb2a3c808
2017-09-23 00:34:05 +00:00
Ng Zhi An
7c94fcc9bc Merge "Reflect device encryption status" into oc-mr1-dev
am: 3de3cf85f4

Change-Id: I0c64feb4eaa3b675cf0e6269279da04fe220f323
2017-09-23 00:32:05 +00:00
TreeHugger Robot
3de3cf85f4 Merge "Reflect device encryption status" into oc-mr1-dev 2017-09-23 00:28:27 +00:00
Doris Ling
8d4aa3f9b3 Merge "Put code that updates the access points lists inside a Handler." 2017-09-22 22:39:24 +00:00
jeffreyhuang
6177d91efe Introduce DisableAutoUpdatesPreferenceController
- Create new DisableAutomaticUpdatesPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Iae7ff3f7d2e296968c67e14c33089b3b42c4912a
2017-09-22 14:57:38 -07:00
Winson Chung
4466843b80 Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev am: 625b1dd13a
am: 078d01c8c1  -s ours

Change-Id: I1e35d654d43011911b9fb92d15e78ccd04b6eb0b
2017-09-22 21:45:46 +00:00
Winson Chung
078d01c8c1 Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
am: 625b1dd13a

Change-Id: I5904804d9407a279de508fc8e071bc4132856545
2017-09-22 20:43:39 +00:00
Jeffrey Huang
ce7721625d Merge "Introduce CoolColorTemperaturePreferenceController" 2017-09-22 20:38:40 +00:00
Winson Chung
625b1dd13a Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev 2017-09-22 20:30:28 +00:00
TreeHugger Robot
c66e81fcbf Merge "Import translations. DO NOT MERGE" 2017-09-22 18:50:48 +00:00
Alison Cichowlas
f4a0f80677 Notification importance/selected sound conflict fixes. am: ad1158169c
am: 6c76550a73  -s ours

Change-Id: Iddd56dc48cdd6fbe7883aa29a17cba89000cd4c2
2017-09-22 18:44:07 +00:00
Alison Cichowlas
6c76550a73 Notification importance/selected sound conflict fixes.
am: ad1158169c

Change-Id: I7b921e8845bcd549790318cc074838a24fe22182
2017-09-22 18:23:34 +00:00
Tony Mantler
76cbd4b3b2 Make ApplicationsState.Session lifecycle-aware
Bug: 66682989
Test: RunSettingsRoboTests
Change-Id: Idf56788fcae22639b7bf604a8c73cd5f0ff2da16
2017-09-22 11:23:17 -07:00
Jeffrey Huang
e8ac23d93f Merge "Introduce DebugViewAttributesPreferenceController" 2017-09-22 17:02:44 +00:00
Jeffrey Huang
1257b7bcec Merge "Introduce LocalTerminalPreferenceController" 2017-09-22 17:01:41 +00:00
TreeHugger Robot
0660d19629 Merge "Let SuggestionFeatureProvider manage SuggestionService name" 2017-09-22 16:55:08 +00:00
Ng Zhi An
f0c0320c82 Reflect device encryption status
On the Settings & Location settings page, the
encryption_and_credential preference will statically show
"Phone encrypted" regardless of encryption status of phone.

This change changes Settings to check for encryption status
of the phone and update the summary as required.
This requires adding a string saying that the device is not encrypted.
And translations will have to happen after this is merged.

Change-Id: I2f5bd281d8f1ed32801446fcdd453ebbaa04bd32
Bug: 65535239
Fixes: 65535239
Test: manual, I had a gobo phone that was not encrypted,
made sure that it said "Phone not encrypted", then tap through
to encrypt phone, and then check that it is now "Phone encrypted".
2017-09-22 09:48:43 -07:00
Alison Cichowlas
ad1158169c Notification importance/selected sound conflict fixes.
- When you've selected "Silent" as your sound, update notification
importance messaging to match.
- When you explicitly move from a silent type of notifications to a
loud type, but have "Silent" selected as the sound, change the
sound to the default notification sound also.

Change-Id: I462785d593e1d6c7d1e87388aeee1bdcbcf6aa3d
Fixes: 63109928
Test: RunSettingsRoboTests, manual
2017-09-22 10:55:27 -04:00
Alison Cichowlas
5bfead753f Merge "Notification importance/selected sound conflict fixes." 2017-09-22 12:47:49 +00:00
Adrian Roos
d5e3c38bbe FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme
Change-Id: I152a777b60ac6bfb4c8e1399e31cc0d4b2ab9758
Fixes: 65408626
Test: manual
2017-09-22 13:28:54 +02:00
Ng Zhi An
2d6ca03364 Fix icon for sim card in settings am: 097f4184fa
am: a81e3e3c8e

Change-Id: I955a71c8cf520f4e90f71271eb0245bf329f13a1
2017-09-22 06:37:24 +00:00
Ng Zhi An
a81e3e3c8e Fix icon for sim card in settings
am: 097f4184fa

Change-Id: Ifdd84f460091d4d9e3310e70c31199c29320ecd6
2017-09-22 06:35:24 +00:00
Fan Zhang
6598a7b4cd Let SuggestionFeatureProvider manage SuggestionService name
Bug: 65065268
Test: robotests
Change-Id: I82315a7b1565dc34b516bf685ad8e831a1e28591
2017-09-21 18:25:40 -07:00
jeffreyhuang
af7737c15c Introduce DebugViewAttributesPreferenceController
- Create new DebugViewAttributesPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ida84c187f2670a601aaf1ff2f141807b28ec081c
2017-09-21 17:02:29 -07:00
jeffreyhuang
2ebb0dd1d6 Introduce LocalTerminalPreferenceController
- Create new LocalTerminalPreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ib4a375181af9367a4aef74fd9889de2de1c8652d
2017-09-21 16:23:04 -07:00
TreeHugger Robot
d0b1297e84 Merge "Fixing issue with PiP settings not showing apps for other profiles." 2017-09-21 23:08:48 +00:00
Ng Zhi An
097f4184fa Fix icon for sim card in settings
Change-Id: I1e235cad1712343e2990eab114fd2ef383aac77f
Bug: 65574460
Fixes: 65574460
Test: manually build and install Settings apk and open app to check
2017-09-21 15:20:36 -07:00
Alison Cichowlas
bff0e971ca Notification importance/selected sound conflict fixes.
- When you've selected "Silent" as your sound, update notification
importance messaging to match.
- When you explicitly move from a silent type of notifications to a
loud type, but have "Silent" selected as the sound, change the
sound to the default notification sound also.

Change-Id: I462785d593e1d6c7d1e87388aeee1bdcbcf6aa3d
Fixes: 63109928
Test: RunSettingsRoboTests, manual
2017-09-21 17:36:32 -04:00
Jeffrey Huang
b9a1f1a563 Merge "Introduce PictureColorModePreferenceController" 2017-09-21 21:07:29 +00:00
TreeHugger Robot
ab74ca143a Merge "Fix pattern header string usage" 2017-09-21 20:18:06 +00:00
Doris Ling
744ff5c607 Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c am: c13415391b
am: 913d1667ce

Change-Id: Ib859bec6cd9ca1422856d091fc7a0b9894397b04
2017-09-21 19:31:54 +00:00
Doris Ling
913d1667ce Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c
am: c13415391b

Change-Id: I8e5050b2b4c5884b93ef56155f50d1fffcc13579
2017-09-21 19:29:53 +00:00
Doris Ling
c13415391b Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0
am: 296c46404c

Change-Id: I38483ed934187e185efc6a2e38ddde7cef0c4e8f
2017-09-21 19:27:20 +00:00
Doris Ling
296c46404c Merge "Fix NPE crash in UsageAccessDetails"
am: cd959f28a0

Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
2017-09-21 19:24:52 +00:00
jeffreyhuang
6162fa5ef8 Introduce PictureColorModePreferenceController
- Create new PictureColorModePreferenceController
 - Create controller inside the DashboardFragment
 - Refactor ColorModePreference so isAvailable() no longer depends on
 ColorModePreference
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I8dff5b0d5ad1d7f043fc7ead540b2c0c960933e3
2017-09-21 12:24:32 -07:00
Doris Ling
cd959f28a0 Merge "Fix NPE crash in UsageAccessDetails" 2017-09-21 19:21:03 +00:00
Maurice Lam
1fb3ce01d0 Fix pattern header string usage
Test: Builds with ag/2933970 cherry-picked on top
Bug: 66446463
Change-Id: I0c649427474cd9b1cf388f45407deea582d01c9a
2017-09-21 18:41:14 +00:00
Bill Yi
5733267b15 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 17acd3d1c8 -s ours
am: d516ba6a80  -s ours

Change-Id: I97a4c786fb415114d96035896128e874402676a1
2017-09-21 17:57:41 +00:00