Commit Graph

295 Commits

Author SHA1 Message Date
Matthew Fritze
a7b7f86f1e Settings suggestions now describes expand and collapse in talkback am: 62cf9efd9b
am: d522eff9e5

Change-Id: I95c7c1e9f7e3cec8dc9d439b480b78b2520730fb
2016-09-28 23:01:12 +00:00
Matthew Fritze
62cf9efd9b Settings suggestions now describes expand and collapse in talkback
Bug: 30314874
Change-Id: I2231148594c8e878111a754e5806c20dd4e289af
2016-09-27 13:31:15 -07:00
Fan Zhang
f77c940f9a Fix NPE when trying to refreshes dnd condition. am: 98487f4d65
am: 80c589e1f8

Change-Id: I64d75489f6e7066b2303c6e3fc3d4e6b0c8388c6
2016-09-23 23:44:36 +00:00
Fan Zhang
98487f4d65 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
2016-09-22 22:13:21 +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
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
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
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
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
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
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
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
91a1c1cad0 Refresh state after loading conditions from xml.
am: a0ebd1a9f0

Change-Id: I6ce26907b52d4b128dca541e291396f71d34d02e
2016-07-25 23:08:14 +00:00
Doris Ling
0d4b8a3b19 Fix crash when support item is clicked.
Check for existing activity to handle the support item intent before
adding it to support tile or trying to launch the activity.

Change-Id: I42a733c2d862b303773aeee1ba3b21b718e59066
Fixes: 29118295
2016-07-25 14:06:42 -07:00
Fan Zhang
a0ebd1a9f0 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
2016-07-25 13:58:39 -07:00
Doris Ling
4ec4b64b9d Check for null activity before getting dashboard categories.
am: b7e650c6f7

Change-Id: I26f8c96189d3390055a7dd02680da57d2c2ed2cb
2016-07-22 01:42:47 +00:00
Doris Ling
b7e650c6f7 Check for null activity before getting dashboard categories.
In DashboardSummary, when async task finishes running, ensure that the
fragment is still associated with the activity before getting the
dashboard categories from the activity.

Change-Id: If23cd27a0d3e3429d900ae41ef6f24ed03b9e8d6
Fixes: 30278854
2016-07-21 12:22:17 -07:00
Doris Ling
b3055b083a Merge \"Combine setCategories() and setSuggestions() in DashboardAdapter.\" into nyc-mr1-dev
am: 7e70fd1166

Change-Id: Id8f655e0a9b29369a57eea3c5140cf47def7cc36
2016-07-20 18:51:17 +00:00
Doris Ling
7e70fd1166 Merge "Combine setCategories() and setSuggestions() in DashboardAdapter." into nyc-mr1-dev 2016-07-20 18:02:43 +00:00
Jason Monk
ff1132470b Merge \"Protect against work conditional crash\" into nyc-mr1-dev
am: bd6a4f9066

Change-Id: I6072b6235abb35da9ecac1f41b01cf82e75d868b
2016-07-20 13:33:57 +00:00
Jason Monk
bd6a4f9066 Merge "Protect against work conditional crash" into nyc-mr1-dev 2016-07-20 13:28:13 +00:00
Justin Klaassen
5d8b1ca588 Merge \"Add Night display settings conditional\" into nyc-mr1-dev
am: b57ee0e02f

Change-Id: I72715ad005fade9376d036ebe7abfde0c89bd1e5
2016-07-20 01:06:41 +00:00
Justin Klaassen
d60f09edaf Add Night display settings conditional
Bug: 30043281
Change-Id: I2464cd90f1f7f379aabf123f602e6150a87120cf
2016-07-19 14:31:46 -07:00
Jason Monk
31678f14e9 Protect against work conditional crash
Change-Id: Iba6e7281c622e3ba34fa6bd4672b2380b0329808
Fixes: 30014085
2016-07-19 14:22:14 -04:00
Christopher Wiley
9170100f6c Merge \"Do not use TetherUtil.setWifiTethering\" into nyc-mr1-dev
am: 62edbf484e

Change-Id: I023592acc146cbddb2917556a0fb7c3dade417f4
2016-07-19 16:02:42 +00:00
Christopher Wiley
9d251279ca 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
2016-07-18 11:17:14 -07:00
Doris Ling
38d8582abe Combine setCategories() and setSuggestions() in DashboardAdapter.
In DashboardSummary.rebuildUI(), we first update the adapter with the
current categories, then run the async task to update the adapter with
the suggestions. This causes the adapter to first layout the existing
categories, and relayout when the suggestions is available. This causes
the suggestions view and categories view to overlap before the
relayout is complete.

Since categories and suggestions are borh set each time we try to
rebuild the UI, delaying the update for categories until the suggestions
are ready will avoid the unnecessary relayout of the list elements.

Ran app launch test for Settings app with the change and launch time is
between 412ms and 486ms in 10 runs, which does not show much delay in
app launch time with delaying updating the categories.

Bug: 29318104
Change-Id: I03ae2386392315f28fe2c361682f2f3252e9f827
2016-07-15 13:08:56 -07:00