OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev am: c872c14785
Lei Yu [Fri, 15 Sep 2017 21:46:59 +0000 (21:46 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev am: c872c14785
am: 3a01adad6d

Change-Id: I4669be435441db3e94bd06afafeaf693c3fa614e

6 years agoMerge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
Lei Yu [Fri, 15 Sep 2017 21:45:00 +0000 (21:45 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
am: c872c14785

Change-Id: I0f56d26a42ef107be632d360e944975db8e73b1d

6 years agoMerge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
TreeHugger Robot [Fri, 15 Sep 2017 21:40:04 +0000 (21:40 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev

6 years agoMerge "Add a new feature flag for the expand button in support lib."
Doris Ling [Fri, 15 Sep 2017 21:38:31 +0000 (21:38 +0000)]
Merge "Add a new feature flag for the expand button in support lib."

6 years agoAdd a new feature flag for the expand button in support lib.
Doris Ling [Fri, 15 Sep 2017 01:54:48 +0000 (18:54 -0700)]
Add a new feature flag for the expand button in support lib.

- check the feature flag to determine whether to use the existing
progressive disclosure mixin or use the expand button in the support
library.
- add corresponding preference xml files that add the new preference
group attribute to use with the expand button in the support lib.

Bug: 63985174
Test: make RunSettingsRoboTests
Change-Id: Ida6eb6182a8066ad1413b7f6142512345fd914d0

6 years agoHook up lint color check to settings
jackqdyulei [Thu, 14 Sep 2017 23:11:02 +0000 (16:11 -0700)]
Hook up lint color check to settings

After this cl, settings will run hardcoded color check
(go/color-check-guideline) for all the cls in pre-upload.

This check will prompt error message if cl contains hardcoded color.

Bug: 32750778
Test: repo upload .
Change-Id: Id35ded5199094a14fcc4eeebc470164d052e278e

6 years agoRevert "Turn on wakeupAlarm anomaly detector"
Lei Yu [Fri, 15 Sep 2017 18:01:13 +0000 (18:01 +0000)]
Revert "Turn on wakeupAlarm anomaly detector"

This reverts commit 1a49a8ab3900ab77209b1c5b34a33cc3a8be3e2c.

Bug: 65738439
Test: RunSettingsRoboTests

Change-Id: Ifb2f72ba51e229b9387ff5a977bd51b229fcdf6a

6 years agoMerge "Simplify IndexData builder"
TreeHugger Robot [Fri, 15 Sep 2017 18:01:46 +0000 (18:01 +0000)]
Merge "Simplify IndexData builder"

6 years agoMerge "Bring back "Turning on hotspot" status text when starting hotspot" into oc...
Antony Sargent [Fri, 15 Sep 2017 17:44:11 +0000 (17:44 +0000)]
Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev am: b991dcd1b8
am: a99dea8e66

Change-Id: Ie52a604be9901600b4d94eed77cfa43c1761fbd8

6 years agoMerge "Bring back "Turning on hotspot" status text when starting hotspot" into oc...
Antony Sargent [Fri, 15 Sep 2017 17:42:26 +0000 (17:42 +0000)]
Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev
am: b991dcd1b8

Change-Id: I738bde4deee58ab84f24302048534f657698603b

6 years agoMerge "Bring back "Turning on hotspot" status text when starting hotspot" into oc...
Antony Sargent [Fri, 15 Sep 2017 17:32:07 +0000 (17:32 +0000)]
Merge "Bring back "Turning on hotspot" status text when starting hotspot" into oc-mr1-dev

6 years agoMerge "Default apps settings disappear when switching to secondary user" am: 939265d6...
Doris Ling [Fri, 15 Sep 2017 14:20:36 +0000 (14:20 +0000)]
Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea am: 0533f9ff4a am: 18c3bde1d5
am: b24d054e08

Change-Id: I5da78067b623709a31afaeff2b339457a994eba1

6 years agoMerge "Log smart settings suggestion enabled/disabled state for A/B experiments"...
Soroosh Mariooryad [Fri, 15 Sep 2017 14:20:00 +0000 (14:20 +0000)]
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

6 years agoMerge "Fix work profile storage bugs." into oc-mr1-dev am: 67f0299a25
Daniel Nishi [Fri, 15 Sep 2017 14:19:17 +0000 (14:19 +0000)]
Merge "Fix work profile storage bugs." into oc-mr1-dev am: 67f0299a25
am: 08fe250704

Change-Id: I8c69cf593d2159c62bbea04d3b85bf65dd944448

6 years agoMerge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev am: 1d45308e33
Zhijun He [Fri, 15 Sep 2017 14:17:38 +0000 (14:17 +0000)]
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev am: 1d45308e33
am: c1857e9841

Change-Id: I458e2c81bd15caa461da001bfdb5903944ebc375

6 years agoMerge "Update the bluetooth battery icon" into oc-mr1-dev am: 04ba0f5067
Lei Yu [Fri, 15 Sep 2017 11:15:08 +0000 (11:15 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev am: 04ba0f5067
am: e01900d9c5

Change-Id: I7560f9100b4778d72ad5e395b58d720aeb25438b

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty...
edgar.huang [Fri, 15 Sep 2017 06:49:35 +0000 (06:49 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f am: f95e7f9056 am: e7da16fc8f
am: d0331b8152

Change-Id: I7cd06b4d8f368c5a0843a173293ca0cf2ea43ebe

6 years agoMerge "Remove outdated storage search results." into oc-mr1-dev am: 11c325e85d
Daniel Nishi [Fri, 15 Sep 2017 06:49:06 +0000 (06:49 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev am: 11c325e85d
am: aec1784122

Change-Id: I3b2648a48059cbb4ec0b47ab43112a3dc9801012

6 years agoMerge "Close the load screen faster on pre-quota devices." into oc-mr1-dev am: f42b529143
Daniel Nishi [Fri, 15 Sep 2017 06:48:39 +0000 (06:48 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev am: f42b529143
am: 598386ebab

Change-Id: I775f8b438eb6452bdbb2422efe4a56661c2ae7ed

6 years agoMerge "Default apps settings disappear when switching to secondary user" am: 939265d6...
Doris Ling [Fri, 15 Sep 2017 03:33:54 +0000 (03:33 +0000)]
Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea am: 0533f9ff4a
am: 18c3bde1d5

Change-Id: I3173e35feaf21bbc2dc0abd8eb561fc0251fa5ba

6 years agoMerge "Consolidate all wrappers used for testing."
TreeHugger Robot [Fri, 15 Sep 2017 03:14:52 +0000 (03:14 +0000)]
Merge "Consolidate all wrappers used for testing."

6 years agoMerge "Log smart settings suggestion enabled/disabled state for A/B experiments"...
Soroosh Mariooryad [Fri, 15 Sep 2017 02:57:54 +0000 (02:57 +0000)]
Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev
am: 339fd95209

Change-Id: I641e80fa3678d5b3dd1dec07a908a9561c4460b9

6 years agoMerge "Fix work profile storage bugs." into oc-mr1-dev
Daniel Nishi [Fri, 15 Sep 2017 02:57:09 +0000 (02:57 +0000)]
Merge "Fix work profile storage bugs." into oc-mr1-dev
am: 67f0299a25

Change-Id: Ia30e1b297d8c4f9b4167f09e92f1ce1645b26977

6 years agoMerge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
Zhijun He [Fri, 15 Sep 2017 02:55:48 +0000 (02:55 +0000)]
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
am: 1d45308e33

Change-Id: If97d1cddbb044fde52197cd08f0c34cad9abe901

6 years agoMerge "Default apps settings disappear when switching to secondary user" am: 939265d6ea
Doris Ling [Fri, 15 Sep 2017 02:06:37 +0000 (02:06 +0000)]
Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea
am: 0533f9ff4a

Change-Id: Ib3175a8ffbba9e229bb86cb561c63342f20608bc

6 years agoMerge "Default apps settings disappear when switching to secondary user"
Doris Ling [Fri, 15 Sep 2017 01:33:16 +0000 (01:33 +0000)]
Merge "Default apps settings disappear when switching to secondary user"
am: 939265d6ea

Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd

6 years agoConsolidate all wrappers used for testing.
Doris Ling [Thu, 31 Aug 2017 23:17:30 +0000 (16:17 -0700)]
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

6 years agoMerge "Log smart settings suggestion enabled/disabled state for A/B experiments"...
Soroosh Mariooryad [Fri, 15 Sep 2017 01:12:48 +0000 (01:12 +0000)]
Merge "Log smart settings suggestion enabled/disabled state for A/B experiments" into oc-mr1-dev

6 years agoMerge "Fix work profile storage bugs." into oc-mr1-dev
Daniel Nishi [Fri, 15 Sep 2017 00:58:59 +0000 (00:58 +0000)]
Merge "Fix work profile storage bugs." into oc-mr1-dev

6 years agoAdd feature flag for suggestion/SettingsIntelligence integ.
Fan Zhang [Thu, 14 Sep 2017 23:04:35 +0000 (16:04 -0700)]
Add feature flag for suggestion/SettingsIntelligence integ.

Bug: 65065268
Test: robotests
Change-Id: I42e1f8b01d7b82de3b94bd77943a9a119adf5867

6 years agoMerge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
TreeHugger Robot [Thu, 14 Sep 2017 22:30:11 +0000 (22:30 +0000)]
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev

6 years agoMerge "Default apps settings disappear when switching to secondary user"
Doris Ling [Thu, 14 Sep 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Default apps settings disappear when switching to secondary user"

6 years agoMerge "Integrate with SettingsIntelligence"
TreeHugger Robot [Thu, 14 Sep 2017 21:52:16 +0000 (21:52 +0000)]
Merge "Integrate with SettingsIntelligence"

6 years agoSimplify IndexData builder
Matthew Fritze [Tue, 22 Aug 2017 22:51:50 +0000 (15:51 -0700)]
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

6 years agoMerge "Update the bluetooth battery icon" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:40:26 +0000 (21:40 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev
am: 04ba0f5067

Change-Id: Ibc55937908be092c78ddac484226187276e87ee2

6 years agoMerge "Update the bluetooth battery icon" into oc-mr1-dev
Lei Yu [Thu, 14 Sep 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty...
edgar.huang [Thu, 14 Sep 2017 20:41:44 +0000 (20:41 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f am: f95e7f9056
am: e7da16fc8f

Change-Id: Idd10ba2234522c1679ebfbbc48c7bfda742f0a4e

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty...
edgar.huang [Thu, 14 Sep 2017 20:39:42 +0000 (20:39 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f
am: f95e7f9056

Change-Id: Ie6b48a64c62371cd276112b5b149fdf63341bb6f

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty."
edgar.huang [Thu, 14 Sep 2017 20:37:15 +0000 (20:37 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."
am: 62a021850f

Change-Id: I6baf91aa5b558616e3d30aaa2edbdbc0f47072c3

6 years agoMerge "Don't need to authenticate fingerprint when the fingerprint list is empty."
Treehugger Robot [Thu, 14 Sep 2017 20:28:55 +0000 (20:28 +0000)]
Merge "Don't need to authenticate fingerprint when the fingerprint list is empty."

6 years agoRevert "Settings: Enable HAL HDR+ by default"
Zhijun He [Thu, 14 Sep 2017 19:01:42 +0000 (12:01 -0700)]
Revert "Settings: Enable HAL HDR+ by default"

This reverts commit 14c4b41f789541628070f3a2d23207239d4f7ae8.

Bug: 65679683

6 years agoBring back "Turning on hotspot" status text when starting hotspot
Antony Sargent [Thu, 14 Sep 2017 17:52:44 +0000 (10:52 -0700)]
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

6 years agoMerge "Remove outdated storage search results." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 18:08:00 +0000 (18:08 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev
am: 11c325e85d

Change-Id: I8633076bab4293c05a2703ed5cad7f59afdf0fb5

6 years agoMerge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 18:07:16 +0000 (18:07 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
am: f42b529143

Change-Id: I3a8888fe8e555876ed058c29a91f1e9f17d82324

6 years agoFix work profile storage bugs.
Daniel Nishi [Tue, 12 Sep 2017 23:52:17 +0000 (16:52 -0700)]
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: 655592586555875865559934
Test: Settings robotest and 34768986

6 years agoLog smart settings suggestion enabled/disabled state for A/B experiments
Soroosh Mariooryad [Fri, 11 Aug 2017 07:04:37 +0000 (00:04 -0700)]
Log smart settings suggestion enabled/disabled state for A/B experiments

Test: RunSettingsRoboTests
Bug: 64121058

Change-Id: Iadfa575b9a21caecb515b9975d388ee0d0480c11

6 years agoMerge "Remove outdated storage search results." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Remove outdated storage search results." into oc-mr1-dev

6 years agoMerge "Close the load screen faster on pre-quota devices." into oc-mr1-dev
Daniel Nishi [Thu, 14 Sep 2017 17:43:27 +0000 (17:43 +0000)]
Merge "Close the load screen faster on pre-quota devices." into oc-mr1-dev

6 years agoUpdate the bluetooth battery icon
jackqdyulei [Wed, 13 Sep 2017 20:35:02 +0000 (13:35 -0700)]
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

6 years agoMerge "Introduce StayAwakePreferenceController"
Jeffrey Huang [Thu, 14 Sep 2017 16:49:30 +0000 (16:49 +0000)]
Merge "Introduce StayAwakePreferenceController"

6 years agoMerge "Removed unused use of setting launch stack id."
TreeHugger Robot [Thu, 14 Sep 2017 15:44:14 +0000 (15:44 +0000)]
Merge "Removed unused use of setting launch stack id."

6 years agoMerge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59 am: de272fcd2a ...
Erik Kline [Thu, 14 Sep 2017 08:23:30 +0000 (08:23 +0000)]
Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59 am: de272fcd2a  -s ours
am: 7d22a9dd78  -s ours

Change-Id: I9fc1d25e21e70ef2e040c4d2378b14ce767d5364

6 years agoMerge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59
Erik Kline [Thu, 14 Sep 2017 08:20:30 +0000 (08:20 +0000)]
Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf am: d3f4a27c59
am: de272fcd2a  -s ours

Change-Id: Ic79acc4977ea59f92859e41367adc80fc42cb8d9

6 years agoMerge changes Icd3d09aa,I4b070964 am: a0661c4fdf
Erik Kline [Thu, 14 Sep 2017 08:17:00 +0000 (08:17 +0000)]
Merge changes Icd3d09aa,I4b070964 am: a0661c4fdf
am: d3f4a27c59

Change-Id: Ia53ed00cc596cdbeff9042d74cdc2852cd352cc9

6 years agoMerge changes Icd3d09aa,I4b070964
Erik Kline [Thu, 14 Sep 2017 08:14:09 +0000 (08:14 +0000)]
Merge changes Icd3d09aa,I4b070964
am: a0661c4fdf

Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642

6 years agoMerge changes Icd3d09aa,I4b070964
Treehugger Robot [Thu, 14 Sep 2017 08:10:25 +0000 (08:10 +0000)]
Merge changes Icd3d09aa,I4b070964

* changes:
  Include IPv6 DNS servers in wifi details
  Separate multiple DNS addresses with newlines.

6 years agoLog smart settings suggestion enabled/disabled state for A/B experiments
Soroosh Mariooryad [Fri, 11 Aug 2017 07:04:37 +0000 (00:04 -0700)]
Log smart settings suggestion enabled/disabled state for A/B experiments

Test: RunSettingsRoboTests
Bug: 64121058

Change-Id: I0cf4b4a0e8470cd40d38e8fe937cfb5f3e96f380
Merged-In: Iadfa575b9a21caecb515b9975d388ee0d0480c11

6 years agoInclude IPv6 DNS servers in wifi details
Erik Kline [Wed, 6 Sep 2017 09:05:48 +0000 (18:05 +0900)]
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 9adc5887490953c6d239a634d6ebca4cd3081dc6)

6 years agoMerge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev am...
Antony Sargent [Thu, 14 Sep 2017 03:39:01 +0000 (03:39 +0000)]
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev am: bc6dc5c20c
am: 151d5600b1

Change-Id: I60106dd55184e0ad48a216a71ab066849636ddb2

6 years agoMerge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev am: 7853f24405
jackqdyulei [Thu, 14 Sep 2017 03:38:24 +0000 (03:38 +0000)]
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev am: 7853f24405
am: 6f98ad5778

Change-Id: Iecc33e2d1e84a67891f6b8d6709bd48dd787dc1d

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 93e8800b21 -s ours
Bill Yi [Thu, 14 Sep 2017 03:37:34 +0000 (03:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 93e8800b21  -s ours
am: c899692641  -s ours

Change-Id: Ic8617044a387b5b11b86f9b8e84e4f5848decb9d

6 years agoMerge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
Antony Sargent [Thu, 14 Sep 2017 03:31:27 +0000 (03:31 +0000)]
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
am: bc6dc5c20c

Change-Id: I64d32e5ac1724ff4c79f1ea4516fa83492a39377

6 years agoMerge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
jackqdyulei [Thu, 14 Sep 2017 03:30:48 +0000 (03:30 +0000)]
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
am: 7853f24405

Change-Id: Ibf4e6c97267fa341913506d258802dc4c6d8d137

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Thu, 14 Sep 2017 03:29:57 +0000 (03:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 93e8800b21  -s ours

Change-Id: I54abc5cc4a026d0ec271d8d01989ab8ec944f4b7

6 years agoSeparate multiple DNS addresses with newlines.
Sundeep Ghuman [Tue, 29 Aug 2017 00:20:02 +0000 (17:20 -0700)]
Separate multiple DNS addresses with newlines.

Bug: b/65037256
Bug: 65037256
Test: make -j40 RunSettingsRoboTests
Merged-In: I676b5de60477f7c905b08b8bb361104e5f1e05b9
Merged-In: I61bcfc20d43133c12fb8fe78d7bd968af1ee59eb
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
(cherry picked from commit 2716e841be8e8bda36c451e1ba9651b37eead560)

6 years agoIntegrate with SettingsIntelligence
Fan Zhang [Thu, 17 Aug 2017 23:13:20 +0000 (16:13 -0700)]
Integrate with SettingsIntelligence

Bug: 64691432
Test: robotests
Change-Id: Idd20fd66f0289e0d0178bac02b1059c5554673f4

6 years agoMerge "Change the permission labels to lowercase."
TreeHugger Robot [Thu, 14 Sep 2017 00:23:05 +0000 (00:23 +0000)]
Merge "Change the permission labels to lowercase."

6 years agoMerge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
Antony Sargent [Thu, 14 Sep 2017 00:04:42 +0000 (00:04 +0000)]
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev

6 years agoClose the load screen faster on pre-quota devices.
Daniel Nishi [Tue, 12 Sep 2017 22:55:46 +0000 (15:55 -0700)]
Close the load screen faster on pre-quota devices.

Pre-quota devices can take an absurd time to load. By loading the screen
once the volume sizes load, we can just show "calculating..." for a
really long time instead of a loading screen.

Change-Id: Id8ab0609c2bc19531d530c6bdf6bff89c5bfac96
Fixes: 64150148
Test: Settings Robotest

6 years agoMerge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev

6 years agoChange the permission labels to lowercase.
Doris Ling [Wed, 13 Sep 2017 22:23:06 +0000 (15:23 -0700)]
Change the permission labels to lowercase.

In the summary for Apps permissions, change the list of permissions
lable to lowercase instead.

Change-Id: I5b3133c33de7110dbec6ab179c6f1308c4ed481e
Fixes: 65049565
Test: make RunSettingsRoboTests

6 years agoIntroduce StayAwakePreferenceController
jeffreyhuang [Tue, 12 Sep 2017 22:09:00 +0000 (15:09 -0700)]
Introduce StayAwakePreferenceController

 - Create new StayAwakePreferenceController
 - Create controller inside the DashboardFragment
 - Port logic from DevelopmentSettings into the controller

Bug: 34203528
Test: make RunSettingsRoboTests -j40
ROBOTEST_FILTER=StayAwakePreferenceControllerTest

Change-Id: I7642656fb2e323878face52f0a3c57fec1d85ac4

6 years agoMerge "Move search indexing into a separate class"
TreeHugger Robot [Wed, 13 Sep 2017 19:43:38 +0000 (19:43 +0000)]
Merge "Move search indexing into a separate class"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 19:34:27 +0000 (19:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Wed, 13 Sep 2017 18:18:19 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Sep 2017 16:45:46 +0000 (09:45 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I34c1747c9f05b04794b7f563fc19f53467f21980

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 13 Sep 2017 16:33:48 +0000 (09:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iead27f9c66c6bce2c1f3b27c29cf2c703da6dac6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoDefault apps settings disappear when switching to secondary user
Peng Du [Thu, 3 Aug 2017 11:35:53 +0000 (19:35 +0800)]
Default apps settings disappear when switching to secondary user

When switching to a secondary user, Settings will disable all extra
categories that aren't configured in SETTINGS_FOR_RESTRICTED.
As the result, Default apps settings disappear.
To fix this issue, AdvancedAppsActivity class of Default apps settings
should be added to SETTINGS_FOR_RESTRICTED.

Fixes: 65616610
Test: manual - switch to a secondary user
               and go to Settings > Apps & notifications.

Change-Id: Ie9f3b1d215e2e43bf25b8dd2971f86bd60e94d04

6 years agoMerge "Settings: Add laser sensor preference" into oc-mr1-dev am: 22eb007eea
Emilian Peev [Wed, 13 Sep 2017 09:52:30 +0000 (09:52 +0000)]
Merge "Settings: Add laser sensor preference" into oc-mr1-dev am: 22eb007eea
am: 11179290a2

Change-Id: I0575553117ca62c027a82aa69ecc0c1865f6c762

6 years agoMerge "Init the pref summary in onCreate()" into oc-mr1-dev am: 7420c095a9
jackqdyulei [Wed, 13 Sep 2017 09:50:48 +0000 (09:50 +0000)]
Merge "Init the pref summary in onCreate()" into oc-mr1-dev am: 7420c095a9
am: 55b71cf230

Change-Id: Iafccd00258950613f93f4021aafae38e808037b6

6 years agoMerge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev...
Xiangyu/Malcolm Chen [Wed, 13 Sep 2017 09:48:58 +0000 (09:48 +0000)]
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev am: 8b6fd21f1e
am: 5bf7af0154

Change-Id: I84e9b1f7a2e2beaf966e7a127cd83b6c81b32108

6 years agoMerge "Index the System status page" into oc-mr1-dev am: 6203bde8d3
Matthew Fritze [Wed, 13 Sep 2017 09:47:02 +0000 (09:47 +0000)]
Merge "Index the System status page" into oc-mr1-dev am: 6203bde8d3
am: 8896df965b

Change-Id: I70141cb7f89794f734a33b2f90e470e1554c3320

6 years agoMerge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev...
Rebecca Silberstein [Wed, 13 Sep 2017 09:45:52 +0000 (09:45 +0000)]
Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev am: b975e352a2
am: 91f5a63262

Change-Id: I7288e2082cb68299d6ada715711316d848657015

6 years agoMerge "Settings: Add laser sensor preference" into oc-mr1-dev
Emilian Peev [Wed, 13 Sep 2017 08:40:10 +0000 (08:40 +0000)]
Merge "Settings: Add laser sensor preference" into oc-mr1-dev
am: 22eb007eea

Change-Id: I34ab89bd2a175aa77a78a9a46aea75f148bab284

6 years agoMerge "Init the pref summary in onCreate()" into oc-mr1-dev
jackqdyulei [Wed, 13 Sep 2017 08:39:31 +0000 (08:39 +0000)]
Merge "Init the pref summary in onCreate()" into oc-mr1-dev
am: 7420c095a9

Change-Id: I3b06886495ba3ec6277c84051bee4974c004c9a1

6 years agoMerge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
Xiangyu/Malcolm Chen [Wed, 13 Sep 2017 08:39:05 +0000 (08:39 +0000)]
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
am: 8b6fd21f1e

Change-Id: I1e7c9235b424905f4a0d6fc219b2c8c1e6830cae

6 years agoMerge "Index the System status page" into oc-mr1-dev
Matthew Fritze [Wed, 13 Sep 2017 08:38:40 +0000 (08:38 +0000)]
Merge "Index the System status page" into oc-mr1-dev
am: 6203bde8d3

Change-Id: If4350a9cb90e995aa5095c77570055e464103879

6 years agoMerge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev
Rebecca Silberstein [Wed, 13 Sep 2017 08:38:14 +0000 (08:38 +0000)]
Merge "Revert back to isDualBandSupported() for Wifi tethering." into oc-mr1-dev
am: b975e352a2

Change-Id: I883ab8568ae0393e86de770af08cf7779f18b595

6 years agoMerge "Settings: Add laser sensor preference" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 07:19:35 +0000 (07:19 +0000)]
Merge "Settings: Add laser sensor preference" into oc-mr1-dev

6 years agoDon't need to authenticate fingerprint when the fingerprint list is empty.
edgar.huang [Wed, 13 Sep 2017 03:04:01 +0000 (11:04 +0800)]
Don't need to authenticate fingerprint when the fingerprint list is empty.

Enter into the fingerprint list screen and can authenticate fingerprint still when the list is empty.
Test: manual - enrolling some fingerprints and remove all fingerprintd, touch the fingerprint touch panel and no response.

6 years agoMerge "Init the pref summary in onCreate()" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 01:38:20 +0000 (01:38 +0000)]
Merge "Init the pref summary in onCreate()" into oc-mr1-dev

6 years agoMerge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev
Xiangyu/Malcolm Chen [Wed, 13 Sep 2017 01:07:29 +0000 (01:07 +0000)]
Merge "In ApnEditor, restore preference values after re-creating." into oc-mr1-dev

6 years agoRemoved unused use of setting launch stack id.
Wale Ogunwale [Wed, 13 Sep 2017 00:07:44 +0000 (17:07 -0700)]
Removed unused use of setting launch stack id.

Why are you setting to what is already the default?

Test: N/A
Change-Id: I507d526db96d5e595e00289eea9ec84dfb87556d

6 years agoMerge "Index the System status page" into oc-mr1-dev
TreeHugger Robot [Wed, 13 Sep 2017 00:06:27 +0000 (00:06 +0000)]
Merge "Index the System status page" into oc-mr1-dev

6 years agoMerge "Add OWNERS for folder bluetooth"
TreeHugger Robot [Tue, 12 Sep 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Add OWNERS for folder bluetooth"

6 years agoMerge "Add OWNERS for folder fuelgauge"
TreeHugger Robot [Tue, 12 Sep 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Add OWNERS for folder fuelgauge"

6 years agoMerge "Add OWNERS for folder users"
TreeHugger Robot [Tue, 12 Sep 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Add OWNERS for folder users"

6 years agoMerge "Add OWNERS for folder notification"
TreeHugger Robot [Tue, 12 Sep 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Add OWNERS for folder notification"

6 years agoMerge "Add OWNERS for folder wifi"
TreeHugger Robot [Tue, 12 Sep 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Add OWNERS for folder wifi"

6 years agoMerge "Add OWNERS for folder nfc"
TreeHugger Robot [Tue, 12 Sep 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Add OWNERS for folder nfc"