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
0cc9fd4b82
Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06 am: 6e154cfb98
...
am: 216dcdc9dc
2017-01-11 06:27:09 +00:00
Pavlin Radoslavov
216dcdc9dc
Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06
...
am: 6e154cfb98
2017-01-11 06:21:10 +00:00
Pavlin Radoslavov
6e154cfb98
Merge "Moved the Bluetooth-related default config init within onCreate()"
...
am: ab9e269d06
2017-01-11 06:15:39 +00:00
Treehugger Robot
ab9e269d06
Merge "Moved the Bluetooth-related default config init within onCreate()"
2017-01-11 06:07:40 +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
67ba7fc936
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am: f952a87060 am: a9e9bf20e8
...
am: 8b1f115942
2017-01-10 21:33:49 +00:00
Yanhong Shen
8b1f115942
Merge "Some Wi-Fi Menus like WPS should be disabled when Wi-Fi is off" am: f952a87060
...
am: a9e9bf20e8
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
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
Geoffrey Pitsch
5e36b66c91
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
...
am: 6688dae166
2017-01-10 19:12:26 +00:00
Geoffrey Pitsch
1eefc78280
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
...
am: db380fa9cb
2017-01-10 19:12:25 +00:00
Geoffrey Pitsch
6688dae166
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
2017-01-10 19:06:01 +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
Bill Yi
7a490316e0
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: adce1145a9
2017-01-10 07:27:47 +00:00
Bill Yi
ff2cdd084a
Import translations. DO NOT MERGE
...
am: 5d8d883ab1
2017-01-10 07:27:45 +00:00
TreeHugger Robot
adce1145a9
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-01-10 07:18:42 +00:00
pkanwar
63262f8975
DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
...
am: ef2b35ad59
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
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
2017-01-07 01:28:45 +00:00
Pavlin Radoslavov
0115cc702a
Merge "Add Bluetooth Codec selection UI to the Developer Options"
...
am: bb08073b6f
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
2017-01-05 18:14:58 +00:00
Ruchi Kandoi
662975d861
Merge "Update Android Beam feature summary string" am: 27a59e1d2c
...
am: abe9a41d19
2017-01-05 18:11:54 +00:00
Ruchi Kandoi
abe9a41d19
Merge "Update Android Beam feature summary string"
...
am: 27a59e1d2c
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
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
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
2016-12-28 19:03:46 +00:00
gaochong
28688c3ba3
Merge "Handle SubSettings instance leaks in Index.java" am: 527b2b220a
...
am: bf4a67ec0f
2016-12-28 18:55:47 +00:00
gaochong
bf4a67ec0f
Merge "Handle SubSettings instance leaks in Index.java"
...
am: 527b2b220a
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
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
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
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
2016-12-23 01:19:55 +00:00
Nathan Harold
edb79b6222
Always include BAND_MODE=AUTOMATIC in the Radio Band Mode List
...
am: d18b9fcde0
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
2016-12-22 20:57:57 +00:00
pkanwar
7c4809a9c3
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
...
am: 675122ad51
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
