Ng Zhi An
a81e3e3c8e
Fix icon for sim card in settings
...
am: 097f4184fa
Change-Id: Ifdd84f460091d4d9e3310e70c31199c29320ecd6
2017-09-22 06:35:24 +00:00
Ng Zhi An
097f4184fa
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
2017-09-21 15:20:36 -07: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
Doris Ling
cd959f28a0
Merge "Fix NPE crash in UsageAccessDetails"
2017-09-21 19:21:03 +00:00
Bill Yi
d516ba6a80
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 17acd3d1c8 -s ours
Change-Id: I1813ac496b209342c8326a8107b2597691f16da1
2017-09-21 17:53:43 +00:00
TreeHugger Robot
17acd3d1c8
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-21 17:48:00 +00: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
Bill Yi
e781dfa10c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ic65c57bb8ef17b6babd0dab69072b07a70e2b5ec
2017-09-20 18:33:03 -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
Bill Yi
f874590924
Import translations. DO NOT MERGE
...
am: 0a0d3d1b86 -s ours
Change-Id: I65871b7da2ee00f40b81803400ed9e28bf6e9479
2017-09-19 01:02:54 +00:00
Bill Yi
0a0d3d1b86
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I26590b243087f80f96d29114d82a45acb4070f73
2017-09-18 14:15:14 -07:00
Bill Yi
c30ad68d13
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: e28f601df8 -s ours
Change-Id: I80cb3c4098d7aaa180254a2043bc0b89e6a3ba14
2017-09-16 20:36:29 +00: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
Doris Ling
b24d054e08
Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea am: 0533f9ff4a
...
am: 18c3bde1d5
Change-Id: I3173e35feaf21bbc2dc0abd8eb561fc0251fa5ba
2017-09-15 03:33:54 +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
Zhijun He
c1857e9841
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
...
am: 1d45308e33
Change-Id: If97d1cddbb044fde52197cd08f0c34cad9abe901
2017-09-15 02:55:48 +00:00
Doris Ling
18c3bde1d5
Merge "Default apps settings disappear when switching to secondary user" am: 939265d6ea
...
am: 0533f9ff4a
Change-Id: Ib3175a8ffbba9e229bb86cb561c63342f20608bc
2017-09-15 02:06:37 +00:00
Doris Ling
0533f9ff4a
Merge "Default apps settings disappear when switching to secondary user"
...
am: 939265d6ea
Change-Id: I8f874e741b950079482c3c09eb7ec1c3ac5f57fd
2017-09-15 01:33:16 +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
TreeHugger Robot
1d45308e33
Merge "Revert "Settings: Enable HAL HDR+ by default"" into oc-mr1-dev
2017-09-14 22:30:11 +00:00
Doris Ling
939265d6ea
Merge "Default apps settings disappear when switching to secondary user"
2017-09-14 22:13:58 +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