Commit Graph

13370 Commits

Author SHA1 Message Date
Marie Janssen
60eb5503e8 Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9
am: a2e068a2b4

Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8
2017-01-25 16:08:01 +00:00
Marie Janssen
a2e068a2b4 Merge "Make headset icons consistent before / after pairing"
am: 690bdb22c9

Change-Id: I64a9a3a7d8a2f110ee1809af33583f82fc4b4f57
2017-01-25 16:06:00 +00:00
Xiaodong Xu
262f7fba9a Make headset icons consistent before / after pairing
Previously A2DP would be shown before pairing with a HFP device.

bug: 30677445
Change-Id: I0e9ab17197e6ee099d890d5368def36a14ca8344
2017-01-23 17:25:27 +00:00
Robin Lee
185275e0ad Merge "Clear VPN after Clear credentials if VPN is being established" am: 4ce19f5c4f
am: fde3c6d74a

Change-Id: Id20c96f550ecf7c05926eaea8a29575aeb8aaa07
2017-01-19 23:23:37 +00:00
Robin Lee
fde3c6d74a Merge "Clear VPN after Clear credentials if VPN is being established"
am: 4ce19f5c4f

Change-Id: Ib35450b0c389da1bbba311c05d1d0346eb612b9e
2017-01-19 23:13:04 +00:00
Robin Lee
4ce19f5c4f Merge "Clear VPN after Clear credentials if VPN is being established" 2017-01-19 23:02:21 +00:00
Pavlin Radoslavov
4dac712d7c Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02
am: 058533ae25

Change-Id: I49b4565644c584a69897f4b642a1b308fe9df0f0
2017-01-18 20:29:44 +00:00
Pavlin Radoslavov
058533ae25 Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
am: b057b2da02

Change-Id: I892ea30d6fb15ba10859cd48788260e5ad8ad380
2017-01-18 20:25:52 +00:00
Tamas Berghammer
5a638a6ad1 DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
This reverts commit fbd5f5fdce.

Change-Id: I769f7a0f509996ccc39fd1c628cad7e5ec1202bf
2017-01-18 19:28:11 +00:00
Pavlin Radoslavov
dd39c073d6 Update/cleanup Bluetooth Codec strings in Developer Settings
* Use the summary strings instead of the titles strings as appropriate.
* Use proper translatable strings instead of hard-coded "Streaming: "
  embedded string.

Test: UI visual observation
Change-Id: I0222afc30c75e68e2568c33c781755802d86c502
2017-01-18 10:35:35 -08:00
insight.lee
03159e4c85 Clear VPN after Clear credentials if VPN is being established
1. There is no way to disconnect VPN after 'Clear credentials'
without removing whole Internet connection because VPN profile to
disconnect is removed when Clear credentials.

2. This commit checks whether VPN is being established or not when
Clear credentials and disconnect VPN if VPN is being established.
Lastly, this shows a toast message to inform VPN disconnected.

Test: manual - took a photo

Signed-off-by : Sungmin Lee <insight.lee@lge.com>
Bug: 29093779

Change-Id: Id5ea01c8731b3b0fca2a31d9d84e8c103952b377
2017-01-18 10:44:57 +09:00
Tamas Berghammer
fbd5f5fdce Update package names to work with the proto3 compiler
Bug: b/28974522
Change-Id: I5f3adf4946ee4ba1e09e4f40afe83c151405972a
(cherry picked from commit 265d3c2a0c)
2017-01-11 11:28:10 +00:00
Pavlin Radoslavov
216dcdc9dc Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06
am: 6e154cfb98

Change-Id: I985957eb0322dc13571705f9cc8d5abe65a931bb
2017-01-11 06:21:10 +00:00
Pavlin Radoslavov
6e154cfb98 Merge "Moved the Bluetooth-related default config init within onCreate()"
am: ab9e269d06

Change-Id: Ic0d0d4b6d63b25afafae35b81686e746939646fd
2017-01-11 06:15:39 +00:00
Pavlin Radoslavov
0a63e8b768 Moved the Bluetooth-related default config init within onCreate()
This should avoid potential crashes in case somehow onCreateView() is
called without onCreate() being called first.

Test: Manual UI interaction with Developer Settings
Bug: 34192829
Change-Id: Iaf46d05f30d20f98727c4dbfb91feef8509c92f7
2017-01-10 23:52:06 +00:00
Yanhong Shen
8b1f115942 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am: f952a87060
am: a9e9bf20e8

Change-Id: Ia45623e60a3a774b3b21dd58d350f3c408aaff20
2017-01-10 21:28:47 +00:00
Yanhong Shen
a9e9bf20e8 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off"
am: f952a87060

Change-Id: I0da164fbdbb04e54be2a26df85b8fcc1f58192e5
2017-01-10 21:24:19 +00:00
Treehugger Robot
f952a87060 Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" 2017-01-10 21:15:55 +00:00
Yanhong Shen
ee9393582e Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off
When Wi-Fi is off, Advanced menus below should be disabled:
1. "Wi-Fi Direct"
2. "WPS Push Button"
3. "WPS Pin Entry"
in Settings->Wi-Fi->Advanced.

Bug:31102679
Test: Test with the device

Change-Id: I5af4c18512c991211eb42ef759e00917828f1b4c
2017-01-10 16:53:16 +09:00
Pavlin Radoslavov
cc7a8d0b2c Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bb08073b6f
am: 0115cc702a

Change-Id: I8d2e73d3c91ac18005f8e6f74e39c81e84ad41c3
2017-01-07 01:28:45 +00:00
Pavlin Radoslavov
0115cc702a Merge "Add Bluetooth Codec selection UI to the Developer Options"
am: bb08073b6f

Change-Id: I1586182f52b726a56c92d2ed35e1e6dd6eff237e
2017-01-07 01:24:43 +00:00
Pavlin Radoslavov
c65956efc8 Add Bluetooth Codec selection UI to the Developer Options
Test: A2DP streaming to headsets and manual UI interaction
Bug: 30958229
Change-Id: I75027200561e6c51fa767c427ed09b647757d0ab
2017-01-06 15:44:55 -08:00
gaochong
28688c3ba3 Merge "Handle SubSettings instance leaks in Index.java" am: 527b2b220a
am: bf4a67ec0f

Change-Id: I89d30398cfe13e72ccbcbb92d5d4e0eda5f350ae
2016-12-28 18:55:47 +00:00
gaochong
bf4a67ec0f Merge "Handle SubSettings instance leaks in Index.java"
am: 527b2b220a

Change-Id: Iccfeef38ca133bb63708b9f6ce90c457aadf62f6
2016-12-28 18:48:16 +00:00
Treehugger Robot
527b2b220a Merge "Handle SubSettings instance leaks in Index.java" 2016-12-28 18:43:26 +00:00
gaochong
e4395bd751 Handle SubSettings instance leaks in Index.java
Index's constructor will hold context of caller.
context.getApplicationContext() instead of context to prevent activity
leaks.

Bug: https://code.google.com/p/android/issues/detail?id=223322

Test: manual-start a new activity call Index constructor ,then pressed
back.

Change-Id: Ic12af62f9b718d328610a57985f64ca4629bab99
Signed-off-by: gaochong <gaochong@xiaomi.com>
2016-12-28 09:18:15 +08:00
Robin Lee
7779d9ee91 Merge "Update VPN preference state after disallow configuring VPN policy has changed." am: 601d339868
am: 4395176792

Change-Id: Ie71a58c50fde7c5ecc4f80dfe5eb854428044480
2016-12-23 10:39:24 +00:00
Robin Lee
4395176792 Merge "Update VPN preference state after disallow configuring VPN policy has changed."
am: 601d339868

Change-Id: I94666d5f7812b15432b44ed50d8d396b373d3e69
2016-12-23 10:33:22 +00:00
insight.lee
7c4d52c570 Update VPN preference state after disallow configuring VPN policy has changed.
1. When Settings > More and change disallow configuring VPN policy
   and resume Settings, update VPN preference state.

2. When Settings > More > VPN and change disallow configuring VPN policy
   and resume VPN Settings, update its state.

Test: manual

Signed-off-by : Sungmin Lee <insight.lee@lge.com>

Change-Id: I4f3c85733ca6ba05cba46e2f4854f54a42b10c21
2016-12-22 16:14:48 +09:00
nharold
f44fd8d98d Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26
am: 9b0c6a525d

Change-Id: I94f2d7b9234e4fb6a2bfe15171a5145f446a0233
2016-12-21 21:53:18 +00:00
nharold
9b0c6a525d Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List"
am: c98ca3da26

Change-Id: Ic7b16572aab3a3d10ee06d1810ce0aa05a9e5b1d
2016-12-21 21:49:04 +00:00
nharold
c98ca3da26 Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" 2016-12-21 21:40:21 +00:00
Nathan Harold
f8555e4812 Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
To facilitate user recovery from issues where the band mode
list is incomplete and may not report the full list of bands,
the user should *always* have the ability to set the band mode
selection to AUTOMATIC.

Bug: 28124606
Test: compilation, UI check
Change-Id: Ib961d9b058ade5a51dfec0777971c8c98dee2033
2016-12-19 18:04:52 -08:00
Jeremy Joslin
6061ca1b1a Merge "New pref toggle for network recommendations." am: a5249906ab
am: 2b03ffb264

Change-Id: Ie4f4255740559a3018ba84df0084ff94995aa87d
2016-12-19 22:06:22 +00:00
Jeremy Joslin
2b03ffb264 Merge "New pref toggle for network recommendations."
am: a5249906ab

Change-Id: I7f39f341077bcc403c06d08a87d394f0f25f6356
2016-12-19 22:02:23 +00:00
Jeremy Joslin
fbcff7a6b2 New pref toggle for network recommendations.
Adding a new toggle to control whether network
recommendations are enabled.

Removed the "Use open networks" pref and its associated strings
and components as it's no longer needed.

Test: Built and ran.
BUG: 33549591
BUG: 33270391
Change-Id: I03069ca30d06089600ca958f8da117564189f839
Merged-In: I7248ac32e0598d82107c150372c1fe4e9e2243a5
Merged-In: I82eed6dc7daef1c622ea4e33ce42c331e0cd786d
2016-12-18 10:33:28 -08:00
Zhendong Yang
8711f4055d Merge "Fix crash when rotating HighPowerDetail dialog" am: 783ff43769
am: 7598c6201d

Change-Id: I97e9ef07df912e7bac3c4657272feab943bcb84e
2016-12-14 05:46:08 +00:00
Zhendong Yang
7598c6201d Merge "Fix crash when rotating HighPowerDetail dialog"
am: 783ff43769

Change-Id: Ie4f4856f6e4b1bb4970013b2425bb39d34383859
2016-12-14 05:38:34 +00:00
Treehugger Robot
783ff43769 Merge "Fix crash when rotating HighPowerDetail dialog" 2016-12-14 05:30:16 +00:00
Svetoslav Ganov
c6a074c80d DO NOT MERGE Add Bluetooth toggle prompts - settings
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749
Change-Id: I0b9065446f9d0cfb819065eaf2dc160eb1c1f7ec
2016-12-12 09:44:39 -08:00
Zhendong Yang
cb911e3402 Fix crash when rotating HighPowerDetail dialog
When rotating the device, the Activity of the target
Fragment become null. So NullPointerException occurs.
The dialog should check if the Activity is null
before calling onActivityResult().

Bug: 28333723
Test: manual - go to Settings > Apps > Clock,
               click Battery optimization and rotate device

Change-Id: I7f68d6ece7d169fd96d04c1788e55ee506aae1ae
2016-12-12 20:55:40 +09:00
xiaocheng.x.wang
2366d4dcfd Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116
am: 2d38abb49a

Change-Id: Ic105a97e7ee4d56f16dc8f67d2b09a6ebd55b3ba
2016-12-09 21:02:45 +00:00
Treehugger Robot
5c6e7a2116 Merge "Fix apn can't be updated when pressing back key" 2016-12-09 20:50:39 +00:00
Amin Shaikh
7c8af0aedc Merge "Refactor NetworkScoreAppManager for testing." am: 512368a22e
am: 3140bb5ace

Change-Id: I61fa13f1537465bf61ec65183d3844b2a2ffd001
2016-12-01 02:21:13 +00:00
Amin Shaikh
3140bb5ace Merge "Refactor NetworkScoreAppManager for testing."
am: 512368a22e

Change-Id: I597c960d5e56014b23b280e1e73e324efa77f8fb
2016-12-01 02:11:06 +00:00
Amin Shaikh
f91ac62756 Refactor NetworkScoreAppManager for testing.
Test: manually running app
Change-Id: Icd828886b7181529fa2bf414ba631bce6d1b4d44
2016-11-29 10:17:34 -08:00
Fan Zhang
b69ec294c2 Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481

Change-Id: I1ba3f6f34e010b95e1a86d6272c82adcee72117a
2016-11-23 23:29:22 +00:00
Steven Ng
26a3c28735 Nexus imprint setting is missing while adding corp account from SUW am: 378dec1495
am: 046a63450f

Change-Id: I7cbb27a7aa4a1d42dce52ef998ffe79aaa322ab4
2016-11-23 23:28:38 +00:00
Jerry Zhang
fd764ac0e3 Refactor setCurrentFunction and setUsbDataUnlocked into one method am: a1b60e629f
am: a75fa91247

Change-Id: I70fdc7a2d4bfa40e315a4de172dbcee22d666cc6
2016-11-17 00:24:50 +00:00
Jerry Zhang
a75fa91247 Refactor setCurrentFunction and setUsbDataUnlocked into one method
am: a1b60e629f

Change-Id: I0ed28df5f24e7fe545f968c4d65cfc0494b57ebd
2016-11-17 00:09:38 +00:00