Commit Graph

19189 Commits

Author SHA1 Message Date
Daniel Nishi
ab80b6ee9c Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7 am: 5973d32c77
am: f1dc9e65f1

Change-Id: Ib55d4b211b48f4a6e18034f60d91f43748aebe89
2017-10-15 04:30:40 +00:00
Daniel Nishi
f1dc9e65f1 Merge "Fix PrivateVolumeSettings be launched repeatedly" am: 31a7b2a4c7
am: 5973d32c77

Change-Id: I66747a250e7461cfc3fe04fb8228bb7fe7541b5a
2017-10-15 03:59:02 +00:00
Daniel Nishi
5973d32c77 Merge "Fix PrivateVolumeSettings be launched repeatedly"
am: 31a7b2a4c7

Change-Id: I2ee1fe82349968182b21a716a36ac716c0425080
2017-10-15 03:47:13 +00:00
Doris Ling
15d06244d3 Update tile limit for Sound settings.
am: 893bdba206

Change-Id: Ie73472f54d737ae8058ff95a65d16068750ace24
2017-10-15 02:43:43 +00:00
Doris Ling
893bdba206 Update tile limit for Sound settings.
Pull the notification and alarm ringtone out of the preference category
and update the tile limit to 1, so that only the first preference
category will be displayed initially.

Change-Id: I9ae7669fb2b688560a3fc228274ea44f225b262f
Fixes: 67750626
Test: visual
2017-10-13 11:45:30 -07:00
Glen Kuhne
91aeed6f55 Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev
am: 85f59ff42d

Change-Id: I0812fdee8ad859cb7efb56f980de4ca00ce3f5a5
2017-10-12 19:02:55 +00:00
TreeHugger Robot
85f59ff42d Merge "Allow 64 char HEX string PSKs in WifiSettingsUi" into oc-mr1-dev 2017-10-12 18:54:43 +00:00
Jeff Sharkey
8bdd94e292 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064

Change-Id: I21d3d925c533b9bbcb8bef5807662a1ad6186394
2017-10-11 21:26:28 +00:00
Jeff Sharkey
f4e2e26064 Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev
am: 9c39da39df

Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
2017-10-11 21:09:20 +00:00
Ajay Nadathur
8f273000f0 Hero suggestion is announced as disabled by talkback
am: e7f5107303

Change-Id: Idba7b963c3a158335eb59fecdf036f444d3808b8
2017-10-11 00:06:05 +00:00
Ajay Nadathur
e7f5107303 Hero suggestion is announced as disabled by talkback
- Removed calls to disable view. No ripple effect seen even after that
bug: 65851388
NOTE: cherry picked from master.
Merged-In: I876696a3e7351d586e6d045c8b2d07676f96ea9d
Test: manually tested

Change-Id: Iae377e763ed62b9448221843ed77b4605ad81379
2017-10-10 16:36:35 -07:00
Glen Kuhne
ddf705903e Allow 64 char HEX string PSKs in WifiSettingsUi
A check for valid PSKs in the settings UI didnt capture the 64 character
HEX string case. Added a check for it.

Test: tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java
Test: manual verification
Bug: 67492639
Change-Id: Ide738c4a67f23b613883b4a69f8264a0ffb8a0bc
2017-10-10 13:12:21 -07:00
Li YanJia
b699603f68 Fix PrivateVolumeSettings be launched repeatedly
Symptom:
After manually pull out the removable sd card or usb storage in
StorageSettings screen, it automatically moves to
PrivateVolumeSettings screen. This time, launching
PrivateVolumeSettings Activity is triggered six times and end-user
has to press back key six times to exit PrivateVolumeSettings
screen.

Root cause:
When sd card is pulled out, StorageSettings got three state change
event (UNMOUNTED, BAD_REMOVAL and onDiskDestroyed) through
StorageEventListener that triggers launching PrivateVolumeSettings
screen. In addition StorageSettings register the listener two
times, then StorageSettings receives six event in total.
Therefore, PrivateVolumeSettings screen is launched six times.

Solution:
Skip launching PrivateVolumeSettings if it's already triggered.
And removed the duplicated listener registration.

Bug: 67612903

Change-Id: Iabef51677a393977b7be29fc54aa050434213500
2017-10-10 12:49:32 +09:00
Andrew Sapperstein
95ebdd359d Merge "Update wakeup anomaly to exclude blacklisted wakeups." into oc-mr1-dev
am: 8bd54d4592

Change-Id: If099f1d66dcb83817d5b6c3e22d4ca3e550d5e71
2017-10-07 17:06:15 +00:00
TreeHugger Robot
8bd54d4592 Merge "Update wakeup anomaly to exclude blacklisted wakeups." into oc-mr1-dev 2017-10-07 17:03:32 +00:00
Andrew Sapperstein
f59cbb143c Update wakeup anomaly to exclude blacklisted wakeups.
Also disables all anomalies out of the box.

Provides the ability to ignore certain wakeups if blacklisted in
AnomalyDetectionPolicy. Compares each wakeup to the blacklist and
if it exists, does not include it in the count used to compare against
the threshold.

Change-Id: I038ca966aed5a030853b4786bc201397bf4f9b70
Merged-In: I4ef548bd0952be5f0d4e36df5698f287839d0704
Fixes: 67000019
Test: robotests
2017-10-06 21:01:21 -07:00
Eric Schwarzenbach
47e2bad574 Merge "Fix "Add Network" button on SavedAccessPoints page." into oc-mr1-dev
am: 85d5d62716

Change-Id: I1cf1ab0db44816d6fe00bcde1df4da5be006119e
2017-10-06 19:19:27 +00:00
TreeHugger Robot
85d5d62716 Merge "Fix "Add Network" button on SavedAccessPoints page." into oc-mr1-dev 2017-10-06 19:10:57 +00:00
Doris Ling
f6094b6964 Add space around the data usage warning spinner.
am: de603ea469

Change-Id: I95d0b90b7bc44a06ee6d30ec173cfcbf1496cd1f
2017-10-06 17:25:29 +00:00
Doris Ling
de603ea469 Add space around the data usage warning spinner.
Use a custom item layout for the data usage warning unit selection
spinner to make the touch target bigger.

Change-Id: I2d73dc3ab4c99cea8f8c791c8c1346240456d6aa
Fixes: 66414539
Test: visual
2017-10-05 00:12:43 +00:00
Svet Ganov
6adbad6937 Merge "Use new no overlay flag instead app ops" into oc-mr1-dev
am: 9cb867d6e3

Change-Id: Iffb4b44729d42539509593590999b73763a53ab5
2017-10-04 20:53:02 +00:00
TreeHugger Robot
9cb867d6e3 Merge "Use new no overlay flag instead app ops" into oc-mr1-dev 2017-10-04 20:38:58 +00:00
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
Jeff Sharkey
b5e93969a5 DO NOT MERGE. ActivityPicker shouldn't grant permissions.
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.

Test: builds, boots
Bug: 32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit 3f218e8431)
2017-10-03 20:30:15 +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
Svet Ganov
e53d1caedc Use new no overlay flag instead app ops
Test: updated DrawOverlayDetailsTest passes

bug:66936547

Change-Id: I7c17c95a2b44fd2ffd593a6eb03a16be034e9192
2017-10-02 21:00:43 -07:00
Eric Schwarzenbach
c069669ddf Fix "Add Network" button on SavedAccessPoints page.
The old onSubmit was a no-op. It now correctly pipes onSubmit to
WifiManager#save() with the new WifiConfiguration. On successful save,
it displays the new network in the list, and on failure, it displays a
toast indicating that the save action failed. Adds a test for the
WifiDialog behaviors on this page.

Bug: 66177765
Test: make RunSettingsRoboTests, manual - tested with Wifi enabled and
disabled, and with networks that were visible and not.
Change-Id: I27446aa49bc9efaf1ea1d6c6158928b62ce01ba2
Merged-In: I27446aa49bc9efaf1ea1d6c6158928b62ce01ba2
2017-10-02 15:05:59 -07: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