Commit Graph

40519 Commits

Author SHA1 Message Date
Antony Sargent
b3576c9fa6 Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev am: b991dcd1b8
am: a99dea8e66

Change-Id: Ie52a604be9901600b4d94eed77cfa43c1761fbd8
2017-09-15 17:44:11 +00:00
Antony Sargent
a99dea8e66 Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev
am: b991dcd1b8

Change-Id: I738bde4deee58ab84f24302048534f657698603b
2017-09-15 17:42:26 +00:00
Antony Sargent
b991dcd1b8 Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev 2017-09-15 17:32:07 +00:00
Doris Ling
3a8c22c231 Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea am: 0533f9ff4a am: 18c3bde1d5
am: b24d054e08

Change-Id: I5da78067b623709a31afaeff2b339457a994eba1
2017-09-15 14:20:36 +00:00
Soroosh Mariooryad
b6b12f4f9d Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev am: 339fd95209
am: d4b767789d  -s ours

Change-Id: I4413e04872d7a2221773ddc38f45531a8ce9b932
2017-09-15 14:20:00 +00:00
Daniel Nishi
24968fa3c1 Merge "Fix work profile storage bugs." into oc-mr1-dev am: 67f0299a25
am: 08fe250704

Change-Id: I8c69cf593d2159c62bbea04d3b85bf65dd944448
2017-09-15 14:19:17 +00:00
Zhijun He
9ff38b38da Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev am: 1d45308e33
am: c1857e9841

Change-Id: I458e2c81bd15caa461da001bfdb5903944ebc375
2017-09-15 14:17:38 +00:00
Lei Yu
2f08bb66de Merge "Update the bluetooth battery icon" into oc-mr1-dev am: 04ba0f5067
am: e01900d9c5

Change-Id: I7560f9100b4778d72ad5e395b58d720aeb25438b
2017-09-15 11:15:08 +00:00
edgar.huang
ebe14617ba Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f am: f95e7f9056 am: e7da16fc8f
am: d0331b8152

Change-Id: I7cd06b4d8f368c5a0843a173293ca0cf2ea43ebe
2017-09-15 06:49:35 +00:00
Daniel Nishi
d1743b5a09 Merge "Remove outdated storage search results." into oc-mr1-dev am: 11c325e85d
am: aec1784122

Change-Id: I3b2648a48059cbb4ec0b47ab43112a3dc9801012
2017-09-15 06:49:06 +00:00
Daniel Nishi
bddd352969 Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev am: f42b529143
am: 598386ebab

Change-Id: I775f8b438eb6452bdbb2422efe4a56661c2ae7ed
2017-09-15 06:48:39 +00:00
Doris Ling
b24d054e08 Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea am: 0533f9ff4a
am: 18c3bde1d5

Change-Id: I3173e35feaf21bbc2dc0abd8eb561fc0251fa5ba
2017-09-15 03:33:54 +00:00
TreeHugger Robot
467596b0f4 Merge "Consolidate all wrappers used for testing." 2017-09-15 03:14:52 +00:00
Soroosh Mariooryad
d4b767789d Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev
am: 339fd95209

Change-Id: I641e80fa3678d5b3dd1dec07a908a9561c4460b9
2017-09-15 02:57:54 +00:00
Daniel Nishi
08fe250704 Merge "Fix work profile storage bugs." into oc-mr1-dev
am: 67f0299a25

Change-Id: Ia30e1b297d8c4f9b4167f09e92f1ce1645b26977
2017-09-15 02:57:09 +00:00
Zhijun He
c1857e9841 Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
am: 1d45308e33

Change-Id: If97d1cddbb044fde52197cd08f0c34cad9abe901
2017-09-15 02:55:48 +00:00
Doris Ling
18c3bde1d5 Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea
am: 0533f9ff4a

Change-Id: Ib3175a8ffbba9e229bb86cb561c63342f20608bc
2017-09-15 02:06:37 +00:00
Doris Ling
0533f9ff4a Merge "Default apps settings disappear when switching to secondary user"
am: 939265d6ea

Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd
2017-09-15 01:33:16 +00:00
Doris Ling
dee1a22c45 Consolidate all wrappers used for testing.
- Add the wrapper package and move all wrappers to the wrapper package.
- Get rid of some wrapper interface/impl implementation and have a
wrapper class directly.

Bug: 65634579
Test: make RunSettingsRoboTests
Change-Id: Ic757d8f7bacfa7a034c7e692205bc1dc4b0e1de1
2017-09-14 18:24:49 -07:00
Soroosh Mariooryad
339fd95209 Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev 2017-09-15 01:12:48 +00:00
Daniel Nishi
67f0299a25 Merge "Fix work profile storage bugs." into oc-mr1-dev 2017-09-15 00:58:59 +00:00
Fan Zhang
230b3767d9 Add feature flag for suggestion/SettingsIntelligence integ.
Bug: 65065268
Test: robotests
Change-Id: I42e1f8b01d7b82de3b94bd77943a9a119adf5867
2017-09-14 16:04:35 -07:00
TreeHugger Robot
1d45308e33 Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev 2017-09-14 22:30:11 +00:00
Doris Ling
939265d6ea Merge "Default apps settings disappear when switching to secondary user" 2017-09-14 22:13:58 +00:00
TreeHugger Robot
fe18f8e876 Merge "Integrate with SettingsIntelligence" 2017-09-14 21:52:16 +00:00
Matthew Fritze
6bbc459f24 Simplify IndexData builder
This is a small refactor in the large game of refactoring
DatabeseIndexingManager, and the general indexing pipeline
for Settings search.

This change is centered around hiding the normalization of
data (title, summary, keywords) from the data collector,
and putting that responsibility into the IndexData object.

In a future CL, we may move this again to the controller
that actually indexes the data.

Note, the conversion from PreIndexData to IndexData is
still messy, but until I can write a CL that just
rearranges the code, we must stay patient and vigilant.

Bug: 33577327
Test: make RunSettingsRoboTests
Change-Id: I53543d3d9c74a61380601297c55b6e4fea13031a
2017-09-14 14:49:57 -07:00
Lei Yu
e01900d9c5 Merge "Update the bluetooth battery icon" into oc-mr1-dev
am: 04ba0f5067

Change-Id: Ibc55937908be092c78ddac484226187276e87ee2
2017-09-14 21:40:26 +00:00
Lei Yu
04ba0f5067 Merge "Update the bluetooth battery icon" into oc-mr1-dev 2017-09-14 21:31:13 +00:00
edgar.huang
d0331b8152 Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f am: f95e7f9056
am: e7da16fc8f

Change-Id: Idd10ba2234522c1679ebfbbc48c7bfda742f0a4e
2017-09-14 20:41:44 +00:00
edgar.huang
e7da16fc8f Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f
am: f95e7f9056

Change-Id: Ie6b48a64c62371cd276112b5b149fdf63341bb6f
2017-09-14 20:39:42 +00:00
edgar.huang
f95e7f9056 Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
am: 62a021850f

Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3
2017-09-14 20:37:15 +00:00
Treehugger Robot
62a021850f Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." 2017-09-14 20:28:55 +00:00
Zhijun He
781e762c2c Revert "Settings: Enable HAL HDR+ by default"
This reverts commit 14c4b41f78.

Bug: 65679683
2017-09-14 12:01:42 -07:00
Antony Sargent
5a4b6b152a Bring back "Turning on hotspot" status text when starting hotspot
We accidentally regressed showing this text when starting the hotspot in
the refactor ag/2381595.

Bug: 64811203
Test: make RunSettingsRoboTests
2017-09-14 11:22:29 -07:00
Daniel Nishi
aec1784122 Merge "Remove outdated storage search results." into oc-mr1-dev
am: 11c325e85d

Change-Id: I8633076bab4293c05a2703ed5cad7f59afdf0fb5
2017-09-14 18:08:00 +00:00
Daniel Nishi
598386ebab Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
am: f42b529143

Change-Id: I3a8888fe8e555876ed058c29a91f1e9f17d82324
2017-09-14 18:07:16 +00:00
Daniel Nishi
59982c6954 Fix work profile storage bugs.
This makes apps and files in the work profile show up only for the work profile.
It turns out the primary profile's user id was getting piped down to the
special files views and it was showing the primary profile's file sizes
instead of the work ones.

Change-Id: If9c175f24920513c624c522d838bcdbe925566d1
Fixes: 65559258, 65558758, 65559934
Test: Settings robotest and 34768986
2017-09-14 11:05:34 -07:00
Soroosh Mariooryad
5ba0f51bcd Log smart settings suggestion enabled/disabled state for A/B experiments
Test: RunSettingsRoboTests
Bug: 64121058

Change-Id: Iadfa575b9a21caecb515b9975d388ee0d0480c11
2017-09-14 10:43:56 -07:00
Daniel Nishi
11c325e85d Merge "Remove outdated storage search results." into oc-mr1-dev 2017-09-14 17:43:40 +00:00
Daniel Nishi
f42b529143 Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev 2017-09-14 17:43:27 +00:00
jackqdyulei
2c6a016b10 Update the bluetooth battery icon
In ag/2863892, we add a new parameter to tune the size of battery icon.
This cl use this parameter and update the icon in bluetooth detail page.

Bug: 65397557
Test: RunSettingsLibRoboTests & Screenshots
Change-Id: I6dd26f14b3209101dd39320b3720fbd4f79acf54
2017-09-14 10:34:30 -07:00
Jeffrey Huang
e50d119d90 Merge "Introduce StayAwakePreferenceController" 2017-09-14 16:49:30 +00:00
TreeHugger Robot
a15ec6d888 Merge "Removed unused use of setting launch stack id." 2017-09-14 15:44:14 +00:00
Erik Kline
f7ace4b51d Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59 am: de272fcd2a -s ours
am: 7d22a9dd78  -s ours

Change-Id: I9fc1d25e21e70ef2e040c4d2378b14ce767d5364
2017-09-14 08:23:30 +00:00
Erik Kline
7d22a9dd78 Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59
am: de272fcd2a  -s ours

Change-Id: Ic79acc4977ea59f92859e41367adc80fc42cb8d9
2017-09-14 08:20:30 +00:00
Erik Kline
de272fcd2a Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf
am: d3f4a27c59

Change-Id: Ia53ed00cc596cdbeff9042d74cdc2852cd352cc9
2017-09-14 08:17:00 +00:00
Erik Kline
d3f4a27c59 Merge changes Icd3d09aa,I4b070964
am: a0661c4fdf

Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642
2017-09-14 08:14:09 +00:00
Treehugger Robot
a0661c4fdf Merge changes Icd3d09aa,I4b070964
* changes:
  Include IPv6 DNS servers in wifi details
  Separate multiple DNS addresses with newlines.
2017-09-14 08:10:25 +00:00
Soroosh Mariooryad
7fe6f50bf7 Log smart settings suggestion enabled/disabled state for A/B experiments
Test: RunSettingsRoboTests
Bug: 64121058

Change-Id: I0cf4b4a0e8470cd40d38e8fe937cfb5f3e96f380
Merged-In: Iadfa575b9a21caecb515b9975d388ee0d0480c11
2017-09-13 23:25:52 -07:00
Erik Kline
5b206aec69 Include IPv6 DNS servers in wifi details
Test: as follows
    - built
    - flashed
    - booted
    - export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
          make -j RunSettingsRoboTests
      RunSettingsRoboTests:
      RunSettingsRoboTests: Time: 19.821
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (37 tests)
      RunSettingsRoboTests:
    - make -j RunSettingsRoboTests
      RunSettingsRoboTests: ...........................
      RunSettingsRoboTests: Time: 424.847
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (2250 tests)
      RunSettingsRoboTests:

Bug: 65037256
Bug: 65467586

Merged-In: If15181d557e9abce75111a6e1fff4e12586d7dbc
Merged-In: I55fbd611fee9f17215412a76b480cdee96f62b32
Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
(cherry picked from commit 9adc588749)
2017-09-14 14:48:50 +09:00