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
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
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
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
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
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
2016-10-07 18:24:41 +00:00
Fan Zhang
9f9e42d0f9
Fix a NPE in confirm lock screen. am: 8b2baed2be am: da856402f4
...
am: ac053b6179
2016-10-07 18:24:24 +00:00
Jeff Sharkey
2360dfa2ff
Switch to static warning threshold when adopting. am: bd7adb9313 am: da414d0afe
...
am: 049d2b88f6
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
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
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
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
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
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
Robin Lee
b6f787c4df
Show a disclaimer about enabling vpn lockdown
...
Lockdown is now the default option, not best-effort mode. It's easier
to shoot oneself in the foot now so we'll show a warning to explain that
before switching it on.
Bug: 29052115
Bug: 29076208
Test: com.android.settings.vpn2.AppSettingsTest
Change-Id: Ia6845e6a7d57baa5476b8a021fb1255fd74aabea
2016-10-07 16:27:27 +01:00
Bill Yi
cb054fff54
Import translations. DO NOT MERGE am: 972c78b4ee -s ours am: e87f2bbaa0 -s ours am: 784b1cbf35 -s ours
...
am: 4b9f135da5
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
2016-10-07 15:05:50 +00:00
jackqdyulei
32b01bffdd
Add "FILTER_NOT_HIDE" for all app filters. am: d785a8db78 am: 00ed827516
...
am: 15c14f0cc2
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
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
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
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
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
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
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
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
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
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
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
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
2016-10-06 22:49:58 +00:00
Matthew Fritze
409714d0e4
The center column of the support tab is back to white
...
am: 2d07290453
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
2016-10-06 22:46:46 +00:00
Salvador Martinez
6a832d4db6
Added onClick logic for domain url list screen am: 26e5760033
...
am: 1d383e1220
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
Salvador Martinez
17866f0b17
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
...
am: 8a468ccbdf
2016-10-06 22:42:57 +00:00
Salvador Martinez
1d383e1220
Added onClick logic for domain url list screen
...
am: 26e5760033
2016-10-06 22:42:56 +00:00
Salvador Martinez
8a468ccbdf
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
2016-10-06 22:37:05 +00:00
Stephen Chen
9d66f6f738
Merge "Fix icon loading in EditUserInfo dialog on orientation change."
2016-10-06 22:36:52 +00:00
TreeHugger Robot
840208bc77
Merge "Use a Digit TtsSpan for pairing pins for talkback."
2016-10-06 22:12:30 +00:00
Bill Yi
1e7f5e9dd7
Import translations. DO NOT MERGE am: a6b32526d7 -s ours
...
am: f6a7a97ab5
2016-10-06 21:55:00 +00:00
Fan Zhang
6b72c17434
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am: 6cea122bfc
...
am: 207bb2947e
2016-10-06 21:54:46 +00:00
Fan Zhang
ac053b6179
Fix a NPE in confirm lock screen. am: 8b2baed2be
...
am: da856402f4
2016-10-06 21:54:30 +00:00
Jeff Sharkey
049d2b88f6
Switch to static warning threshold when adopting. am: bd7adb9313
...
am: da414d0afe
2016-10-06 21:54:16 +00:00
Jonathan Nieder
27615e6b49
Merge "Add condition check for double tap gesture settings." into nyc-mr1-dev am: 6cab381bc2
...
am: 64136f30d1
2016-10-06 21:52:45 +00:00
Doris Ling
a5eb66eb01
Add condition check for double tap gesture settings. am: c8b7555fc9
...
am: 7f62890cad
2016-10-06 21:52:33 +00:00
Matthew Fritze
dabb84876b
Merge "Fix bug preventing users from clicking settings suggestions twice" into nyc-mr1-dev am: fb42828381
...
am: 62fcf9369f
2016-10-06 21:52:02 +00:00
