Commit Graph

31945 Commits

Author SHA1 Message Date
Bill Yi
9f8644c04f Import translations. DO NOT MERGE
am: 64d3e22e11  -s ours

Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948
2016-10-11 15:03:11 +00:00
Fan Zhang
66b573ad5a Add display settings dashboard to new IA.
- Added a activity-alias pointing to displaySettings as top level
  setting item.
- Refactored all preference logic in DisplaySettings into
  PreferenceControllers. During fragment onAttach it installs all
  controllers, and during onResume it updates preference state. Each
  controller listens to its own preference change event.

Bug: 31800242
Test: RunSettingsRoboTests
Change-Id: Ibc9bf200c5acce7c4ae9292340822afee27a3a28
2016-10-10 18:26:29 -07:00
TreeHugger Robot
36a6cb0370 Merge "Refactor SummaryLoader to set summary on subsetting pages." 2016-10-10 22:03:36 +00:00
Bill Yi
64d3e22e11 Import translations. DO NOT MERGE
Change-Id: I5616dbd321f70984c0386fd5b2e48f608ede25cb
Auto-generated-cl: translation import
2016-10-10 12:39:26 -07:00
Bill Yi
6acf691f62 Import translations. DO NOT MERGE
Change-Id: Ic1133c6ddf9e2230e189751a04c58b953ef2b4c5
Auto-generated-cl: translation import
2016-10-10 12:31:59 -07:00
Bill Yi
90427c6c0a Import translations. DO NOT MERGE
Change-Id: Id7b4a0335fdc650c0799b540b4fcf6b29f00850c
Auto-generated-cl: translation import
2016-10-10 12:17:24 -07:00
Fan Zhang
fabbfb435e Refactor SummaryLoader to set summary on subsetting pages.
- Make a SummaryConsumer interface. Things that needs latest summary
  should implement this interface (DashboardAdapter for homepage,
  DashboardFragment for subsettings). This also decouples SummaryLoader
  from relying on SettingsDrawerActivity.
- Make DashboardFeatureProvider more generic to load DashboardCategory
  by key.

Bug: 31781480
Test: RunSettingsRoboTests
Change-Id: I9c65456fb433a74c352498251e0ccf65da0be1f0
2016-10-07 14:52:06 -07:00
Salvador Martinez
ccbdd0a707 Fixed spans getting stripped from disclaimer am: e0b74a6de0 am: e3c31f3aec
am: 05a98e79f5

Change-Id: I279044936bb9214b84409d5674f2ba7dbb136f9a
2016-10-07 21:27:27 +00:00
Salvador Martinez
05a98e79f5 Fixed spans getting stripped from disclaimer am: e0b74a6de0
am: e3c31f3aec

Change-Id: Ia05205f27bdaccd7f08e311ef0c24a0af1776f64
2016-10-07 21:08:47 +00:00
Salvador Martinez
e3c31f3aec Fixed spans getting stripped from disclaimer
am: e0b74a6de0

Change-Id: I5b668306d5e6221f47903179b58ce9b227d6a940
2016-10-07 21:04:16 +00:00
TreeHugger Robot
e87af45f41 Merge "Fixed spans getting stripped from disclaimer" 2016-10-07 20:55:28 +00:00
TreeHugger Robot
ce6affc371 Merge "Refactor DashboardFragment." 2016-10-07 20:37:47 +00:00
Salvador Martinez
e0b74a6de0 Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.

Test: Instrumentation Test
Bug: 31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
2016-10-07 19:30:01 +00:00
Salvador Martinez
896c870b09 Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.

Test: Instrumentation Test
Bug: 31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
2016-10-07 19:08:57 +00:00
Fan Zhang
36924659f5 Refactor DashboardFragment.
Merged refreshAllPreferences into DashboardFragment. This hopefully
makes it more modular to manage preference display logic in each
dashboardFragment, and makes it more efficient to monitor category
changes.

Now subclasses needs to implement 2 methods:
- displayResourceTiles(): for 'static' preferences from xml
- getDashboardTiles(): returns a list of dashboard tiles and superclass
  will wire it up to preference screen.

If getDashboardTiles() return null (aka no dashboardCategory available),
the fragment will not attempt to monitor category change. The edge case
is that if a package starts to provide a tile for this category, we will
not be notified. I have not seen this case coming up. If we indeed need
to handle this case, the category listener needs to have a way to
monitor specific category rather than globally.

Bug: 31781480
Test: make RunSettingsRoboTests -j40
Change-Id: Ia9f9541b95816214df0d0bb27e3e41078c36c5ca
2016-10-07 11:55:43 -07:00
Matthew Fritze
ae181aeac1 Merge "The center column of the support tab is back to white" into nyc-mr1-dev am: 9f95a59b88 am: d983045488
am: d4abdb67d3

Change-Id: I5b3c5c9f0bd542f00af359dbf1ea2c8158ace8f8
2016-10-07 18:26:11 +00:00
Matthew Fritze
6d24cd89ca The center column of the support tab is back to white am: 2d07290453 am: 409714d0e4
am: a70964091a

Change-Id: Ic9ae4d2fd08f9a840d3a2431d6ab4292258df873
2016-10-07 18:25:54 +00:00
Salvador Martinez
7baa08b8d1 Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am: 8a468ccbdf am: 17866f0b17
am: 0967f79ce0

Change-Id: I555f0b2911e995e417af078d275b062fae1f6efa
2016-10-07 18:25:34 +00:00
Salvador Martinez
062358f8ad Added onClick logic for domain url list screen am: 26e5760033 am: 1d383e1220
am: 6a832d4db6

Change-Id: I15c67361c870f846641dbc1b96d1f8701af54301
2016-10-07 18:25:15 +00:00
Bill Yi
6bede85d06 Import translations. DO NOT MERGE am: a6b32526d7 -s ours am: f6a7a97ab5 -s ours
am: 1e7f5e9dd7  -s ours

Change-Id: I9461da3a3a36f7e9845251cc3c44908281a8edbb
2016-10-07 18:24:58 +00:00
Fan Zhang
79ff72adc8 Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc am: 207bb2947e
am: 6b72c17434

Change-Id: I8ab6ad5ace2b737bfb9e68cc350aa45dbc836d01
2016-10-07 18:24:41 +00:00
Fan Zhang
9f9e42d0f9 Fix a NPE in confirm lock screen. am: 8b2baed2be am: da856402f4
am: ac053b6179

Change-Id: I40cca984f15ff6a3ffb193d53e47d46ddc393274
2016-10-07 18:24:24 +00:00
Jeff Sharkey
2360dfa2ff Switch to static warning threshold when adopting. am: bd7adb9313 am: da414d0afe
am: 049d2b88f6

Change-Id: Ie30f3242174699a2e8ad08c311e9993da4187e6f
2016-10-07 18:24:07 +00:00
Jonathan Nieder
1de59a63af Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am: 6cab381bc2 am: 64136f30d1
am: 27615e6b49

Change-Id: Ic3cd78dadd1eb0687b6080d59f2c05dd83662e6e
2016-10-07 18:15:48 +00:00
Doris Ling
c037ed5bdb Add condition check for double tap gesture settings. am: c8b7555fc9 am: 7f62890cad
am: a5eb66eb01

Change-Id: I0d56e0b1e3b25bd589fcfd4ba2301d51369f217e
2016-10-07 18:15:40 +00:00
Matthew Fritze
dc9088c311 Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381 am: 62fcf9369f
am: dabb84876b

Change-Id: I01551ebecdee7b029d62bd76b833d062ccfdfb40
2016-10-07 18:15:09 +00:00
Matthew Fritze
4443a2e7bb Fix bug preventing users from clicking settings suggestions twice am: f265dbc447 am: e5e60eccaf
am: 5b509e12ff

Change-Id: Iab38544e2e6fa2cb500fbbdc997dacd9dc611198
2016-10-07 18:14:51 +00:00
Jeff Sharkey
673250bcb1 Give CTS the handle it expects to remove PIN. am: 7be1b5923f am: 4ae8eb2aae
am: 2eda02e617

Change-Id: If61a3086f49151db5c46fbc19dbe70b816de2e13
2016-10-07 18:00:48 +00:00
Lei Yu
36d2a62930 Merge "Adjustments based on the changes in ZoneGetter(settingslib)" 2016-10-07 17:34:22 +00:00
Bill Yi
cb054fff54 Import translations. DO NOT MERGE am: 972c78b4ee -s ours am: e87f2bbaa0 -s ours am: 784b1cbf35 -s ours
am: 4b9f135da5  -s ours

Change-Id: If4bc2da9b0ec543fed1ec0f75362f311a6775623
2016-10-07 15:06:16 +00:00
Lei Yu
6cbfb84836 Merge "Add "FILTER_NOT_HIDE" for all app filters." into nyc-mr1-dev am: 9c54a67d66 am: d7f2c10f94
am: efaf3b502f

Change-Id: I79a7bd27ff6c6e7109b1f0a6cb03992b73135436
2016-10-07 15:05:50 +00:00
jackqdyulei
32b01bffdd Add "FILTER_NOT_HIDE" for all app filters. am: d785a8db78 am: 00ed827516
am: 15c14f0cc2

Change-Id: I2322d0d3e496013cfb02444b2224fab1eecb47b9
2016-10-07 15:02:47 +00:00
TreeHugger Robot
fbe72822b4 Merge "Remove old unused activity." 2016-10-07 02:54:30 +00:00
Bill Yi
65629f36c0 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: f91ca6bcd9 -s ours am: f0be222981 -s ours
am: 4d6ff7e669  -s ours

Change-Id: Ifc72d70787d079c2e53d5ec7a39d4da4163b2a5d
2016-10-07 01:28:19 +00:00
Bill Yi
88b083f02e Import translations. DO NOT MERGE am: 8aee525418 -s ours am: 47f6271d15 -s ours
am: b30d988a1c  -s ours

Change-Id: I430a63f2b012f187ce9a0efe6b9f97182a5af8cb
2016-10-07 01:28:05 +00:00
Lorenzo Colitti
8e4f0035c1 Merge "resolve merge conflicts of f2801e4 to nyc-mr1-dev" into nyc-mr1-dev am: 365d95b69a am: bb529c267d
am: 03cbc81f32

Change-Id: I7ae22e05a1f58b396f4543a68a73c8b209ec14b4
2016-10-07 01:27:53 +00:00
Lorenzo Colitti
5a63070109 resolve merge conflicts of f2801e4 to nyc-mr1-dev am: b01c080b08 am: be3924c1b6
am: 54ec71200b

Change-Id: Iec5773ff618a7148c867ce79b85196d4152c43df
2016-10-07 01:27:38 +00:00
Matthew Fritze
9fa8e96b6f Prevent monkey tests from crashing with race conditions am: 7ac78f2daf am: 9264154bee
am: 927007dd53

Change-Id: I74f45c284e8cde00af46562fb0903a856ea05de4
2016-10-07 01:27:24 +00:00
Bill Yi
1943100912 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 0d424ef9bd -s ours am: ffae7d82c3 -s ours
am: c8ef13d120  -s ours

Change-Id: Ic0c4a0ba5246c2cff4db7064d1ca4ff5f3bbf89e
2016-10-07 01:27:08 +00:00
Bill Yi
02c28ed262 Import translations. DO NOT MERGE am: ae33f8e62c -s ours am: b1f3f659f1 -s ours
am: 5fb2b6c1c5  -s ours

Change-Id: I5260308dca7fe09bde379cf57f2378fef3693a71
2016-10-07 01:26:52 +00:00
Philip P. Moltmann
b2d459b970 Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367 am: ae23c07073
am: 96d81b1332

Change-Id: I9469b566e8682162271992f3175c5153c4668614
2016-10-07 01:26:36 +00:00
Philip P. Moltmann
e98d7e074d USB restriction is similar to media restriction am: 13ee50be48 am: a78fced068
am: 58154e8c27

Change-Id: Ic59c247b316a26640bda84b82c001254e01abe74
2016-10-07 00:35:19 +00:00
Fan Zhang
d56ad9dc61 Remove old unused activity.
Test: compiles
Change-Id: Ida7e9ac0646e60a6cb91fc30b00b9c09f5fe3a8d
2016-10-06 17:03:37 -07:00
Matthew Fritze
d4abdb67d3 Merge "The center column of the support tab is back to white" into nyc-mr1-dev am: 9f95a59b88
am: d983045488

Change-Id: I67fd24b1e7647f0216983d5a16f868c16a90cadc
2016-10-06 22:53:47 +00:00
Matthew Fritze
a70964091a The center column of the support tab is back to white am: 2d07290453
am: 409714d0e4

Change-Id: I6af46ec8fdba17edbb2716704e903c7aedb7d456
2016-10-06 22:53:33 +00:00
Matthew Fritze
d983045488 Merge "The center column of the support tab is back to white" into nyc-mr1-dev
am: 9f95a59b88

Change-Id: Ic7948520f75b0b8024d9239a87734ae6fa003705
2016-10-06 22:49:58 +00:00
Matthew Fritze
409714d0e4 The center column of the support tab is back to white
am: 2d07290453

Change-Id: I14bb5ca55ed267b3144a091e5b0bc636aeaaaa1e
2016-10-06 22:49:56 +00:00
Salvador Martinez
0967f79ce0 Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am: 8a468ccbdf
am: 17866f0b17

Change-Id: Icc7ae5e2d553a2ef9ad8d568b0e2d90a393256b1
2016-10-06 22:46:46 +00:00
Salvador Martinez
6a832d4db6 Added onClick logic for domain url list screen am: 26e5760033
am: 1d383e1220

Change-Id: Ib1e58b680a866dea0b4ac398215d94f6c636f1cc
2016-10-06 22:46:32 +00:00
Matthew Fritze
9f95a59b88 Merge "The center column of the support tab is back to white" into nyc-mr1-dev 2016-10-06 22:43:28 +00:00