Commit Graph

403 Commits

Author SHA1 Message Date
Doris Ling
f0bb63f307 Fix NullPointerException in DashboardSummary. am: 797dd7440d am: 454dc3739a
am: 45a821105f

Change-Id: I39623232f80a9de2d2199af11585eaa61bce2e08
2016-08-26 23:03:39 +00:00
Doris Ling
45a821105f Fix NullPointerException in DashboardSummary. am: 797dd7440d
am: 454dc3739a

Change-Id: Id334c7b3f36d8fcfbb4e919007d0bf5789b605fb
2016-08-26 22:26:40 +00:00
Doris Ling
797dd7440d Fix NullPointerException in DashboardSummary.
In onSaveInstanceState(), move saving the suggestions logging lists to
the top so that it will be saved to the bundle even when layout manager
is null.

Test: run monkey
Change-Id: I248563a255158feadeb85898a920af96a1565fa9
Fixes:31111795
2016-08-26 11:13:21 -07:00
Salvador Martinez
a54c3690a4 Added guard to logging in AsyncTask am: 030eeeee6d
am: 60bd509d4e

Change-Id: Ib1d37a0c9c68c01be0d59bff5d78cd37c083689f
2016-08-25 20:02:35 +00:00
Salvador Martinez
030eeeee6d Added guard to logging in AsyncTask
An async task was trying to get the context
in an InstrumentedFragment. This could return
null if the context disappears before the new
thread gets to that line. Logging will now
be aborted if context is null to avoid this.

Test: Manual/Monkey Stability Test
Bug: 31058928
Change-Id: Iae97d389e58a76b0f213a2749415501894ebf649
(cherry picked from commit 566b66e27c)
2016-08-25 17:45:24 +00:00
TreeHugger Robot
e96d65deea Merge "Added guard to logging in AsyncTask" 2016-08-25 00:36:32 +00:00
Salvador Martinez
566b66e27c Added guard to logging in AsyncTask
An async task was trying to get the context
in an InstrumentedFragment. This could return
null if the context disappears before the new
thread gets to that line. Logging will now
be aborted if context is null to avoid this.

Bug: 31058928
Change-Id: Iae97d389e58a76b0f213a2749415501894ebf649
2016-08-24 15:11:21 -07:00
Andrew Sapperstein
f36eac3889 resolve merge conflicts of 6890d53 to master
Change-Id: I61c1ed150fe311c4e07df524b5c0577f35d3bd60
2016-08-24 10:50:28 -04:00
Doris Ling
6890d538ae resolve merge conflicts of f757d1e to nyc-mr1-dev-plus-aosp
Change-Id: I1e53b78977bb32fe34462cf46bbfe66626574e65
2016-08-23 19:02:31 -07:00
Doris Ling
bfbb964cb1 Log settings suggestions events only once.
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.

Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.

Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes: 30108142
2016-08-23 13:25:06 -07:00
Salvador Martinez
d0e21e9285 can open settings with support tab by default am: 12c5208ad0
am: 8d47bdc773

Change-Id: I223e42c2bc89e3f95a0fed9cc74ebfb21932370f
2016-08-22 22:32:20 +00:00
jackqdyulei
83c6cfa463 Fix the nullpointer bug in monkey test. am: 409c4708c1
am: fbed8d95e9

Change-Id: Ia93f4051af386b8d6dee02d7c617fe75730e9fc2
2016-08-22 22:32:17 +00:00
Salvador Martinez
8d47bdc773 can open settings with support tab by default
am: 12c5208ad0

Change-Id: Ic28fc68db3d971ccf48c5667875474d4c9060a7b
2016-08-22 22:20:54 +00:00
jackqdyulei
fbed8d95e9 Fix the nullpointer bug in monkey test.
am: 409c4708c1

Change-Id: I03e6e3a5951f587169d0b2758283bff069b925a2
2016-08-22 22:20:50 +00:00
Salvador Martinez
5bd202e277 Merge "can open settings with support tab by default" into nyc-mr1-dev 2016-08-22 21:53:53 +00:00
Lei Yu
dd90acf2c0 Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev 2016-08-22 21:49:56 +00:00
Fan Zhang
29e1c59f32 When click conditional's title, expand/collapse content. am: 89d7bca166
am: c8b20343f0

Change-Id: I416b3f87bc3d5bde0396dd5ddf6cb23c43b3d155
2016-08-22 20:18:29 +00:00
Fan Zhang
89d7bca166 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 a2db2ca8fa)
2016-08-22 18:30:16 +00:00
jackqdyulei
409c4708c1 Fix the nullpointer bug in monkey test.
Bug: 30632031

Change-Id: I295bcc804a5e847f99577353c888caa08dc8c7ef
(cherry picked from commit a2938d2a2f)
2016-08-19 18:46:15 +00:00
Salvador Martinez
12c5208ad0 can open settings with support tab by default
Changes were made to the two files to allow users to provide
an argument in the intent for the settings activity. This
argument allows you to specify if you want the summary tab
or support open on startup.

Fixes: 30233920
Change-Id: I4745a0f75ea6a60a22381f5e58f2fac3836d86b9
(cherry picked from commit 2368e548e6)
2016-08-19 18:15:14 +00:00
Fan Zhang
6507613ebc Log visibility change for all fragments.
Bug: 30681771
Test: SettingsUnitTests

Refactor visibility logging from InstrumentedFragment into a mixin. And
apply mixin in remaining fragments.

Change-Id: Ibbb59904336254a3e4bb9e8c7d0b36e5a6bc2622
2016-08-18 14:04:13 -07:00
Fan Zhang
e162cbbd69 Don't dial any number if DIAL intent is not supported. am: 6098913d4b am: 9d478bef16
am: 67a496221e

Change-Id: I3a92f89fe4e2dc527c994050556253ec834ca1e6
2016-08-15 23:48:34 +00:00
Fan Zhang
67a496221e Don't dial any number if DIAL intent is not supported. am: 6098913d4b
am: 9d478bef16

Change-Id: I6726f4551a1ca865c225d2c6d2bfb0b1e6a4f00a
2016-08-15 23:44:32 +00:00
Fan Zhang
6098913d4b Don't dial any number if DIAL intent is not supported.
Bug: 30868123
Change-Id: Ieb971fdd86011ef0699fdbcfec1ecce2112d0209
2016-08-15 13:24:18 -07:00
Lei Yu
b23a7c4c8e Merge "Fix the nullpointer bug in monkey test." 2016-08-15 19:58:58 +00:00
jackqdyulei
a2938d2a2f Fix the nullpointer bug in monkey test.
Bug: 30632031

Change-Id: I295bcc804a5e847f99577353c888caa08dc8c7ef
2016-08-12 14:44:04 -07:00
Fan Zhang
a2db2ca8fa 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
2016-08-12 10:12:18 -07:00
Fan Zhang
b8352ccc39 Update summary correctly in Settings dashboard. am: 011362d9f1 am: 9ee547370b
am: eafaaf3922

Change-Id: I2c381a23b7cbe8f8f1a1947a0bdcac08b1ed5bd4
2016-08-04 00:46:08 +00:00
Fan Zhang
eafaaf3922 Update summary correctly in Settings dashboard. am: 011362d9f1
am: 9ee547370b

Change-Id: I0e8930a2e81ab10b4c7539f4b07758817054a979
2016-08-04 00:31:04 +00:00
Fan Zhang
011362d9f1 Update summary correctly in Settings dashboard.
Bug: 30490325

SummaryLoader needs DashboardCategory to update summary and it currently
ask for it from DashboardAdapter. But DashboardCategory is not always
available in DashboardAdapter. When SummaryLoader wants to get category
from adapter before adapter is ready, it won't have it, causing summary
to appear blank sometimes.

The fix is to get category from data source directly.

Change-Id: I9d7f676954d1cece42d6e03748ab7aa35357f8b7
2016-08-03 15:50:39 -07:00
Doris Ling
d26489e56c Merge "Log settings suggestions events only once." 2016-08-03 17:22:24 +00:00
Doris Ling
b14d42080b Log settings suggestions events only once.
The show/hide settings suggestions events are logged every time Settings
is shown. Save the logged events into the state bundle so that when the
fragment is resumed, it does not re-log the suggestions events.

Also move the logging for the show suggestion event to when the suggestion
is loaded, as the suggestions can be empty when the fragment starts.

Change-Id: I644ea0012bad309e59fed0d48171915c955779cc
Fixes: 30108142
2016-08-02 17:01:39 -07:00
Fan Zhang
81786acf49 Set correct flag when enabling listener for conditions. am: 0aebaf1556 am: 38cdd42efa
am: 939d5773ff

Change-Id: Ic9d74c3a051ae3ba3b99fc1f3fe1ccc8c8d963fa
2016-08-01 22:27:06 +00:00
Fan Zhang
939d5773ff Set correct flag when enabling listener for conditions. am: 0aebaf1556
am: 38cdd42efa

Change-Id: Ice3ede55651abafc1ccaf5d1c7e52b39443b3e45
2016-08-01 21:40:34 +00:00
Fan Zhang
0aebaf1556 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
2016-08-01 13:58:57 -07:00
Salvador Martinez
49a6ec297b Merge "can open settings with support tab by default" 2016-07-29 16:26:39 +00:00
Salvador Martinez
2368e548e6 can open settings with support tab by default
Changes were made to the two files to allow users to provide
an argument in the intent for the settings activity. This
argument allows you to specify if you want the summary tab
or support open on startup.

Fixes: 30233920
Change-Id: I4745a0f75ea6a60a22381f5e58f2fac3836d86b9
2016-07-28 16:18:05 -07:00
Fan Zhang
b73db13e4b Remove spacer above dashboard tiles. am: d9057df872 am: 3122eb6433
am: 5b519cb1df

Change-Id: I577ebba1397e5d2e27b2b7b7667330f5e53e0855
2016-07-28 21:38:46 +00:00
Fan Zhang
5b519cb1df Remove spacer above dashboard tiles. am: d9057df872
am: 3122eb6433

Change-Id: I85fd46747a4a25e6e4854b4e12e5dafc4245d4f7
2016-07-28 21:32:05 +00:00
Fan Zhang
d9057df872 Remove spacer above dashboard tiles.
Bug: 30467152

- UX is better without the spacer.
- It also causes animation issues in recycler view during cold start.

Change-Id: I3aab330ea60bba69962132a54e432943e81ff985
2016-07-28 12:51:44 -07:00
Fan Zhang
04c40828cb Never disable DnD receiver to dislay condition correctly. am: bebba4478d am: cfa34b5331
am: 8ed408b99f

Change-Id: I5a9d9e19cb94d87be4015dfdcd51b98a6e7f8936
2016-07-28 02:10:58 +00:00
Fan Zhang
8ed408b99f Never disable DnD receiver to dislay condition correctly. am: bebba4478d
am: cfa34b5331

Change-Id: I5cb44506f2731f22fd483638291badfc959ff259
2016-07-28 01:16:25 +00:00
Fan Zhang
cfa34b5331 Never disable DnD receiver to dislay condition correctly.
am: bebba4478d

Change-Id: Ic3fdccad058607c644b7219c08f0cc61d7aec8b1
2016-07-28 01:01:03 +00:00
Doris Ling
ab37f0bbbc Fix crash when support item is clicked. am: 0d4b8a3b19 am: 17fe03f7dc
am: 27a44fbf7c

Change-Id: I8b0179eefa6705bafe40488a242b47f25fc5a2e0
2016-07-28 00:25:52 +00:00
Doris Ling
27a44fbf7c Fix crash when support item is clicked. am: 0d4b8a3b19
am: 17fe03f7dc

Change-Id: Icd75ff332dc8d66b79850a96d3dc2a3519efc270
2016-07-28 00:12:24 +00:00
Fan Zhang
503a7514f6 Merge "Never disable DnD receiver to dislay condition correctly." into nyc-mr1-dev 2016-07-27 23:49:57 +00:00
Doris Ling
17fe03f7dc Fix crash when support item is clicked.
am: 0d4b8a3b19

Change-Id: I741536128ca348b8594c7df7951f62f3bbdadba6
2016-07-27 23:20:41 +00:00
Doris Ling
47c6adbd59 Merge "Fix crash when support item is clicked." into nyc-mr1-dev 2016-07-27 23:14:38 +00:00
Fan Zhang
bebba4478d Never disable DnD receiver to dislay condition correctly.
Bug: 30360853
Change-Id: I3e470c2955d7f066970442e281f9d66b153b8d10
2016-07-27 11:08:29 -07:00
Fan Zhang
709739d87d Refresh state after loading conditions from xml. am: a0ebd1a9f0
am: 91a1c1cad0

Change-Id: Iae268150219731a98c08784f313a45cc7545cf6a
2016-07-25 23:15:53 +00:00