pkanwar
63262f8975
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
...
am: ef2b35ad59
-s ours
Change-Id: I512a3b568246c2693a335c63a22e88d6d4b3edbe
2017-01-10 00:58:24 +00:00
Bill Yi
5d8d883ab1
Import translations. DO NOT MERGE
...
Change-Id: Iba9f6f945f3e421f8413967b392e04085561c7c3
Auto-generated-cl: translation import
2017-01-09 13:14:43 -08:00
pkanwar
ef2b35ad59
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
...
NPE was introduced as part of recent changes for Carrier Wifi networks.
This CL adds a null check.
Bug: 34050661
Change-Id: I585f6499b1ca06d9bd25ad3449f035c5a616a140
2017-01-09 12:21:22 -08:00
Pavlin Radoslavov
763830a0e6
Merge "Add Bluetooth Codec selection UI to the Developer Options" am: bb08073b6f
am: 0115cc702a
...
am: cc7a8d0b2c
Change-Id: Ieafda5fcbaa1252f34e06345f6f2bc0a509e4d68
2017-01-07 01:36:55 +00: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
Treehugger Robot
bb08073b6f
Merge "Add Bluetooth Codec selection UI to the Developer Options"
2017-01-07 01:19:33 +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
Ruchi Kandoi
e40f036ab3
Merge "Update Android Beam feature summary string" am: 27a59e1d2c
am: abe9a41d19
...
am: 662975d861
Change-Id: I6bad7c49519869dd60e130e5a31cf3514b0896c1
2017-01-05 18:14:58 +00:00
Ruchi Kandoi
662975d861
Merge "Update Android Beam feature summary string" am: 27a59e1d2c
...
am: abe9a41d19
Change-Id: I0a2cf7b82818102adc857cd38007a6e3ba7b4dd9
2017-01-05 18:11:54 +00:00
Ruchi Kandoi
abe9a41d19
Merge "Update Android Beam feature summary string"
...
am: 27a59e1d2c
Change-Id: I6edef06c6e0c94dc8c5d27003f19b60b2f6c5f4c
2017-01-05 18:08:22 +00:00
Treehugger Robot
27a59e1d2c
Merge "Update Android Beam feature summary string"
2017-01-05 18:04:12 +00:00
Bill Yi
590ee0a9f5
Import translations. DO NOT MERGE
...
am: cd3475f3d1
-s ours
Change-Id: I56384f858944a1607cadd5cea8f95a0e346b8a50
2017-01-05 10:16:47 +00:00
Bill Yi
cd3475f3d1
Import translations. DO NOT MERGE
...
Change-Id: I24410f77a5b2f4777bae8546e6709c47d971c992
Auto-generated-cl: translation import
2017-01-04 17:46:43 -08:00
Ruchi Kandoi
de2f8e7cc1
Update Android Beam feature summary string
...
Bug: 32183480
Test: compiles
Change-Id: I750e998ea73b10645666c7d080afe7320b705d47
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com >
2017-01-04 23:44:40 +00:00
Bill Yi
8678ee3d56
Import translations. DO NOT MERGE
...
am: 0be5ccb7cd
-s ours
Change-Id: I140febe4d647261616e2e3a186addac58a7a7064
2016-12-30 10:50:02 +00:00
Bill Yi
0be5ccb7cd
Import translations. DO NOT MERGE
...
Change-Id: Id7a36307bc781734e2647f01af6b07b5ed3a600a
Auto-generated-cl: translation import
2016-12-30 00:59:18 -08:00
Geoffrey Pitsch
db380fa9cb
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
...
When an app was blocked in the past, don't hide the controls
so the user is able to unblock the app. After unblocking, the
controls will be hidden the next time settings is visited.
Bug:32557897
Change-Id: I7ab17f647b197162932b131c41bb18cf5c18917d
2016-12-29 09:29:52 -05:00
gaochong
802b2f8561
Merge "Handle SubSettings instance leaks in Index.java" am: 527b2b220a
am: bf4a67ec0f
...
am: 28688c3ba3
Change-Id: I31cd7f083c529342ac2b07f054d82b4a9191937b
2016-12-28 19:03:46 +00: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
6446d2f0d8
Merge "Update VPN preference state after disallow configuring VPN policy has changed." am: 601d339868
am: 4395176792
...
am: 7779d9ee91
Change-Id: I7d7b4c181ba94d662f4d1946513fdaf6bdb6e9dd
2016-12-23 10:45:23 +00: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
Robin Lee
601d339868
Merge "Update VPN preference state after disallow configuring VPN policy has changed."
2016-12-23 10:29:03 +00:00
Nathan Harold
4bf8e85005
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
...
am: 94dee56f8d
Change-Id: I001ddbd12794ce1cb09826cf07c7d1993adf5c65
2016-12-23 01:19:55 +00:00
Nathan Harold
edb79b6222
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
...
am: d18b9fcde0
Change-Id: I37594a773398fea40a4aeb1a7611bf424624f075
2016-12-23 01:19:54 +00:00
Nathan Harold
94dee56f8d
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" into nyc-mr2-dev
2016-12-23 01:11:39 +00:00
Pankaj Kanwar
fbb870c94e
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
...
am: 642e48e527
Change-Id: I70ce7b3276eeb2be9f79b427a72d6fdb66e0ff74
2016-12-22 20:57:57 +00:00
pkanwar
7c4809a9c3
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
...
am: 675122ad51
-s ours
Change-Id: I3a78730b1af0d4e6eaa221cc0ccfbf28daeb57a6
2016-12-22 20:54:05 +00:00
Pankaj Kanwar
642e48e527
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
2016-12-22 20:41:55 +00:00
pkanwar
675122ad51
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
...
Bug: 31003437
Change-Id: Ieb6dfc0dc989068e151a1d0e376f56f67c9790b2
2016-12-22 09:39:12 -08:00
Bill Yi
e41df7b27c
Import translations. DO NOT MERGE
...
am: 54e5382136
-s ours
Change-Id: Ie55ae75412f7a8e89763679c2e179d1bae2c7619
2016-12-22 07:57:23 +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
Bill Yi
54e5382136
Import translations. DO NOT MERGE
...
Change-Id: Id3458a153f2db98b0035caac52eb1933cb9fd18f
Auto-generated-cl: translation import
2016-12-21 21:59:21 -08:00
nharold
5e322a0e4c
Merge "Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List" am: c98ca3da26
am: 9b0c6a525d
...
am: f44fd8d98d
Change-Id: I6845ff460b0b2d7c1960568b920685673dcba6fc
2016-12-21 21:59:18 +00: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
Youhan Wang
70b47859fa
DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
...
am: d9b3709fc1
Change-Id: I4f10d79d7dcd29a59c1ac0823f394cbb3e76256d
2016-12-21 00:37:24 +00:00
Youhan Wang
d9b3709fc1
DO NOT MERGE OMADM Trigger in *#*#INFO#*#* hidden menu.
...
Failed Treehugger automerge to master, will be cherry-picked to master
manually.
Bug:32874442
Change-Id: Ie64eb28671ec4afafd352d1f86b61c4ce1108338
2016-12-20 12:37:12 -08:00
Nathan Harold
d18b9fcde0
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
(cherry picked from commit f8555e4812
)
2016-12-20 11:34:05 -08: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
1fed0c6ae7
Merge "New pref toggle for network recommendations." am: a5249906ab
am: 2b03ffb264
...
am: 6061ca1b1a
Change-Id: I05753f7a5d54cd7707531c0a6cd9491c081454b3
2016-12-19 22:09:52 +00: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
Treehugger Robot
a5249906ab
Merge "New pref toggle for network recommendations."
2016-12-19 21:54:53 +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