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
Fan Zhang
e3c2e51f67
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Fixes: 64339515
Bug: 38258991
Merged-In: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
Change-Id: Ia9935ef710cf1795d9ce464e0a9edff75be9c0c3
2017-09-26 17:10:03 -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
Fan Zhang
799e124d8e
Set device credential's Window flag to be SECURE.
...
This prevents showing any pattern/pin in recent list.
Fixes: 64339515
Bug: 38258991
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
(cherry picked from commit 6d479d99a9
)
Change-Id: I99c283dd4a1f2d579f565ccf5839a705e75ed6fc
2017-09-22 18:33:05 +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
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
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
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
TreeHugger Robot
e28f601df8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-16 19:39:25 +00:00
Bill Yi
59c56a56f8
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Iee41ee02215987d998f059b69c085479fcefbf29
2017-09-16 07:25:49 -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
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
Lei Yu
3a01adad6d
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
...
am: c872c14785
Change-Id: I0f56d26a42ef107be632d360e944975db8e73b1d
2017-09-15 21:45:00 +00: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
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
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
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
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
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
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
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
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
Antony Sargent
151d5600b1
Merge "Prevent brief flash of "Error" in hotspot status text" into oc-mr1-dev
...
am: bc6dc5c20c
Change-Id: I64d32e5ac1724ff4c79f1ea4516fa83492a39377
2017-09-14 03:31:27 +00:00
jackqdyulei
6f98ad5778
Merge "Turn on wakeupAlarm anomaly detector" into oc-mr1-dev
...
am: 7853f24405
Change-Id: Ibf4e6c97267fa341913506d258802dc4c6d8d137
2017-09-14 03:30:48 +00:00