Commit Graph

30196 Commits

Author SHA1 Message Date
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
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