Commit Graph

2431 Commits

Author SHA1 Message Date
jackqdyulei
e6f052e928 Merge "Add owners to setting packages."
am: f82cd59476

Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f
2017-11-21 16:41:50 +00:00
jackqdyulei
d6a00cfa3f Add owners to setting packages.
Bug: 65294119
Fixes: 69384604
Test: Build

Change-Id: Ib4fddc1f04087671d8445fd967d4262287e5c4f3
Merged-In: I927052a73f639d0894600611cd5c79293f43ff5e
Merged-In: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
Merged-In: I24ec103ff5013ad416e3dfb1c548acd387b4ba64
Merged-In: If9fddc8b4e2e6d4d7db185ab16063e824323b9a7
Merged-In: I49159950521a013422b1087ea2c3e6cd5151457c
Merged-In: I69af58183c5b89af96c1a8808665fa506a620012
Merged-In: Ie9492f497824cd2b2727dde9d3a48452c72f1084
Merged-In: I2fd0249fd8b555e5ca93c3aec13857e6c74e157c
Merged-In: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
Merged-In: Icdcfaaf6cc7a1e1cf77e89a79d0425cab4405ffc
Merged-In: I697528ff260a0f8e54aa1188e35143e668800e7d
Merged-In: I1486782f476acaf1e2e4b66df57869409239986f
Merged-In: I804b50a38c877da80b5ef3251e16029259014152
Merged-In: I39eec9ebc1db2dc14669f27b17624394e25eb47f
Merged-In: I054a6df08046cda1c2f202390ed24839a6b10349
Merged-In: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Merged-In: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
2017-11-20 16:39:59 -08:00
Fan Zhang
6d5e7bf41f Merge "Catch exception when checking WifiDisplay availability"
am: 7a08901d1b

Change-Id: I426208a605e3771238bd91c135e47faf1b559e58
2017-11-16 01:33:31 +00:00
Fan Zhang
e0fdec2750 Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes: 68013053
Test: robotests
2017-11-15 15:12:14 -08:00
Xin Li
0599c79cf7 Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
2017-11-13 15:18:37 -08:00
Treehugger Robot
3c03207f9f Merge "Modify Comparator in ZonePicker" 2017-11-13 19:45:10 +00:00
tiansiming
3b8c4cd52e Modify Comparator in ZonePicker
The previous method "compareTo" isn't locale-sensitive, it cannot
sort the String in some other languages. So Collator is recommended
to be applyed here.

Bug: Sort doesn't work in some languages.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=ZonePickerComparatorTest

Change-Id: Id107ab938cceefc77f9fb6918a0445fc92a0fcb7
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-11-10 23:12:38 +00:00
Fan Zhang
83e7581690 Add a readme with instructions on running tests
Test: is a test
Change-Id: I5f3a4745a1b2376259b2aab8df58d8660c3fe0bc
2017-10-31 13:14:58 -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
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
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
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
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
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
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
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
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
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
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
Christine Franks
cb52e803bf Merge "Handle night display state when timezone changes" into oc-mr1-dev 2017-09-20 00:23:29 +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
TreeHugger Robot
a42e9351c5 Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev 2017-09-16 00:33:33 +00:00
Fan Zhang
135fecbee3 Use "mid" stable id for condition cards conditionally.
When there is no suggestion, use "mid" stableId instead of "top"
stableId for the header card.

This avoid an animation jank: when user swipes away a suggestion, the
condition summary header moves up instead of disappears then reappears.

Old behavior:

---  Suggestion ---   --swipe-->     /// Top Header ///
///  Mid Header ///

New behavior:

--- Suggestion ---   -- swipe -->   /// Mid Header ///
/// Mid Header ///

(Notice the header id change)

Change-Id: I63512d3d21382488e43dddb8819fabe4af40d101
Fixes: 65729560
Test: robotests
2017-09-15 14:56:27 -07:00
TreeHugger Robot
c872c14785 Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev 2017-09-15 21:40:04 +00:00
Lei Yu
eb6db6cc4d Revert "Turn on wakeupAlarm anomaly detector"
This reverts commit 1a49a8ab39.

Bug: 65738439
Test: RunSettingsRoboTests

Change-Id: Ifb2f72ba51e229b9387ff5a977bd51b229fcdf6a
2017-09-15 18:03:56 +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
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
Lei Yu
04ba0f5067 Merge "Update the bluetooth battery icon" into oc-mr1-dev 2017-09-14 21:31:13 +00: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
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
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
Erik Kline
d3f4a27c59 Merge changes Icd3d09aa,I4b070964
am: a0661c4fdf

Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642
2017-09-14 08:14:09 +00:00