OSDN Git Service
jackqdyulei [Thu, 28 Sep 2017 02:17:08 +0000 (02:17 +0000)]
Merge "Hide summary for type system" into oc-mr1-dev
am:
aadee0997c
Change-Id: I99a8cfefe4253ee223b91d2a3e0b9e7721e73ee4
TreeHugger Robot [Thu, 28 Sep 2017 02:11:54 +0000 (02:11 +0000)]
Merge "Hide summary for type system" into oc-mr1-dev
Doris Ling [Thu, 28 Sep 2017 02:05:10 +0000 (02:05 +0000)]
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
am:
d52c4482e4
Change-Id: I2206805a6b9dada11576a6e6667980585acc8472
TreeHugger Robot [Thu, 28 Sep 2017 01:58:47 +0000 (01:58 +0000)]
Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev
Chien-Yu Chen [Wed, 27 Sep 2017 23:33:01 +0000 (23:33 +0000)]
Settings: Show HAL HDR+ option in user build
am:
4d26fa03a8
Change-Id: I9b94c91b0a212ca727b9ba2ee7fc75902f2590e4
Chien-Yu Chen [Wed, 27 Sep 2017 18:38:15 +0000 (11:38 -0700)]
Settings: Show HAL HDR+ option in user build
Test: CameraHalHdrplusPreferenceControllerTest
Bug:
66919557
Change-Id: I02e89d34db56398e64e12616f34b8584df25c48b
Bill Yi [Wed, 27 Sep 2017 02:55:05 +0000 (02:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
56555e0403 -s ours
Change-Id: Ic83e7a755169fb3a2336c2f8d9489c22619ba46c
TreeHugger Robot [Wed, 27 Sep 2017 02:50:26 +0000 (02:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Lei Yang [Tue, 26 Sep 2017 23:43:48 +0000 (23:43 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am:
d2f42970bf am:
a40f7c0f5e
am:
17b5110539
Change-Id: I5d6198eca00d835e46d90c28e51251fbfd0cbd57
Lei Yang [Tue, 26 Sep 2017 23:39:35 +0000 (23:39 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled" am:
d2f42970bf
am:
a40f7c0f5e
Change-Id: Id39f30a8d87b5798f12c7e4129351f8735e61c6d
Bill Yi [Tue, 26 Sep 2017 23:36:49 +0000 (16:36 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I55b6e616f1dd402c1c0cb7d17f593d4b7d904d85
Lei Yang [Tue, 26 Sep 2017 23:35:26 +0000 (23:35 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
am:
d2f42970bf
Change-Id: Iecac3e7e8a04356f377a2d8886bb86f70c0ab96e
Treehugger Robot [Tue, 26 Sep 2017 23:21:44 +0000 (23:21 +0000)]
Merge "Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled"
Lei Yang [Mon, 13 Feb 2017 02:39:29 +0000 (10:39 +0800)]
Fix "Set up Wi-Fi NFC Tag" dialog cannot be scrolled
"Set up Wi-Fi NFC Tag" dialog cannot be scrolled and "Show password"
is not displayed when setting Font size and Display size to Largest.
To fix this issue, ScrollView should be added.
Fixes:
66936807
Test: manual - long tap a connected Wi-Fi AP and
tap "Write to NFC tag".
Change-Id: I3edcf3c2b9db47319e18405066bcb835b064b690
Rajeev Kumar [Tue, 26 Sep 2017 08:00:58 +0000 (08:00 +0000)]
Get rid of unnecessary KEY_RESTRICT_BACKGROUND preference.
am:
298ffee39e
Change-Id: Ia322a81e7fa521679d57a5d654c17af148e1ed68
Colin Cross [Tue, 26 Sep 2017 01:27:39 +0000 (01:27 +0000)]
Merge "Remove unnecessary core-oj library" am:
a37bf5616a am:
00c0d436f4
am:
d3802f9ff4
Change-Id: Ic4a6b40e2ff4a8a232b2f60c61765757262b2120
Colin Cross [Tue, 26 Sep 2017 01:23:12 +0000 (01:23 +0000)]
Merge "Remove unnecessary core-oj library" am:
a37bf5616a
am:
00c0d436f4
Change-Id: I88adb043f9fbd9d35ff4ba49c15bddb8125c7b1c
Colin Cross [Tue, 26 Sep 2017 01:18:50 +0000 (01:18 +0000)]
Merge "Remove unnecessary core-oj library"
am:
a37bf5616a
Change-Id: I9a2fa6cb15e5a908f37f6a85967f93419f5e22db
Treehugger Robot [Tue, 26 Sep 2017 01:12:30 +0000 (01:12 +0000)]
Merge "Remove unnecessary core-oj library"
Rajeev Kumar [Mon, 25 Sep 2017 18:34:10 +0000 (11:34 -0700)]
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
Adrian Roos [Mon, 25 Sep 2017 11:17:22 +0000 (11:17 +0000)]
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev
am:
eafcc98ab8
Change-Id: I3da818a64d47a397c2380cbd0ae36a714612d8f0
TreeHugger Robot [Mon, 25 Sep 2017 11:11:53 +0000 (11:11 +0000)]
Merge "FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme" into oc-mr1-dev
Colin Cross [Sun, 24 Sep 2017 05:09:31 +0000 (22:09 -0700)]
Remove unnecessary core-oj library
core-oj is part of the default java libraries and should not be
explicitly included by a package.
Test: m -j checkbuild
Change-Id: Idccd326ebbbfb9121ce556037e79c173bfd08580
Ng Zhi An [Sat, 23 Sep 2017 00:32:05 +0000 (00:32 +0000)]
Merge "Reflect device encryption status" into oc-mr1-dev
am:
3de3cf85f4
Change-Id: I0c64feb4eaa3b675cf0e6269279da04fe220f323
TreeHugger Robot [Sat, 23 Sep 2017 00:28:27 +0000 (00:28 +0000)]
Merge "Reflect device encryption status" into oc-mr1-dev
jackqdyulei [Fri, 22 Sep 2017 20:27:23 +0000 (13:27 -0700)]
Hide summary for type system
Bug:
66573821
Test: RunSettingsRoboTests
Change-Id: I9d0f829cbe3577665d1c3d593e2ae95c0bbfa8b6
Winson Chung [Fri, 22 Sep 2017 20:43:39 +0000 (20:43 +0000)]
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
am:
625b1dd13a
Change-Id: I5904804d9407a279de508fc8e071bc4132856545
Winson Chung [Fri, 22 Sep 2017 20:30:28 +0000 (20:30 +0000)]
Merge "Fixing issue with PiP settings not showing apps for other profiles." into oc-mr1-dev
Alison Cichowlas [Fri, 22 Sep 2017 18:23:34 +0000 (18:23 +0000)]
Notification importance/selected sound conflict fixes.
am:
ad1158169c
Change-Id: I7b921e8845bcd549790318cc074838a24fe22182
Ng Zhi An [Thu, 21 Sep 2017 00:51:28 +0000 (17:51 -0700)]
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".
Alison Cichowlas [Thu, 14 Sep 2017 19:01:29 +0000 (15:01 -0400)]
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
Adrian Roos [Fri, 22 Sep 2017 11:28:54 +0000 (13:28 +0200)]
FRP: Fix positioning of cancel button in ConfirmCredential screens with internal theme
Change-Id: I152a777b60ac6bfb4c8e1399e31cc0d4b2ab9758
Fixes:
65408626
Test: manual
Ng Zhi An [Fri, 22 Sep 2017 06:35:24 +0000 (06:35 +0000)]
Fix icon for sim card in settings
am:
097f4184fa
Change-Id: Ifdd84f460091d4d9e3310e70c31199c29320ecd6
Ng Zhi An [Wed, 20 Sep 2017 22:17:29 +0000 (15:17 -0700)]
Fix icon for sim card in settings
Change-Id: I1e235cad1712343e2990eab114fd2ef383aac77f
Bug:
65574460
Fixes:
65574460
Test: manually build and install Settings apk and open app to check
Doris Ling [Thu, 21 Sep 2017 19:29:53 +0000 (19:29 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0 am:
296c46404c
am:
c13415391b
Change-Id: I8e5050b2b4c5884b93ef56155f50d1fffcc13579
Doris Ling [Thu, 21 Sep 2017 19:27:20 +0000 (19:27 +0000)]
Merge "Fix NPE crash in UsageAccessDetails" am:
cd959f28a0
am:
296c46404c
Change-Id: I38483ed934187e185efc6a2e38ddde7cef0c4e8f
Doris Ling [Thu, 21 Sep 2017 19:24:52 +0000 (19:24 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
am:
cd959f28a0
Change-Id: I21f898f7ec8fd67d4f29d73491b4ac57cad7a252
Doris Ling [Thu, 21 Sep 2017 19:21:03 +0000 (19:21 +0000)]
Merge "Fix NPE crash in UsageAccessDetails"
Bill Yi [Thu, 21 Sep 2017 17:53:43 +0000 (17:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
17acd3d1c8 -s ours
Change-Id: I1813ac496b209342c8326a8107b2597691f16da1
TreeHugger Robot [Thu, 21 Sep 2017 17:48:00 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Winson Chung [Fri, 15 Sep 2017 21:48:46 +0000 (14:48 -0700)]
Fixing issue with PiP settings not showing apps for other profiles.
Bug:
65417722
Test: make -j40 RunSettingsRoboTests
Change-Id: If3562dc7c2ddf07e2fc19591238dc3a7b4e9dba7
Merged-In: I3c3fc7a68c172eeccc767cd04b1393b38b36073e
Julia Reynolds [Thu, 21 Sep 2017 11:36:50 +0000 (11:36 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
am:
a639e32289
Change-Id: Ib737041715e76a70d2c2fc703100cebbc95a2501
Julia Reynolds [Thu, 21 Sep 2017 11:33:09 +0000 (11:33 +0000)]
Merge "Sometimes there's no advanced settings" into oc-mr1-dev
tiansiming [Tue, 19 Sep 2017 10:16:19 +0000 (18:16 +0800)]
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>
Bill Yi [Thu, 21 Sep 2017 01:33:03 +0000 (18:33 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic65c57bb8ef17b6babd0dab69072b07a70e2b5ec
Doris Ling [Wed, 20 Sep 2017 22:36:14 +0000 (15:36 -0700)]
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
Jack He [Wed, 20 Sep 2017 21:43:24 +0000 (21:43 +0000)]
Bluetooth: remove unnecessary state tracking in BluetoothSummaryUpdater
am:
ac040e3b1f
Change-Id: I13a2bd7e40a94773fc0afe37d71d7ba60e2b625b
Jack He [Tue, 12 Sep 2017 23:26:06 +0000 (16:26 -0700)]
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
Fan Zhang [Wed, 20 Sep 2017 16:33:48 +0000 (16:33 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
am:
b9da1117d0
Change-Id: I4f027adb993a7971f83d3fd659a86dc4392ae57e
TreeHugger Robot [Wed, 20 Sep 2017 16:17:28 +0000 (16:17 +0000)]
Merge "Turn off WifiTetherSettings page." into oc-mr1-dev
Julia Reynolds [Wed, 20 Sep 2017 14:00:03 +0000 (10:00 -0400)]
Sometimes there's no advanced settings
Test: manual
Change-Id: Iea69ee04f36be51d073bbbd2c0d643c986eb8e89
Fixes:
65964886
Christine Franks [Wed, 20 Sep 2017 00:43:25 +0000 (00:43 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
am:
cb52e803bf
Change-Id: I16968b7e1572cb91afc2345a16437194b243a955
Christine Franks [Wed, 20 Sep 2017 00:23:29 +0000 (00:23 +0000)]
Merge "Handle night display state when timezone changes" into oc-mr1-dev
Ajay Nadathur [Tue, 19 Sep 2017 22:26:18 +0000 (22:26 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am:
dc66f96dda
Change-Id: I7ca36b1a5712b2ed3ec890bab376b9cc63dd1c8b
TreeHugger Robot [Tue, 19 Sep 2017 22:13:30 +0000 (22:13 +0000)]
Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
Sundeep Ghuman [Tue, 19 Sep 2017 21:14:05 +0000 (21:14 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
am:
77aeb2a0a7
Change-Id: I86e514f4a8d9546e4d2e60bc7967ba8bdf4e0a8c
TreeHugger Robot [Tue, 19 Sep 2017 20:56:34 +0000 (20:56 +0000)]
Merge "Gate WifiSettings verbose logging on toggle." into oc-mr1-dev
Ajay Nadathur [Fri, 15 Sep 2017 00:33:28 +0000 (17:33 -0700)]
Deferred setup banner updates intermittently
bug:
65641145
Test: Manually tested
Change-Id: I8661006ac1560dc1b6ce6f17205983003a231125
Christine Franks [Fri, 25 Aug 2017 21:02:42 +0000 (14:02 -0700)]
Handle night display state when timezone changes
Bug:
64458884
Test: make RunSettingsRoboTests -j100
Change-Id: I1f0c073b796aa6826c236757e19c6ff6d5cb7602
Fan Zhang [Mon, 18 Sep 2017 23:16:57 +0000 (16:16 -0700)]
Turn off WifiTetherSettings page.
Merged-In: If92798ddf075801e66cd97ecacff2f8df1e41985
Change-Id: Idab770509a8049907a256cce2b8f00f236c2dbdc
Fixes:
65852564
Test: rerun robotests
Test: new instrumentation test to check flag initial state
Bill Yi [Tue, 19 Sep 2017 01:02:54 +0000 (01:02 +0000)]
Import translations. DO NOT MERGE
am:
0a0d3d1b86 -s ours
Change-Id: I65871b7da2ee00f40b81803400ed9e28bf6e9479
Bill Yi [Mon, 18 Sep 2017 21:15:14 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I26590b243087f80f96d29114d82a45acb4070f73
Bill Yi [Sat, 16 Sep 2017 20:36:29 +0000 (20:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
e28f601df8 -s ours
Change-Id: I80cb3c4098d7aaa180254a2043bc0b89e6a3ba14
TreeHugger Robot [Sat, 16 Sep 2017 19:39:25 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sat, 16 Sep 2017 14:25:49 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Iee41ee02215987d998f059b69c085479fcefbf29
Fan Zhang [Sat, 16 Sep 2017 00:38:15 +0000 (00:38 +0000)]
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
am:
a42e9351c5
Change-Id: I21dc2b1866a7f9b0bef5eae84887780a985e1884
TreeHugger Robot [Sat, 16 Sep 2017 00:33:33 +0000 (00:33 +0000)]
Merge "Use "mid" stable id for condition cards conditionally." into oc-mr1-dev
Fan Zhang [Fri, 15 Sep 2017 20:22:04 +0000 (13:22 -0700)]
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
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
TreeHugger Robot [Fri, 15 Sep 2017 21:40:04 +0000 (21:40 +0000)]
Merge "Revert "Turn on wakeupAlarm anomaly detector"" into oc-mr1-dev
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
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
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
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
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
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
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
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
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
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
Daniel Nishi [Fri, 15 Sep 2017 00:58:59 +0000 (00:58 +0000)]
Merge "Fix work profile storage bugs." 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
Doris Ling [Thu, 14 Sep 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Default apps settings disappear when switching to secondary user"
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
Lei Yu [Thu, 14 Sep 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Update the bluetooth battery icon" into oc-mr1-dev
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
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
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
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."
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
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
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
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
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:
65559258,
65558758,
65559934
Test: Settings robotest and
34768986
Daniel Nishi [Thu, 14 Sep 2017 17:43:40 +0000 (17:43 +0000)]
Merge "Remove outdated storage search results." 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
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
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
Erik Kline [Thu, 14 Sep 2017 08:17:00 +0000 (08:17 +0000)]
Merge changes Icd3d09aa,I4b070964 am:
a0661c4fdf
am:
d3f4a27c59
Change-Id: Ia53ed00cc596cdbeff9042d74cdc2852cd352cc9
Erik Kline [Thu, 14 Sep 2017 08:14:09 +0000 (08:14 +0000)]
Merge changes Icd3d09aa,I4b070964
am:
a0661c4fdf
Change-Id: Id00f5518b6377fd0a6101b8393b4d68da3e02642
OSDN Git Service
