OSDN Git Service

Merge "Fix robotests." into oc-mr1-dev
[android-x86/packages-apps-Settings.git] / tests / Android.mk
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886...
2017-07-18 Phil WeaverMerge "Back-port ag/2491664" into lmp-dev am: 41492a1e2...
2017-07-18 Phil WeaverBack-port ag/2491664 am: 1d21738bd6 am: 4150739791...
2017-07-12 Phil WeaverDO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am...
2017-05-12 Phil WeaverDon't enable a11y service if scary dialog obscured...
2017-04-12 Dmitry DementyevAdd permission check to Intents used by Authenticator...
2017-03-09 Dmitry Dementyevresolve merge conflicts of 75ae46d035 to lmp-mr1-dev...
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-08-18 Ajay PanickerMerge "Do not allow apps to cause Bluetooth to be disco...
2016-08-05 Mark SalyzynMerge changes Ic198dc44,I15f000bf
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE am: e6ad6e866b...
2016-07-13 Mark SalyzynMerge \"Settings: trampoline persist.logd.logpersistd...
2016-07-12 Mark SalyzynMerge \"Settings: add logpersist kernel only selection\"
2016-07-08 Mark SalyzynMerge \"Settings: add logpersist kernel only selection...
2016-06-13 Robert Greenwaltresolve merge conflicts of b34cf86 to nyc-dev-plus...
2016-06-11 Ruchi Kandoiresolve merge conflicts of 9e28f9a to nyc-dev-plus...
2016-06-09 Mark SalyzynMerge \\"Settings: add logpersist selection (strings...
2016-06-03 Sanket AgarwalMerge "Handle return value when Bluetooth is enabled...
2016-05-27 Paul StewartMerge "Display connect button in the wifi connection...
2016-05-23 Jason MonkMerge "Fix the momery leak in DrawOverlayDetails" am...
2016-05-18 Robert GreenwaltMerge "Fix register multiple PhoneStateListeners."...
2016-05-13 Amit MahajanMerge "Fix cannot build prefer or restore APN for Secon...
2016-04-19 Amit Mahajanresolve merge conflicts of 5213f71 to nyc-dev-plus...
2016-04-07 Amith YamasaniMerge "Fix user photo popup layout for RTL" am: 6186414
2016-04-05 Jason MonkMerge "Fix end padding of summary text for dialog is...
2016-03-23 qinglian.x.zhangMerge "Fix no options menu on location settings screen"
2016-03-16 Carsten HaugeMerge "Add Up button in Status settings"
2016-02-29 Sanket PadaweResolve merge conflicts of b9e837bc78 to nyc-dev
2016-02-27 Baligh UddinImport translations. DO NOT MERGE
2016-02-23 Baligh UddinImport translations. DO NOT MERGE
2016-02-20 Samuel TanWifiConfigController: set ca_path and ca_cert to null...
2016-02-17 Bill YiMerge commit \'6a19c5cabf1615ffce654a1203554bbaa1d1f72e...
2016-02-17 Geoff MendalImport translations. DO NOT MERGE
2016-02-17 Lorenzo Colittiresolve merge conflicts of c408ab3de6 to nyc-dev
2016-02-17 Nathan HaroldUpdate BandMode Names to support full list, fix off...
2016-02-15 Geoff MendalImport translations. DO NOT MERGE
2016-02-14 SvetoslavDO NOT MERGE Modify system settings: incorrect UI state...
2016-02-10 Geoff MendalImport translations. DO NOT MERGE
2016-02-09 Andre EisenbachMerge "Add Developer menu entry to disable Bluetooth...
2016-02-09 Samuel TanAllow trusted system certificates to be used in EAP...
2016-02-05 Samuel TanCorrectly load saved EAP CA cert and user cert options
2016-02-03 Jason MonkMerge "Change receiver name attribute for DISCOVERABLE_...
2016-02-03 Geoff MendalImport translations. DO NOT MERGE am: 10a758b8b7 ...
2016-02-03 Geoff MendalImport translations. DO NOT MERGE am: dd33e41c5a ...
2016-02-03 Oleksandr PeletskyiMerge "Gray out Wallpapers menu item when setting of...
2016-02-02 Ritesh ReddyMerge "Calling dataChanged() for Net Policy Restriction...
2016-02-02 Samuel TanAllow domain suffix match to be set in UI for EAP confi...
2016-02-02 Geoff MendalImport translations. DO NOT MERGE am: 49a9587ade ...
2016-02-02 Geoff MendalImport translations. DO NOT MERGE am: 0873f057db ...
2016-02-01 Geoff MendalImport translations. DO NOT MERGE am: 66382c5667 ...
2016-02-01 Geoff MendalImport translations. DO NOT MERGE am: 67603ccc01 ...
2016-01-27 Samuel TanDisplay warning if users does not provide CA cert in...
2016-01-27 Samuel TanAdd menu options for not specifying a EAP CA cert and...
2016-01-27 Samuel TanDisable configuring EAP-TLS without user certificate.
2016-01-27 Sanket Padawe[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP...
2016-01-27 Geoff MendalImport translations. DO NOT MERGE am: 963c4b3d41 ...
2016-01-27 Geoff MendalImport translations. DO NOT MERGE am: 9c57679b0e ...
2016-01-27 Rubin Xuresolve merge conflicts of 55d7fcbfc2 to master.
2016-01-26 Sudheer ShankaMerge "Update the text shown when admin disabled finger...
2016-01-26 Abodunrinwa TokiMerge "Settings app: Include package icons in list...
2016-01-26 Philip P. MoltmannMerge "Settings: Handle non-nullness of PrintJobId...
2016-01-26 Shishir AgrawalDO NOT MERGE : Unhiding MSIM APIs.
2016-01-26 Jason MonkMerge "Only show settings drawer on top level items"
2016-01-26 Vladislav KuzkokovMerge "Add "Manage backup data" item to "Backup & Reset...
2016-01-25 Tony MantlerMerge "Move AccessPointPreference to SettingsLib"
2016-01-25 Makoto OnukiMerge "Add "Uninstall" button to device admin activatio...
2016-01-25 Sudheer ShankaMerge "Add disabled by policy message as empty views...
2016-01-25 Geoff MendalMerge "Import translations. DO NOT MERGE" into mnc...
2016-01-25 Geoff MendalImport translations. DO NOT MERGE am: 13391af4fc ...
2016-01-25 Clara BayarriMerge "Unify profile and device lock by setting the...
2016-01-25 Clara BayarriMerge "Fix Confirm/Choose Credentials strings related...
2016-01-25 Robin LeeMerge "Test: parcel marshalling for user credentials...
2016-01-25 Benjamin FranzMerge "Change build targets for settings tests"
2016-01-23 Steve Pfetschresolve merge conflicts of 259b6a8029 to master.
2016-01-22 Oleksandr PeletskyiMerge "Added check of the restriction if a user is...
2016-01-22 Anna GaluszaMerge "Make A11y SUW launchable from SUW and small...
2016-01-22 Benjamin FranzMerge "Add background image for work challenge"
2016-01-22 Kenny Rootresolve merge conflicts of bdc6074276 to master.
2016-01-21 Sudheer ShankaMerge "Add padlocks to preferences that can be disabled...
2016-01-21 Benjamin FranzChange build targets for settings tests
2016-01-21 Benjamin FranzMerge "Add unit tests to Utils"
2016-01-20 Benjamin FranzAdd unit tests to Utils
2015-04-01 Elliott HughesMerge "add Recife timezone"
2015-01-29 Fyodor Kupolovam 2f3bc3cb: (-s ours) am e3904c4f: am e8e7b9b3: Added...
2014-09-11 Carlos Valdiviaam 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don...
2014-07-16 Narayan Kamatham 2abbacb7: Merge "Get rid of duplicated code in acces...
2014-06-18 Mark Salyzynam ce258caa: Merge changes I8f067f14,I54d8255a,Ib15917bf
2014-06-13 Mark Salyzynam 5a9a18c1: Merge "logd: Add Developer settings for...
2014-05-28 Brian Carlstromam 2ce0dcda: am 70f2201c: Merge "Move to dalvik.vm...
2014-05-09 Jeff Sharkeyam 14f42ca9: am 110ddbfe: Merge "Fix NullPointerExcepti...
2014-04-30 Zhihai Xuam d6b0b172: am 7dd84651: Merge "Display BTH connected...
2014-04-30 Bill Yiam a3860afc: Merge commit \'36a1bbe89025341987df0e38098...
2014-04-24 Elliott Hughesam 4c941850: Merge "Track MutableBoolean\'s new package."
2014-04-16 Wink Savilleam 242184ca: Merge "Allow tablets to send SMS if enable...
2014-04-07 Jaewan KimMerge "Revert "Refactor IpConfiguration from WifiConfig...
2014-04-07 Jaewan KimMerge "Refactor IpConfiguration from WifiConfiguration"
2014-04-04 Paul LawrenceMerge "Show OwnerInfo on CryptKeeper screen"
2014-04-03 Adrian Roosam 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10...
2014-04-03 Fabrice Di MeglioMerge "Add indexing for SwitchPreferences"
2014-04-03 Fabrice Di MeglioMerge "Add indexing for ListPreferences"
next