• Home
  • History
  • Annotate
  • only in /packages/apps/Settings/src/com/android/settings/dashboard/conditional/
History log of /packages/apps/Settings/src/com/android/settings/dashboard/conditional/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
e651ddf9e6c00a62338ef8c7114b5e5e9cd307ec 20-Jul-2017 Fan Zhang <zhfan@google.com> Add shadow to searchbar when user scrolls vertically

Bug: 63528057
Test: robotests

Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
ellularDataCondition.java
1b6685f4a4a9f18d557f356f0af2b34e5e247a5e 14-Jul-2017 Doris Ling <dling@google.com> Add background color to suggestion/condition view.

- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual
onditionAdapter.java
84c7739986f8fb67d4e9db05d698044999279476 12-Jul-2017 Doris Ling <dling@google.com> Fix mokey crash on swiping settings condition.

When the condition card is being swiped, add null check for the
retrieved Condition to ensure it is still valid before trying to
dismiss it.

Change-Id: I265091a5fe290e359fa9a6e16b1d87c03894c1b8
Fix: 63624859
Test: make RunSettingsRoboTests
onditionAdapter.java
b99af0e4a210f68b8fda8486d3f7fa33645fb5aa 16-Jun-2017 Doris Ling <dling@google.com> Change to use new suggestion/condition UI.

Change to always use the new UI that combines the suggestion and conditions,
and remove all codes relating to the old UI.

Fix: 37645754
Fix: 62621808
Test: make RunSettingsRoboTests

Merged-In: I3421a9e5182f6606843392d6fae8b9f07c5f2e46
Change-Id: I5ef169a563166520dad0ac44f6780da814e2f1f7
onditionAdapter.java
onditionAdapterUtils.java
07a97c7d8abeb78914a666734cd6010f4aac1e26 04-Jun-2017 Thecrazyskull <anaskarbila@gmail.com> Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd am: 7151be926d
am: ecc7355bde

Change-Id: Ic422ded3965a9f8bc3cafb7cbf0b1e4585142672
ecc7355bde25a52dc911d647e433208e30c2d9f3 04-Jun-2017 Thecrazyskull <anaskarbila@gmail.com> Merge "ConditionManager: don't crash when trying to add unexpected condition" am: 46f7199cb1 am: 6270dce2cd
am: 7151be926d

Change-Id: I16805427f0d053c6d1c5975275f00cb0ed1c9cbb
46f7199cb13550fc33d576b39e86b172faafd019 04-Jun-2017 Treehugger Robot <treehugger-gerrit@google.com> Merge "ConditionManager: don't crash when trying to add unexpected condition"
f7791d75bfea69e40ccb7e1a411d657249ed16f3 02-Mar-2017 Thecrazyskull <anaskarbila@gmail.com> ConditionManager: don't crash when trying to add unexpected condition

* Instead, just don't add the unexpected condition

Test: none

Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
onditionManager.java
83a6621b38457a517bc842dc6df902ad8a370adf 12-May-2017 Doris Ling <dling@google.com> Combine settings suggestion and condition.

- Add a flag in dashboard feature provider to specify whether to use the
combined UI for suggestions and conditions.
- Move Conditions below Suggestions.
- Add dashboard entity for condition and suggestion container, and
wrap the condition and suggestion list inside the container. The
container itself will be a single dashboard item, and within it will
be the list of suggestion or condition.
- Add suggestion/condition header that will show the combined info for
the conditions and suggestion data, and have the expand button to
control expanding both the suggestion and condition list.
- Change the individual condition card to be always expanded, and
remove the logic to collapse/expand individual condition card.
- Remove the divider between the action button and condition detail
within each condition card.
- Add suggestion/condition footer for collapsing the whole suggestion and
condition list.

Bug: 37645754
Test: make RunSettingsRoboTests
Change-Id: I86df75f7e4551778f79d730851c03121fd0dcbdf
onditionAdapter.java
onditionAdapterUtils.java
777ed2535a7fd6f618a0d12f381af99252283574 10-May-2017 Juan Lang <juanlang@google.com> Depend on SettingsLib's version of lifecycle and FooterMixin.

The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
&& make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
onditionManager.java
ce5e0c3dc6d3ee71f27f9ae8bd07bdba84639578 10-May-2017 Doris Ling <dling@google.com> Merge "Fix crash when silencing condition." into oc-dev
am: ba2f3ee3ba

Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
b72163b9d0e4ed79327fe10fba0e0a187dd0de18 09-May-2017 Doris Ling <dling@google.com> Fix crash when silencing condition.

- check if the broadcast receiver is being registered before trying to
un-regist it.

Change-Id: I6af215f393d16173f317c9e5bc05237c935e7133
Fix: 38131851
Test: make RunSettingsRoboTests
ondition.java
d0cb54b27eeddacaee65a7daa99edd6aea97bf50 02-May-2017 Miao Miao (苗苗) <miao.miao@spreadtrum.com> Merge "Settings crash when receiving data state broadcast" am: 2ed42d009b am: c6e3467cc2
am: b1480c8cab

Change-Id: I803440c63bfb4a4355765b2dc670e2ca54f7c9e1
e4b5d69493e1fd6deba2a869acf9bc365c4ac5e1 14-Mar-2017 Miao Miao (苗苗) <miao.miao@spreadtrum.com> Settings crash when receiving data state broadcast

Stress/Stability testing, Settings crash when receiving data state
broadcast
Solution: Do null judgement before function was called
Test: Stress/Stability test

Change-Id: Id71448ed89eeffcea268c4a2e7154d9ea7639db4
ellularDataCondition.java
0f01c849cd6b546f216f9fac837693fc4a9c5138 29-Mar-2017 Doris Ling <dling@google.com> Only register conditions receiver when needed.

1. Update the dnd receiver to listen when dashboard summary running.
- remove the dnd receiver from Android manifest, and create it inside
the dnd condition.
- add lifecycle implementation to condition manager, so that the dnd
condition can know when to register and unregister the receiver.
- remove getReceiverClass() from dnd condition so that its receiver will
not be disabled by the default condition handling when condition is
silenced.

2. Remove all other conditions receiver from Android manifest.
- the broadcast receivers for HotspotCondition, AirplaneModeCondition,
CellularDataCondition from the manifest and create them inside the
condition classes.
- update Condition.onSilenceChanged() to register/unregister the
receivers instead of enable/disable the receiver class.

Change-Id: Iea6288382680df2b02884d1934b8db85daae404c
Fix: 35968517
Test: make RunSettingsRoboTests
irplaneModeCondition.java
ellularDataCondition.java
ondition.java
onditionManager.java
ndCondition.java
otspotCondition.java
a5b620e73815834f138f8af0591ca42f45c0abd7 23-Feb-2017 Fan Zhang <zhfan@google.com> Swipe to dismiss suggestions

- Move dismiss suggestion logic into feature provider
- In DashboardData, use hashcode as suggestion's stable id. This is much
more likely to provide a truely stable id for each suggestion card.
Eventually I want to use hash for all tiles to provide stable id.
- Add a SuggestionDismissionController to handle swipe to dismiss
callbacks

Change-Id: If3770f07a90c5469a0b86fc28f3eb5e4c17227cd
Fix: 35159816
Test: make RunSettingsRoboTests
onditionAdapterUtils.java
26208220cf8acea3140c1e3a20a87b2e6cd0fff1 03-Mar-2017 Doris Ling <dling@google.com> Remove WirelessSettings and related code not used in new IA.

- remove WirelessSettingsActivity and update other references to it.
- move the intent filter android.settings.WIRELESS_SETTINGS and
android.settings.AIRPLANE_MODE_SETTINGS into Network dashboard
- move intent filter android.settings.NFC_SETTINGS into Connected
devices dashboard.

Change-Id: I84f75ac45d0712eac9c40aa6c8f052bc060ed03a
Fix: 32342061
Test: make RunSettingsRoboTests
irplaneModeCondition.java
f074f0f6dd095937164c608b30369deaacbe5015 25-Feb-2017 Doris Ling <dling@google.com> Removed AccountSettings used in old IA only.

- remove AccountSettings and all related code that is used in old IA, so
that it will not show up in search.

Change-Id: I9f83112f760fd991caf89de109fde9e675b8c981
Fix: 34165913
Test: make RunSettingsRoboTests
orkModeCondition.java
c6ca314c0b872f75926807ca7d6eb24ebe7cb684 15-Feb-2017 Fan Zhang <zhfan@google.com> Log source with visibility change

- Add a method in VisibilityLoggerMixin to log visible event using
LogMaker, which allows logging additional FIELD_CONTEXT field.
- In Utils.startFragment, add current page's metricsCategory as an extra
to next page.
- In next page's onResume(), extract the previous page's metricsCategory
and send it to VisibilityLoggerMixin.visible()
- Update all caller with additional paramters

Change-Id: I8e1f2597fa465b7d3aa16fa1d21c052a3219694a
Fix: 35359289
Test: RunSettingsRoboTests
atterySaverCondition.java
otspotCondition.java
ightDisplayCondition.java
179e16445e0f78a1ae53a9cb7323c4665c24713f 29-Nov-2016 Salvador Martinez <dehboxturtle@google.com> Added logging to pinpoint source of bug

Sometimes the airplane mode banner will show up even
though airplane mode is not on. Logging has been added
to several areas around this condition in addition to
where the actual view is created. This will be used
to try and get a better handle on what the source of
the bug is.

Test: manual
Bug: 30860132
Change-Id: I7213aa7e187c5a8c0e94a5ce7a3269e6667cd61b
irplaneModeCondition.java
onditionAdapterUtils.java
onditionManager.java
265d3c2a0c36251bf8a9f571d7239b6dd404d942 22-Jun-2016 Tamas Berghammer <tberghammer@google.com> Update package names to work with the proto3 compiler

Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
irplaneModeCondition.java
ackgroundDataCondition.java
atterySaverCondition.java
ellularDataCondition.java
ondition.java
onditionAdapterUtils.java
ndCondition.java
otspotCondition.java
ightDisplayCondition.java
orkModeCondition.java
8e5f66ce394f211060bdbf15fb5e0e647db9fded 24-Oct-2016 jackqdyulei <jackqdyulei@google.com> Remove animateChange in ConditionAdapterUtils

Bug: 30319913
Test: make RunSettingsRoboTests

Change-Id: Iea3fa574c4f0f80e70a6360b5b4a5f748a80a899
onditionAdapterUtils.java
e40eb2457a58536fff35c80e8c65db723d224db9 24-Sep-2016 Fan Zhang <zhfan@google.com> Fix NPE when trying to refreshes dnd condition. am: 98487f4d65 am: 80c589e1f8
am: f77c940f9a

Change-Id: Ib0f089321000e100dbbf4510ebb9d5bce3b3abca
98487f4d65697d1f674341cb6b93a84e75c495a7 23-Sep-2016 Fan Zhang <zhfan@google.com> Fix NPE when trying to refreshes dnd condition.

Bug: 31685838
Test: manual, will add automated test in master.

The NPE happens when try to refresh dnd condition before the condition
object is created.

Change-Id: Idbd6898472e1ad21a2bbb3be5f0b9c24c03b5c80
ndCondition.java
c93d18e29c4c0c82483d87345dbfc1afae1ed2fc 22-Sep-2016 Fan Zhang <zhfan@google.com> Use MetricsFeatureProvider for condition/suggestion/search.

Bug: 31664539
Test: make RunSettingsRoboTests

This allows different metric clients to listen to these events.

Change-Id: Ib19c8099b16ff78d9aa4901278e0ff33eeefd4a8
ondition.java
onditionAdapterUtils.java
89d7bca166e004feafd37f14559794011427aa2e 12-Aug-2016 Fan Zhang <zhfan@google.com> When click conditional's title, expand/collapse content.

Bug: 30200101

It used to lead user to detailed setting for that conditional. This
leaves some confusion about which click target goes to where.

Change-Id: Ic9525ace65ca488f4e709576fb1ec96a1cb99938
(cherry picked from commit a2db2ca8fad50f0fb4cdd060d83c746a857fe92a)
onditionAdapterUtils.java
a2db2ca8fad50f0fb4cdd060d83c746a857fe92a 12-Aug-2016 Fan Zhang <zhfan@google.com> When click conditional's title, expand/collapse content.

Bug: 30200101

It used to lead user to detailed setting for that conditional. This
leaves some confusion about which click target goes to where.

Change-Id: Ic9525ace65ca488f4e709576fb1ec96a1cb99938
onditionAdapterUtils.java
0aebaf155634133263aa65a148831feb1a0133a0 01-Aug-2016 Fan Zhang <zhfan@google.com> Set correct flag when enabling listener for conditions.

Bug: 30551655

Without this flag Settings app will close whenever listener is
enabled/disabled.

Change-Id: I99102308ada3897cf44917e96015c71b926e5fb5
ondition.java
bebba4478db75f4ce5082dc4944028a4f382ab40 27-Jul-2016 Fan Zhang <zhfan@google.com> Never disable DnD receiver to dislay condition correctly.

Bug: 30360853
Change-Id: I3e470c2955d7f066970442e281f9d66b153b8d10
ondition.java
ndCondition.java
a0ebd1a9f0a628aaffcde9b9fcc7fb16c6f85f26 25-Jul-2016 Fan Zhang <zhfan@google.com> Refresh state after loading conditions from xml.

Fixes: 30330909

When start Settings, conditions is loaded from a xml with potentially
stale state. ConditionLoader needs to refresh states after reading xml
to make sure they are up to date.

Change-Id: Ice1b8bacb0486c5dd230b83670c1494710d1c061
onditionManager.java
bd6a4f9066c090943e3af521a28e399fe59bc36b 20-Jul-2016 Jason Monk <jmonk@google.com> Merge "Protect against work conditional crash" into nyc-mr1-dev
d60f09edafea67616d574d4421da220b1615e194 19-Jul-2016 Justin Klaassen <justinklaassen@google.com> Add Night display settings conditional

Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
onditionManager.java
ightDisplayCondition.java
31678f14e93952f501cb5b58c0caea212d6c95e2 19-Jul-2016 Jason Monk <jmonk@google.com> Protect against work conditional crash

Change-Id: Iba6e7281c622e3ba34fa6bd4672b2380b0329808
Fixes: 30014085
orkModeCondition.java
9d251279ca1ce905e332945e19fd0d3fc09103b1 18-Jul-2016 Christopher Wiley <wiley@google.com> Do not use TetherUtil.setWifiTethering

This functionality is replaced by ConnectivityManager.startTethering()
and ConnectivityManager.stopTethering().

Bug: 30147602
Test: Can toggle tethering on/off via all of settings, quick settings,
and quick quick settings.
Change-Id: I4d190185c473237982b988f898e76d4997dc401c
otspotCondition.java
095d9e3d3f2fa5a40bb49e005f86d23d2425d6b4 27-Jun-2016 Jason Monk <jmonk@google.com> Fix DND conditional null state

Persist all of the data it needs to produce the UI.

Change-Id: Ifb143b2cd3fef075cd77feaf53051eb8b7153a51
Fixes: 27664882
ndCondition.java
e4d0ed502df4a46c7e6997e5f9a7da5ebc344cae 26-May-2016 Jason Monk <jmonk@google.com> Fix crash from battery saver switch

Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash. Instead load
immediately for everything but the dashboard.

Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes: 28952354
onditionManager.java
6cb280d14641327b32378504544d125bbc3bcaf3 25-May-2016 Jason Monk <jmonk@google.com> Don't update conditions on background threads

Instead build a list and set it on the main thread to avoid
concurrent modification crashes.

Change-Id: I936fbeb70359583e55ae8ddcb0ea46b5753cb3b0
Fixes: 28794277
onditionManager.java
2386dfc18d7b1b293b630b6527e078c8c5086d07 29-Apr-2016 Jason Monk <jmonk@google.com> Dashboard performance work

Push more stuff to backround threads (this will cause conditions/suggestions
to load slightly slower than normal content) and cache more info.

Fixes: 28613950
Bug: 28435146
Change-Id: I1080930e8f31c7f12a2d89f266bfd3236979cf40
onditionManager.java
58440b2801a5355e68f8950fc70f08a73e19e40d 27-Apr-2016 Clara Bayarri <clarabayarri@google.com> Fix Settings Condition expand button a11y label

Bug: 27276008
Change-Id: Ie62ed8a73b300948f053b5d35f344bce3b63869a
onditionAdapterUtils.java
295f1060e990299fec7e2aa375064f9f09246e8d 19-Apr-2016 Zoltan Szatmary-Ban <szatmz@google.com> Merge "Apply policy transparency to HotspotCondition and WiFi settings..." into nyc-dev
3f6208170df1e8635a5d45947a2703c895da6970 11-Apr-2016 Zoltan Szatmary-Ban <szatmz@google.com> Apply policy transparency to HotspotCondition and WiFi settings...

...when there is an active hotspot and user restriction for disallowing
tether config is in effect. This is to avoid getting security exceptions
from WifiManager when engaging with HotspotCondition or Wifi enable switch.

Bug:27936528
Change-Id: Ib3324e853277c177966b55668758d349ffe6ecf5
onditionAdapterUtils.java
otspotCondition.java
89726fd95209689dea1f82912e85c837fbeb8553 15-Apr-2016 Benjamin Franz <bfranz@google.com> Merge "Only try disabling quiet mode" into nyc-dev
d49a846a3904068e38890a050ea660d2aa40075c 13-Apr-2016 Jason Monk <jmonk@google.com> Don't debug log on ConditionManager

Change-Id: I383c8ca4cfea732ace8213a17df375babad5f793
onditionManager.java
e00cd80a1eea8aa6f2a1e021c9dfa7ee51856ba2 05-Apr-2016 Benjamin Franz <bfranz@google.com> Only try disabling quiet mode

The underlying API has slightly changed to require the profile
challenge if the profile that we're trying to enable hasn't been
unlocked yet.

Bug: 27764124
Change-Id: I9efb3d3ed49034b573abb4c18119ffadcccfe947
orkModeCondition.java
5673ced93cda4a48872c1452122ee278da3aa17a 12-Apr-2016 Jason Monk <jmonk@google.com> Work on settings startup speed

- Cut down on amount stored in conditions xml
- Remove extra work from dashboard startup
- Move summary to min priority

Change-Id: I51ca3828e4446632d6faa60dcfbab3446d19d335
Fixes: 28134360
ondition.java
onditionManager.java
905002a01d88a3ff2cb473904706286100858670 05-Apr-2016 Fan Zhang <zhfan@google.com> Fix animation when expand conditional notices in Settings.

Bug: 28017593
Change-Id: I8275cb2050f79d26e58c02ffd91cb1a3e32a5ff2
onditionAdapterUtils.java
f20c718f192d680bc4941e544c218c5a204c35f9 30-Mar-2016 Jason Monk <jmonk@google.com> Add metrics for settings conditionals

Bug: 27851236
Change-Id: I400716457d3f628419410a02c2a457d41d19a067
irplaneModeCondition.java
ackgroundDataCondition.java
atterySaverCondition.java
ellularDataCondition.java
ondition.java
onditionAdapterUtils.java
ndCondition.java
otspotCondition.java
orkModeCondition.java
ef6671b0b7482c1ffff42b2024e51d210c601441 16-Mar-2016 Jason Monk <jmonk@google.com> Fix clickability of conditionals

Bug: 27700081
Change-Id: If991419541dd021197ea641f8b2caee5cc16af36
onditionAdapterUtils.java
c69f2be4667c3145060e3364abb504735caf8a32 05-Feb-2016 Jeremy Klein <jlklein@google.com> Merge "Remove TetherUtil functions which are no longer needed."
3a14416d55ad64147362f57410ee4ea98a0476b4 29-Jan-2016 Jeremy Klein <jlklein@google.com> Remove TetherUtil functions which are no longer needed.

Change-Id: I8559a2aaffa44e165d4e5e9070a85f23ed02b58b
otspotCondition.java
6fdf1669e1df821b860321896539ed40936ed3d7 04-Feb-2016 Jason Monk <jmonk@google.com> Add animation for condition card height change.

Change-Id: If648914426cf6db5b039114cf593915c3b2e6c8c
onditionAdapterUtils.java
764f45db9168b4f19623b72db8429016d1226cbe 21-Jan-2016 Jason Monk <jmonk@google.com> Add data saver to settings

Bug: 22817899

Change-Id: Ic3055aa6a5baae1653db350313366f180c049cc7
ackgroundDataCondition.java
d39995b7c4cebb6beb5316c68d45a83c7c46f5de 13-Jan-2016 Mahaver Chopra <mahaver@google.com> Work mode conditional switch in main settings

Bug: 26533692
Change-Id: Ifa235bc54c2c6e904cb1cf4fab06d727cde2492a
onditionManager.java
orkModeCondition.java
aca0f1cf8ac3c448f82cf8ff6b9d72c73b4b1f4a 16-Dec-2015 Jason Monk <jmonk@google.com> Fix airplane mode conditional primary click

Change-Id: Iacd83b53be224ad8fd55fe176f66a0d724576247
irplaneModeCondition.java
c685853bb8cfa8f2dd3ff7435becd0af9cf82c46 16-Dec-2015 Jason Monk <jmonk@google.com> Add background data off conditional

Change-Id: If51fdaecc880560c4a0cd8d320b06804cfe98388
ackgroundDataCondition.java
onditionManager.java
70ecea22076c53599932f2146bc25ddf3b49c6a6 15-Dec-2015 Jason Monk <jmonk@google.com> Add cellular data off conditional

Change-Id: I34980f3fc09bf5dd47eb296c5b1c5fccc87b5c90
irplaneModeCondition.java
ellularDataCondition.java
ondition.java
onditionManager.java
ndCondition.java
otspotCondition.java
af24b6377e63fc3f950b5a3c20737ccce104760e 15-Dec-2015 Jason Monk <jmonk@google.com> Add battery saver conditional

Change-Id: If80b749185537f252dae88230f80b29bcf321fdf
atterySaverCondition.java
onditionManager.java
ffb4535d3a087c71787e1674e5e31633083a2c60 13-Dec-2015 Jason Monk <jmonk@google.com> Add dnd conditional

Change-Id: I81eabf274bde05358c60bb63e1ed6d1bd447ce55
onditionManager.java
ndCondition.java
db4ed191deefeda79af5644634415597c1c70217 11-Dec-2015 Jason Monk <jmonk@google.com> Add conditionals to Settings

Also add Airplane Mode and Hotspot conditionals (more to come soon)

Change-Id: I11f206db59f7c715f416fb5852b8f0fcb857a247
irplaneModeCondition.java
ondition.java
onditionAdapterUtils.java
onditionManager.java
ocusRecyclerView.java
otspotCondition.java