Commit Graph

3 Commits

Author SHA1 Message Date
Sudheer Shanka
1bd1d8dabb Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity.
Bug: 37672383
Change-Id: I63adcafc6e8dced173d52f25e8a6521ae897c9aa
Test: builds
2017-04-26 17:37:16 -07:00
Maurice Lam
88df6f4407 Use buttons for EncryptionInterstitial
Bug: 30742121
Test: Run EncryptionInterstitialTest via `am instrument`
Change-Id: I04d304da4153ebc7f8809ce9c640bccc5e1f5685
(cherry picked from commit 9be96e06bb)
2017-04-17 15:42:21 -07:00
Fan Zhang
2a376723ae Fix a NPE when clicking encryption interstitial header
Pref tree handler cannot assume preference has non-null key.

Change-Id: I790e75f3b4c888e2a48b297bea89cda0b8dbaabd
Fix: 35855587
Test: runtest --path tests/app/src/com/android/settings/EncryptionInterstitialTest.java
2017-03-02 17:02:22 -08:00