Paul Duffin
a3da659863
Merge "Prepare for removal of legacy-test from default targets"
...
am: a6b0c881fd
Change-Id: Iadb65fd5a2630e74071866f2d0b4347d29a71af1
2017-01-19 15:17:53 +00:00
Treehugger Robot
a6b0c881fd
Merge "Prepare for removal of legacy-test from default targets"
2017-01-19 15:13:15 +00:00
Paul Duffin
b67ddbbd25
Prepare for removal of legacy-test from default targets
...
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.
Bug: 30188076
Test: make checkbuild
Merged-In: I5d2c0685b74ea5ba368c777d9646b9d3ac24dca9
Change-Id: I980111b4b83d16ccd9d3a277ab2587bf638a2c8a
2017-01-19 09:43:07 +00:00
Bill Yi
a46e4a4e49
Import translations. DO NOT MERGE
...
am: 0446865d68
-s ours
Change-Id: I389d6dd23abc7e3476d00a25ab958d1de44b7e09
2017-01-19 04:51:51 +00:00
Bill Yi
0446865d68
Import translations. DO NOT MERGE
...
Change-Id: I610fb1c188fb93d6e2d70dd52da7dd766d27c209
Auto-generated-cl: translation import
2017-01-18 19:10:06 -08:00
Pavlin Radoslavov
4d70b69d7a
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings" am: b057b2da02
am: 058533ae25
...
am: 4dac712d7c
Change-Id: I0680026da45bb1828c70ec051e789b0845176702
2017-01-18 20:41:29 +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
6031fba9f2
DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"
...
am: 5a638a6ad1
Change-Id: If23c0926eecf6a08ed0c0ab174cdddb43e31cc00
2017-01-18 20:24:36 +00:00
Treehugger Robot
b057b2da02
Merge "Update/cleanup Bluetooth Codec strings in Developer Settings"
2017-01-18 20:20:48 +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
Tamas Berghammer
6cd7e52b9e
Update package names to work with the proto3 compiler
...
am: fbd5f5fdce
Change-Id: I20b3bc10cf66bb94369631cef229787b5e6353b6
2017-01-18 17:45:33 +00: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
Jaewoong Jung
487458d23d
Implements additional battery info menu behavior.
...
am: 8a49de31ab
Change-Id: I29a2a6032b02309ae9e966f517774f5ce1451c3b
2017-01-14 06:05:56 +00:00
Jaewoong Jung
8a49de31ab
Implements additional battery info menu behavior.
...
This is a manual cherry-pick of commit
6a43a06cac
.
Bug: 33352540
Test: Updated existing tests.
Change-Id: I990029d2ea9032301362d614959259965b8ecb10
2017-01-13 14:56:47 -08:00
Jaewoong Jung
482b27320a
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
...
am: bd775165d4
Change-Id: I3b5d1278bf2d2e237b9d0c7bd8349de451fc263b
2017-01-13 22:40:40 +00:00
Jaewoong Jung
c360bc5813
Adds a menu item for additional battery info to battery settings.
...
am: 7b557df0e4
Change-Id: Iaef847979f64bf93b87457fa3f2f734b1789c830
2017-01-13 22:40:38 +00:00
Jaewoong Jung
bd775165d4
Merge "Adds a menu item for additional battery info to battery settings." into nyc-mr2-dev
2017-01-13 22:38:11 +00:00
Jaewoong Jung
7b557df0e4
Adds a menu item for additional battery info to battery settings.
...
This is a manual cherry-pick of commit
1e0f8ff5e5
.
Bug: 33352540
Test: No additional test failures.
Change-Id: Ibfc1a9463c93d3c087ed712fe45d3d0717472c6a
2017-01-13 12:58:44 -08:00
Salvador Martinez
cfd475feb5
Removed fake data
...
am: 4b69b113fb
Change-Id: Idc8731119c9dca50135c15454944d8b20aa89730
2017-01-13 01:06:45 +00:00
Salvador Martinez
4b69b113fb
Removed fake data
...
Was using fake data for testing that we could attach
payloads. This is no longer needed since we are now
attaching real data.
Test: Manual Verification on GCS
Bug: 27823357
Change-Id: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
2017-01-12 10:53:42 -08:00
Bill Yi
e1f3b34abc
Import translations. DO NOT MERGE
...
am: 39c04bb92b
-s ours
Change-Id: I79582468959e2a04d6ea69a9faedaf28c67f1986
2017-01-12 17:17:41 +00:00
Bill Yi
39c04bb92b
Import translations. DO NOT MERGE
...
Change-Id: I83e0e51b5552d44b66a84d5abdaac59ec3932c64
Auto-generated-cl: translation import
2017-01-12 06:02:43 -08:00
Salvador Martinez
94422fc8f9
Added survey triggering mechanisms
...
am: 2cb82c55a0
Change-Id: Ib1a98fc3351059a7811c41f616507abec689a98a
2017-01-12 02:07:21 +00:00
Salvador Martinez
2cb82c55a0
Added survey triggering mechanisms
...
Surveys can now be triggered on a subset of Settings screens.
Surveys can also be modified/created for this subset of
screens remotely.
Test: RoboTests(master) && JUnitTests
Bug: 27823357
Change-Id: I1534af5573bef6f6c65c9c99b6f5a2917c3325b9
2017-01-11 16:27:11 -08:00
Salvador Martinez
40c7468673
Added feature for surveys provider to Settings
...
am: cd0fe608c5
Change-Id: I13ceb5009800cb25483d85220c0ec22051f79cbe
2017-01-11 19:41:26 +00:00
Salvador Martinez
cd0fe608c5
Added feature for surveys provider to Settings
...
It is now possible to create and show surveys to a user
asking them for feedback within the Settings app.
Test: In Master Branch
Bug: 27823357
Change-Id: I824899045f6ce30e5b6f46d20888da673114f658
2017-01-11 09:51:31 -08: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
0cc9fd4b82
Merge "Moved the Bluetooth-related default config init within onCreate()" am: ab9e269d06
am: 6e154cfb98
...
am: 216dcdc9dc
Change-Id: I53981066dfc5975aa4bd02b2d5004d286bb7dc63
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
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
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
Change-Id: I67215050e9663e7bf84ec78c31d97e6b0291ae19
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
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
Geoffrey Pitsch
5e36b66c91
Merge "DO NOT MERGE Fix Notification Settings when unblockable app is blocked." into nyc-mr2-dev
...
am: 6688dae166
Change-Id: Ib8004c18bcc9db33c2340f89fc93268e41026c4d
2017-01-10 19:12:26 +00:00
Geoffrey Pitsch
1eefc78280
DO NOT MERGE Fix Notification Settings when unblockable app is blocked.
...
am: db380fa9cb
Change-Id: I248be6a106a5dc20b5e391b2aebc267786a97e65
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
-s ours
Change-Id: I7d6248afd47be986586f45a98b23a932d8457c2b
2017-01-10 07:27:47 +00:00
Bill Yi
ff2cdd084a
Import translations. DO NOT MERGE
...
am: 5d8d883ab1
-s ours
Change-Id: I6227215a415906f4f6ba04e9d7edc0a587dafb3c
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
-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