Commit Graph

27930 Commits

Author SHA1 Message Date
TreeHugger Robot
d258b2f40f Merge "Remove fake data" into nyc-mr2-dev 2017-01-27 20:31:40 +00:00
TreeHugger Robot
4edcb927ab Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev 2017-01-27 19:59:03 +00:00
Salvador Martinez
a1499c3005 Remove fake data
Missed one location that adds fake data
to the payload the first time these were
removed. This patch removes any remaining
fake data being attached to a survey payload.

Test: Robotests still pass
Bug: 34716378
Change-Id: Iccb60ce24ae5c494dcd287107f8d293f4a56b2d5
Merged-In: I055c2b2e027f721e14ea5b6b7efccd5267018b8c
2017-01-27 10:47:33 -08:00
Salvador Martinez
9db3cb3bee Fix null pointer exception when surveys are turned off
In some conditions the survey provider could be null on
download completion which could lead to a NPE. This
has been addressed by not requiring an instance for
the removal of the receiver.

Test: RunSettingsRoboTests (master)
Bug: 33707203
Change-Id: Id1ab1a24c697fed8e4dd259682a088b50c35f38a
Merged-In: Icfb545697f24172db734dd7dad421796edf68186
2017-01-27 10:29:10 -08:00
TreeHugger Robot
f15b23ad65 Merge "Finalize string for usage alerts." into nyc-mr2-dev 2017-01-27 03:37:45 +00:00
Andrew Sapperstein
59fd24cde2 Finalize string for usage alerts.
Test: manual
Bug: 34200177
Change-Id: I5c28b2844b035d551ef2707b9797443074d0d23f
2017-01-26 17:30:30 -08:00
Stefano Tommasini
a04697a951 Merge "*DO NOT MERGE* Create new suggestion category for backup." into nyc-mr2-dev 2017-01-26 10:31:15 +00:00
TreeHugger Robot
063b543124 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-26 07:06:17 +00:00
Bill Yi
db68fc320f Import translations. DO NOT MERGE
Change-Id: Ibb3ccac189513a5a988ec8c857f2ad574371808a
Auto-generated-cl: translation import
2017-01-25 20:04:52 -08:00
Jerry Zhang
361a3e2090 Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method" into nyc-mr2-dev 2017-01-25 20:30:18 +00:00
Stefanot
1c72ce06d1 *DO NOT MERGE* Create new suggestion category for backup.
Test: manual

BUG: 34219298
Change-Id: I288d36b2b48582e5f8e0d1720d1f7004ad8dae2c
2017-01-25 19:18:08 +00:00
Jerry Zhang
a291336bd8 Refactor setCurrentFunction and setUsbDataUnlocked into one method
This allows us to get rid of an extraneous config switch and
simplify some code.

Bug: 31814300
Test: Manually change usb configuration
Change-Id: Id78da530ff485ecd7a915056832eec1dd8c91954
(cherry picked from commit 5d36a177d9)
2017-01-24 13:27:14 -08:00
Stefano Tommasini
bd16255ee1 Merge "Add SuggestionFeatureProvider interface." into nyc-mr2-dev 2017-01-21 19:44:16 +00:00
Stefanot
2eac39b393 Add SuggestionFeatureProvider interface.
The interface is added so that a vendor can add new suggestions to the
settings app, and customize details for these suggestions.

Test: make RunSettingsRoboTests

BUG: 34219298

Change-Id: I373c63709b1aaf68360aa2561a2ecfc3194e0e2b
2017-01-21 14:34:04 +00:00
Bill Yi
2c570117a8 Import translations. DO NOT MERGE
Change-Id: I6aed674efc270223bddfd6fbdae50a98ae695276
Auto-generated-cl: translation import
2017-01-20 12:31:51 -08:00
Jack He
e51972868c Fix Bluetooth pairing dialogue crash
When pairing passkey is invalid, onCreate() should return early to
prevent any dialog from displaying, which will then call onDestroy()
to destroy the activity. However mReceiver should be registered before
onDestroy() is called as onDestroy() will call unregisterReceiver(mReceiver)
that will throw an IllegalArgumentException when mReceiver was not registered.

This fix adds a flag that tracks whether mReceiver has been registered.
In addition, this fix fails the passkey confirmation request upon invalid
passkey.

Bug: 32577328
Test: Test with PTS TC_SERVER_SA_BI_01_C
Change-Id: Ifc047bad6bd99abca04404af9cd54d2034cd35aa
(cherry picked from commit 6f8e9eda2d9ed830d47971d93327792906db2dc1)
2017-01-19 22:39:17 +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
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
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
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
39c04bb92b Import translations. DO NOT MERGE
Change-Id: I83e0e51b5552d44b66a84d5abdaac59ec3932c64
Auto-generated-cl: translation import
2017-01-12 06:02:43 -08: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
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
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
TreeHugger Robot
adce1145a9 Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev 2017-01-10 07:18:42 +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
Bill Yi
cd3475f3d1 Import translations. DO NOT MERGE
Change-Id: I24410f77a5b2f4777bae8546e6709c47d971c992
Auto-generated-cl: translation import
2017-01-04 17:46:43 -08: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
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
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
54e5382136 Import translations. DO NOT MERGE
Change-Id: Id3458a153f2db98b0035caac52eb1933cb9fd18f
Auto-generated-cl: translation import
2016-12-21 21:59:21 -08: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
Bill Yi
a48002a65a Import translations. DO NOT MERGE
Change-Id: If6787baad938f8184b5b6ddb2c59317b0d6144bd
Auto-generated-cl: translation import
2016-12-14 21:03:28 -08:00
TreeHugger Robot
0e7405fc17 Merge "DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD" into nyc-mr2-dev 2016-12-14 02:08:37 +00:00
Bill Yi
a4e78d242d Import translations. DO NOT MERGE
Change-Id: Ia4641aa6b6dc9907ede180fa2d7d0cb4f1c258f0
Auto-generated-cl: translation import
2016-12-12 17:30:02 -08:00
Tony Mak
8a2f28a629 DO NOT MERGE: Fix DPM.ACTION_SET_NEW_PASSWORD
This is a cherry-pick of ag/1640561.

1. Context.getActivityToken is not available in n mr2, passed the token
   from the activity to the controller instead.

2. Haven't pick the tests from master to mr2 branch because robotest
   is not set up in mr2 branch.

Fix: 32959373

Change-Id: I2f73d01ab11e91b337beb90c05bbcb857dfd40dc
2016-12-12 02:35:42 +00:00
Youhan Wang
f6b8321654 Merge changes from topic 'ims-radio-info-mr2' into nyc-mr2-dev
* changes:
  Add Ims Registration Info to RadioInfo
  Enable and Disable IMS Provisioning Based on Platform Capability
2016-12-09 22:17:09 +00:00
Nathan Harold
839b9f9733 Add Ims Registration Info to RadioInfo
Replaced not used pdp list.

Bug:32874442
Change-Id: Iadb21a3108aaaa3afcde3972e6f98bfbbd5413f1
2016-12-06 14:54:56 -08:00
Nathan Harold
c137050588 Enable and Disable IMS Provisioning Based on Platform Capability
Bug:32874442
Change-Id: I4be301864a3d48ef14834caa707e9d64536fd836
2016-12-06 14:25:51 -08:00
Daniel Nishi
c04f8b9ecd Move private volume storage calculations into a shared lib.
Bug: 30895163
Test: m RunStorageManagerRoboTests
Change-Id: I3e464c8b721373ebc1527eb5411622c69bf587d1
2016-11-28 11:00:48 -08:00
Bill Yi
d13efff7aa Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 32839141
Change-Id: I6145b97714693ec78cbc8b7d2235ed5830e7f714
2016-11-14 09:50:59 -08:00
Bill Yi
416fa38e75 Import translations. DO NOT MERGE
Change-Id: I64f7cc447bbacc64f2993230946f87258496824a
Auto-generated-cl: translation import
2016-11-04 22:19:32 -07:00
Stephen Chen
b21815e320 Add subtypes to tron logging for Wifi toggles.
For ACTION_WIFI_CONNECT, added subtype to specify whether user is
connecting to saved network.
For ACTION_WIFI_OFF, added subtype to specify whether user was connected
to a network at the time.

Bug: 32371451
Test: Verify logs by running:
adb logcat -b events | egrep '(sysui_|notification_)'
Merged-In: I1d4445bda2fbeb062831e6f858ccc711bff65105

Change-Id: I6b87dc10fcfe412f1c72ae944c2dd4d81da12b53
2016-11-03 14:16:06 -07:00
Fan Zhang
ce01f167e1 Fix crash when opening account sync detail for external app am: c9cdc25f41
am: f3e86ca481

Change-Id: I3ca70edada88ee6d7c4dde2ba7e5972233357add
2016-11-01 17:23:38 +00:00
Fan Zhang
f3e86ca481 Fix crash when opening account sync detail for external app
am: c9cdc25f41

Change-Id: Ic8016695966d64c02c4e2fbe37703db8c771930e
2016-11-01 17:21:36 +00:00