John Spurlock
64f994592e
am 48018ddc: am 08788dcc: am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
...
* commit '48018ddc7220bbe6aae3f685215faca08cc51ca0':
Settings: Migrate zen event conditions to use calendar name.
2015-06-01 15:26:03 +00:00
John Spurlock
48018ddc72
am 08788dcc: am 00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
...
* commit '08788dccaf733d855b7a2391095076a642b697f9':
Settings: Migrate zen event conditions to use calendar name.
2015-06-01 14:46:23 +00:00
Maxim Bogatov
838a2f845a
Merge "Make whole switchable header act as single Switch for AccessibilityService"
2015-05-29 17:49:36 +00:00
John Spurlock
00e392387b
Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
2015-05-29 13:22:36 +00:00
John Spurlock
bd352af3cf
Settings: Migrate zen event conditions to use calendar name.
...
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.
Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
2015-05-28 22:20:44 -04:00
Paul Lawrence
5ea9cc81ef
am c93ccee5: am a25cf52c: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev
...
* commit 'c93ccee5e011e58341abe97d6c9d329cb11526ef':
Disable back button on crypto screen
2015-05-28 22:54:07 +00:00
Paul Lawrence
c93ccee5e0
am a25cf52c: am 750648c5: Merge "Disable back button on crypto screen" into mnc-dev
...
* commit 'a25cf52c7ab590ab0c58d38a742f10d3d37fd63c':
Disable back button on crypto screen
2015-05-28 22:34:25 +00:00
Maxim Bogatov
c99d0a8a79
Make whole switchable header act as single Switch for
...
AccessibilityService
second part of b/21305287
Change-Id: I80da2ecbc367e10d027a851193f4d03ab8e09c69
2015-05-28 13:20:54 -07:00
Paul Lawrence
750648c5ae
Merge "Disable back button on crypto screen" into mnc-dev
2015-05-28 19:37:28 +00:00
Jason Monk
3740563649
am f8adf493: am a5c3cf40: am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
...
* commit 'f8adf493477f3e18ab55ae2fb9f34f2fd010abc6':
Make use of WifiTracker's WorkerThread support
2015-05-28 17:46:16 +00:00
Jason Monk
f8adf49347
am a5c3cf40: am 7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
...
* commit 'a5c3cf4003ec5314a6fe05fa355e599c80e82469':
Make use of WifiTracker's WorkerThread support
2015-05-28 17:30:52 +00:00
Jason Monk
7c3b9f28b5
Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev
2015-05-28 16:37:39 +00:00
Jason Monk
7a0b412ed2
Make use of WifiTracker's WorkerThread support
...
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.
Bug: 21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
2015-05-28 12:26:09 -04:00
Jason Monk
6e76f98f06
am eb859db1: am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev
...
* commit 'eb859db14fbb0b7050d518edade44409ef213743':
More memory updates
2015-05-28 15:05:02 +00:00
Jason Monk
eb859db14f
am 5ab0c9c9: am a7fe759d: Merge "More memory updates" into mnc-dev
...
* commit '5ab0c9c9e37d8ca17b2e40ccaf6913149cdd78c2':
More memory updates
2015-05-28 14:49:28 +00:00
Jason Monk
3430cfbe05
am 266fc6df: am ef4ec260: am 15dcebe1: Help fallbacks and intent work
...
* commit '266fc6df9420beeedae0c1647e1e05f60e87c7c7':
Help fallbacks and intent work
2015-05-28 14:49:22 +00:00
Jason Monk
266fc6df94
am ef4ec260: am 15dcebe1: Help fallbacks and intent work
...
* commit 'ef4ec2603270dac4b7a001220b023721ce3aab54':
Help fallbacks and intent work
2015-05-28 14:34:07 +00:00
Jason Monk
a7fe759de7
Merge "More memory updates" into mnc-dev
2015-05-28 14:24:35 +00:00
Jason Monk
ab2046aa76
More memory updates
...
- Some string changes
- Make processes in memory details not clickable
- Put processes in a 'detail' category
- Hide processes when an app only has 1
- Add memory item to bottom of app info page
Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
2015-05-28 10:20:56 -04:00
Jason Monk
15dcebe1e7
Help fallbacks and intent work
...
- Handle a backup URI, so that if the specified URI is not available,
another can be used.
- Add some data to help intents when they are intent URIs
- Fill in the context with a classname when it isn't present
Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
2015-05-28 09:50:45 -04:00
Sanket Padawe
d326f29cb6
am 479c5215: am 56eb3e61: am ecf4339b: Fix Eap method selection on screen rotation.
...
* commit '479c5215e68145d7987953b8623fc653708ece07':
Fix Eap method selection on screen rotation.
2015-05-28 02:37:58 +00:00
Sanket Padawe
479c5215e6
am 56eb3e61: am ecf4339b: Fix Eap method selection on screen rotation.
...
* commit '56eb3e611db35afb13b00bfa7b187d2d38eae942':
Fix Eap method selection on screen rotation.
2015-05-28 01:32:34 +00:00
Sanket Padawe
ecf4339bc7
Fix Eap method selection on screen rotation.
...
Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
2015-05-27 18:04:23 -07:00
Paul Lawrence
0d3a126855
am 177f3977: am 70aae38d: am 90e9a903: Merge "Honor password visible setting in CryptKeeper" into mnc-dev
...
* commit '177f3977ddf9196df5f2092d215b52fe2535237b':
Honor password visible setting in CryptKeeper
2015-05-27 23:04:55 +00:00
Paul Lawrence
177f3977dd
am 70aae38d: am 90e9a903: Merge "Honor password visible setting in CryptKeeper" into mnc-dev
...
* commit '70aae38d3d80bf10a60ff2216e2f31e0b93ab34c':
Honor password visible setting in CryptKeeper
2015-05-27 22:48:05 +00:00
Paul Lawrence
90e9a90312
Merge "Honor password visible setting in CryptKeeper" into mnc-dev
2015-05-27 22:15:51 +00:00
Andres Morales
86166a4b2c
am 02122f6a: am fb171c21: am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
...
* commit '02122f6ab3825c14b0b47f82b76200083a5908ae':
[ConfirmCredential] fix issue where patterns of length 4 are not checked
2015-05-27 21:49:11 +00:00
Andres Morales
02122f6ab3
am fb171c21: am 27c13e5d: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
...
* commit 'fb171c214f905c20053f7ced9f981bccb8275b29':
[ConfirmCredential] fix issue where patterns of length 4 are not checked
2015-05-27 21:34:22 +00:00
Chad Brubaker
c0e6d21601
am fdda3f5d: am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev
...
* commit 'fdda3f5dc79e6c7eba04b0304bff612c4e99a7d4':
Clear only keystore credential entires
2015-05-27 21:01:18 +00:00
Andres Morales
6f9e4a19ae
am 6e3a182f: am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
...
* commit '6e3a182f9b6d8fd442408bb2eb1baa868a2257d0':
[LockSettings] pipe through HW throttle timeout
2015-05-27 21:01:17 +00:00
Jorim Jaggi
265c85c261
am 57aeea92: am 30ddbcdb: am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
...
* commit '57aeea920e06a8a192462e6b94a1fc8cffa5044b':
Cancel enrollment when navigating out of enrollment
String changes for app links in settings
Remove data item from app info when not supported
Monkey should not be allowed to switch USB mode
2015-05-27 21:01:14 +00:00
Andres Morales
27c13e5dc6
Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
2015-05-27 20:59:28 +00:00
Chad Brubaker
fdda3f5dc7
am 08ffcb99: am 227ba29e: Merge "Clear only keystore credential entires" into mnc-dev
...
* commit '08ffcb996e5a54cf127e2ab87ee6689c23e0177e':
Clear only keystore credential entires
2015-05-27 20:45:54 +00:00
Andres Morales
6e3a182f9b
am 6042133f: am b5746cb1: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
...
* commit '6042133f48b340b24babc8c590b874ddac9dfe6f':
[LockSettings] pipe through HW throttle timeout
2015-05-27 20:45:52 +00:00
Jorim Jaggi
57aeea920e
am 30ddbcdb: am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
...
* commit '30ddbcdb680d1ace092fe8e377542a0f6dfc8436':
Cancel enrollment when navigating out of enrollment
String changes for app links in settings
Remove data item from app info when not supported
Monkey should not be allowed to switch USB mode
2015-05-27 20:45:49 +00:00
Paul Lawrence
2a6552ed50
Disable back button on crypto screen
...
The back button cannot do anything from this activity as it is
only ever launched first thing at boot. So do not permit going back.
Note that screens launched from here (emergency dialer, keyboard config)
still work and their back buttons still work.
Bug: 20730074
Change-Id: I939e05450e5fbd61d12890325c4afe9dcad35c1e
2015-05-27 20:34:14 +00:00
Paul Lawrence
c04420ce25
Honor password visible setting in CryptKeeper
...
Requires matching framework change:
https://googleplex-android-review.git.corp.google.com/#/c/692822/
Bug: 20184626
Change-Id: I04bfb9ed61a7b40fbc28fbc0b4b10bf848b34a2c
2015-05-27 20:33:46 +00:00
Andres Morales
864d13e2c9
[ConfirmCredential] fix issue where patterns of length 4 are not checked
...
Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302
2015-05-27 13:04:38 -07:00
Chad Brubaker
227ba29e39
Merge "Clear only keystore credential entires" into mnc-dev
2015-05-27 20:04:14 +00:00
Andres Morales
b5746cb19b
Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
2015-05-27 18:37:53 +00:00
Jorim Jaggi
fd5ec09fe2
Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
2015-05-27 18:33:26 +00:00
Jason Monk
bae05490bb
am 4562d9f5: am 4b34804b: am 51334310: Add no data usage string
...
* commit '4562d9f57a904560c8f43500ccdf99b42d533e7f':
Add no data usage string
2015-05-27 14:30:18 +00:00
Jason Monk
4562d9f57a
am 4b34804b: am 51334310: Add no data usage string
...
* commit '4b34804b5124f8b71b14d4fbacedb948e5ec6820':
Add no data usage string
2015-05-27 14:17:54 +00:00
Jason Monk
51334310a2
Add no data usage string
...
Add a no data usage string so we can avoid showing incorrect dates
when no data is available.
Bug: 21076561
Change-Id: I4568cd750fe5f973fed0ff4ffa48412d8c6afd97
2015-05-27 09:02:16 -04:00
Jorim Jaggi
bc68ba22f1
Cancel enrollment when navigating out of enrollment
...
Change-Id: Ifee1572189765cbfa4c23e6176831c8f729bbd2b
2015-05-26 17:52:01 -07:00
Xiyuan Xia
9e1cdbe139
am 3c123ad7: am 3d36f54a: am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev
...
* commit '3c123ad726892edce6df173787ff89e103332b70':
No auto soft keyboard when fp is in use
2015-05-26 21:37:38 +00:00
Xiyuan Xia
3c123ad726
am 3d36f54a: am a4e0492c: Merge "No auto soft keyboard when fp is in use" into mnc-dev
...
* commit '3d36f54abcec1bb110e6c5e8e78fa2af5edf79e6':
No auto soft keyboard when fp is in use
2015-05-26 21:27:18 +00:00
Xiyuan Xia
a4e0492c11
Merge "No auto soft keyboard when fp is in use" into mnc-dev
2015-05-26 21:05:27 +00:00
Jason Monk
87dfa5d1dd
am 50ea0493: am ec39177c: am 44fb627c: Merge "Don\'t have app info pages load so much info" into mnc-dev
...
* commit '50ea0493c38e682ad79cc92c4cb8404fe993932c':
Don't have app info pages load so much info
2015-05-26 20:50:17 +00:00
Jason Monk
50ea0493c3
am ec39177c: am 44fb627c: Merge "Don\'t have app info pages load so much info" into mnc-dev
...
* commit 'ec39177c2bca1fb1e8b0b1fffccf05749d27d226':
Don't have app info pages load so much info
2015-05-26 20:42:36 +00:00