Commit Graph

19164 Commits

Author SHA1 Message Date
Salvador Martinez
f110a3c3ed Merge "Update support to not need dialog fragment" into oc-mr1-dev
am: 47dd955fad

Change-Id: I4863722709ad5d8b2adb7bf75ef89d3fd6c3cb3f
2017-10-04 18:42:12 +00:00
TreeHugger Robot
47dd955fad Merge "Update support to not need dialog fragment" into oc-mr1-dev 2017-10-04 18:35:32 +00:00
Salvador Martinez
bb4ef4d1b6 Update support to not need dialog fragment
This CL update support to not need the dialog fragment.

Test: robotests
Bug: 65552746
Change-Id: Ic4a21f05f04384795f4e616c2d6d914fc7dd3510
2017-10-03 12:28:43 -07:00
Soroosh Mariooryad
73679c124f Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev
am: 0193e69597

Change-Id: I5c65bd4965fa66150b3537e7654834630340ed5f
2017-10-03 18:36:05 +00:00
TreeHugger Robot
0193e69597 Merge "Fix ANR issue caused by sharedpref commit() on suggestion event logging" into oc-mr1-dev 2017-10-03 18:31:56 +00:00
Carsten Hauge
143b31959b Merge "Avoid NullPointerException when updating preference intents" am: c4b0fa5858 am: f38ed428dc
am: 5d2919907b

Change-Id: I542ba13fe05f1027e0199c2a57ade93c6dd0bccb
2017-10-02 18:10:49 +00:00
Carsten Hauge
5d2919907b Merge "Avoid NullPointerException when updating preference intents" am: c4b0fa5858
am: f38ed428dc

Change-Id: I3fcc041677b4d739952902076184a8fa1dd73dad
2017-10-02 18:06:32 +00:00
Carsten Hauge
f38ed428dc Merge "Avoid NullPointerException when updating preference intents"
am: c4b0fa5858

Change-Id: I403d380ebfbbb0c70fdf5b6c9ff51267a5163e6f
2017-10-02 18:03:40 +00:00
Carsten Hauge
f35cb6bc91 Avoid NullPointerException when updating preference intents
Comparisons changed on the intent action. Sometimes an account
preference intent does not have an action specified.

Fixes: 67075850
Test: manual - go to Settings > Users & accounts and tap an account.

Change-Id: I54cebbc983b55aa1487a122d37ccd5c79bbf519d
2017-10-02 02:01:49 +00:00
jackqdyulei
da9247d645 Merge "Hide summary for type system" into oc-mr1-dev
am: aadee0997c

Change-Id: I99a8cfefe4253ee223b91d2a3e0b9e7721e73ee4
2017-09-28 02:17:08 +00:00
TreeHugger Robot
aadee0997c Merge "Hide summary for type system" into oc-mr1-dev 2017-09-28 02:11:54 +00:00
Doris Ling
eccb0fcff9 Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
am: d52c4482e4

Change-Id: I2206805a6b9dada11576a6e6667980585acc8472
2017-09-28 02:05:10 +00:00
TreeHugger Robot
d52c4482e4 Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev 2017-09-28 01:58:47 +00:00
Chien-Yu Chen
f0c328ed78 Settings: Show HAL HDR+ option in user build
am: 4d26fa03a8

Change-Id: I9b94c91b0a212ca727b9ba2ee7fc75902f2590e4
2017-09-27 23:33:01 +00:00
Chien-Yu Chen
4d26fa03a8 Settings: Show HAL HDR+ option in user build
Test: CameraHalHdrplusPreferenceControllerTest
Bug: 66919557
Change-Id: I02e89d34db56398e64e12616f34b8584df25c48b
2017-09-27 14:03:12 -07:00
Rajeev Kumar
49034b4796 Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
am: 298ffee39e

Change-Id: Ia322a81e7fa521679d57a5d654c17af148e1ed68
2017-09-26 08:00:58 +00:00
Rajeev Kumar
298ffee39e Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
This preference is not needed for Data plan settings page. This change
fixes the NPE which happens because we try to remove a preference which
is not added to the settings preference fragment.
Test: make RunSettingsRoboTests -j40
Bug: 64068792

Change-Id: Ibbcf1637b8aed1a94542ea3786170f2f318df4a9
2017-09-25 11:34:10 -07:00
Ng Zhi An
7c94fcc9bc Merge "Reflect device encryption status" into oc-mr1-dev
am: 3de3cf85f4

Change-Id: I0c64feb4eaa3b675cf0e6269279da04fe220f323
2017-09-23 00:32:05 +00:00
TreeHugger Robot
3de3cf85f4 Merge "Reflect device encryption status" into oc-mr1-dev 2017-09-23 00:28:27 +00:00
Soroosh Mariooryad
2aab11772d Fix ANR issue caused by sharedpref commit() on suggestion event logging
Test: RunSettingsRoboTests
Fixes: 66719302

Change-Id: I5e99a279d5c72409b8ca982148396f7d1e0d46b7
2017-09-22 16:10:13 -07:00
jackqdyulei
0b6a3bc9c4 Hide summary for type system
Bug: 66573821
Test: RunSettingsRoboTests
Change-Id: I9d0f829cbe3577665d1c3d593e2ae95c0bbfa8b6
2017-09-22 13:45:51 -07:00
Winson Chung
078d01c8c1 Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
am: 625b1dd13a

Change-Id: I5904804d9407a279de508fc8e071bc4132856545
2017-09-22 20:43:39 +00:00
Winson Chung
625b1dd13a Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev 2017-09-22 20:30:28 +00:00
Alison Cichowlas
6c76550a73 Notification importance/selected sound conflict fixes.
am: ad1158169c

Change-Id: I7b921e8845bcd549790318cc074838a24fe22182
2017-09-22 18:23:34 +00:00
Ng Zhi An
f0c0320c82 Reflect device encryption status
On the Settings & Location settings page, the
encryption_and_credential preference will statically show
"Phone encrypted" regardless of encryption status of phone.

This change changes Settings to check for encryption status
of the phone and update the summary as required.
This requires adding a string saying that the device is not encrypted.
And translations will have to happen after this is merged.

Change-Id: I2f5bd281d8f1ed32801446fcdd453ebbaa04bd32
Bug: 65535239
Fixes: 65535239
Test: manual, I had a gobo phone that was not encrypted,
made sure that it said "Phone not encrypted", then tap through
to encrypt phone, and then check that it is now "Phone encrypted".
2017-09-22 09:48:43 -07:00
Alison Cichowlas
ad1158169c Notification importance/selected sound conflict fixes.
- When you've selected "Silent" as your sound, update notification
importance messaging to match.
- When you explicitly move from a silent type of notifications to a
loud type, but have "Silent" selected as the sound, change the
sound to the default notification sound also.

Change-Id: I462785d593e1d6c7d1e87388aeee1bdcbcf6aa3d
Fixes: 63109928
Test: RunSettingsRoboTests, manual
2017-09-22 10:55:27 -04:00
Doris Ling
913d1667ce Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0 am: 296c46404c
am: c13415391b

Change-Id: I8e5050b2b4c5884b93ef56155f50d1fffcc13579
2017-09-21 19:29:53 +00:00
Doris Ling
c13415391b Merge "Fix NPE crash in UsageAccessDetails" am: cd959f28a0
am: 296c46404c

Change-Id: I38483ed934187e185efc6a2e38ddde7cef0c4e8f
2017-09-21 19:27:20 +00:00
Doris Ling
296c46404c Merge "Fix NPE crash in UsageAccessDetails"
am: cd959f28a0

Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
2017-09-21 19:24:52 +00:00
Winson Chung
e8b8633181 Fixing issue with PiP settings not showing apps for other profiles.
Bug: 65417722
Test: make -j40 RunSettingsRoboTests
Change-Id: If3562dc7c2ddf07e2fc19591238dc3a7b4e9dba7
Merged-In: I3c3fc7a68c172eeccc767cd04b1393b38b36073e
2017-09-21 09:40:42 -07:00
Julia Reynolds
b0f3f6ce05 Merge "Sometimes there's no advanced settings" into oc-mr1-dev
am: a639e32289

Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501
2017-09-21 11:36:50 +00:00
Julia Reynolds
a639e32289 Merge "Sometimes there's no advanced settings" into oc-mr1-dev 2017-09-21 11:33:09 +00:00
tiansiming
39de7aedee Fix NPE crash in UsageAccessDetails
mPackageInfo will be null in RefreshUI method in UsageAccessDetails.java

Bug:https://issuetracker.google.com/issues/65872768
Test:As explained in the link above

Change-Id: I8bd4b822cfe5d8a3347ca7f5886605cbdfb9b8b6
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-09-21 14:12:50 +08:00
Doris Ling
308a2d93fb Move listening to brightness changes to onStart/onStop.
Currently, we register the brightness listener in onResume() and stop
listening in onPause(). When we launch the brightness selection bar, the
display settings is paused, and hence we don't get the brightness
update, and only refresh the percentage when the brightness bar is
dismissed.

Moving the listening logic to onStart()/onStop() instead, so that we
will get the updates all the time when the display settings is launched.

Change-Id: I6ed9c8485fdf7721374baff5cea5f7011b63d7ea
Fixes: 65981061
Test: make RunSettingsRoboTests
2017-09-20 15:36:14 -07:00
Jack He
1197438540 Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
am: ac040e3b1f

Change-Id: I13a2bd7e40a94773fc0afe37d71d7ba60e2b625b
2017-09-20 21:43:24 +00:00
Jack He
ac040e3b1f Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
* LocalBluetoothAdapter is already a cache of BluetoothAdapter and its
  methods should be used directly to obtain states instead of caching them
  in BluetoothSummaryUpdater
    - Use LocalBluetoothAdapter.isEnabled() to check whether Bluetooth
      is enabled
    - Use LocalBluetoothAdapter.getBondedDevices() to get list of bonded
      devices
* BluetoothDevice is a stable Bluetooth API and its methods should not
  incur large latency. We should use API methods as much as possible to
  avoid intermediate wrappers
    - Use BluetoothDevice.isConnected() to check if a device is connected
* Add more logging messages in error conditions
* Show status as "Not Connected" when there is a state mismatch (i.e.
  adapter says it is connected, but no bonded device is connected)
* Updated unit tests to reflect the latest behavior

Bug: 65591907
Test: make, unit test, pair with Bluetooth devices, check Settings UI
Change-Id: I0fa54959c8bed8ac67a935f150785ba8197d0411
2017-09-20 11:35:19 -07:00
Fan Zhang
a404be0032 Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
am: b9da1117d0

Change-Id: I4f027adb993a7971f83d3fd659a86dc4392ae57e
2017-09-20 16:33:48 +00:00
TreeHugger Robot
b9da1117d0 Merge "Turn off WifiTetherSettings page." into oc-mr1-dev 2017-09-20 16:17:28 +00:00
Julia Reynolds
a25e54fdf6 Sometimes there's no advanced settings
Test: manual
Change-Id: Iea69ee04f36be51d073bbbd2c0d643c986eb8e89
Fixes: 65964886
2017-09-20 10:00:03 -04:00
Christine Franks
92f7794d90 Merge "Handle night display state when timezone changes" into oc-mr1-dev
am: cb52e803bf

Change-Id: I16968b7e1572cb91afc2345a16437194b243a955
2017-09-20 00:43:25 +00:00
Christine Franks
cb52e803bf Merge "Handle night display state when timezone changes" into oc-mr1-dev 2017-09-20 00:23:29 +00:00
Ajay Nadathur
b4b657179f Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am: dc66f96dda

Change-Id: I7ca36b1a5712b2ed3ec890bab376b9cc63dd1c8b
2017-09-19 22:26:18 +00:00
TreeHugger Robot
dc66f96dda Merge "Deferred setup banner updates intermittently" into oc-mr1-dev 2017-09-19 22:13:30 +00:00
Sundeep Ghuman
ea98db9946 Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
am: 77aeb2a0a7

Change-Id: I86e514f4a8d9546e4d2e60bc7967ba8bdf4e0a8c
2017-09-19 21:14:05 +00:00
TreeHugger Robot
77aeb2a0a7 Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev 2017-09-19 20:56:34 +00:00
Ajay Nadathur
a7ca53bc41 Deferred setup banner updates intermittently
bug: 65641145
Test: Manually tested
Change-Id: I8661006ac1560dc1b6ce6f17205983003a231125
2017-09-19 18:50:25 +00:00
Christine Franks
c6c299bdbb Handle night display state when timezone changes
Bug: 64458884
Test: make RunSettingsRoboTests -j100

Change-Id: I1f0c073b796aa6826c236757e19c6ff6d5cb7602
2017-09-19 10:54:13 -07:00
Fan Zhang
c8bff87a9f Turn off WifiTetherSettings page.
Merged-In: If92798ddf075801e66cd97ecacff2f8df1e41985
Change-Id: Idab770509a8049907a256cce2b8f00f236c2dbdc
Fixes: 65852564
Test: rerun robotests
Test: new instrumentation test to check flag initial state
2017-09-19 10:16:38 -07:00
Fan Zhang
3f070569a6 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
am: a42e9351c5

Change-Id: I21dc2b1866a7f9b0bef5eae84887780a985e1884
2017-09-16 00:38:15 +00:00
TreeHugger Robot
a42e9351c5 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev 2017-09-16 00:33:33 +00:00