Maxim Bogatov
838a2f845a
Merge "Make whole switchable header act as single Switch for AccessibilityService"
2015-05-29 17:49:36 +00: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
a25cf52c7a
am 750648c5
: Merge "Disable back button on crypto screen" into mnc-dev
...
* commit '750648c5ae2b975d7aea45601d17f4c0796e8db4':
Disable back button on crypto screen
2015-05-28 19:53:08 +00: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
a5c3cf4003
am 7c3b9f28
: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
...
* commit '7c3b9f28b5b547fcdfb78d9e24f4d9b694c91c28':
Make use of WifiTracker's WorkerThread support
2015-05-28 16:48:46 +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
John Spurlock
00340c334d
am 8bdfeadb
: am e2b5b7fd
: am 9dbd6165
: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev
...
* commit '8bdfeadb273c851232575a07ef74fff5adebfec3':
Settings: Update icon sizes for zen auto rules.
2015-05-28 14:49:24 +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
John Spurlock
8bdfeadb27
am e2b5b7fd
: am 9dbd6165
: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev
...
* commit 'e2b5b7fd98b50f196129264c3304fca4241531a9':
Settings: Update icon sizes for zen auto rules.
2015-05-28 14:34:08 +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
5ab0c9c9e3
am a7fe759d
: Merge "More memory updates" into mnc-dev
...
* commit 'a7fe759de7c021b0d3467c75422acb14c62f90bd':
More memory updates
2015-05-28 14:33:50 +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
John Spurlock
e2b5b7fd98
am 9dbd6165
: Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev
...
* commit '9dbd616541de32df34562a4ee8cb8ee28757923c':
Settings: Update icon sizes for zen auto rules.
2015-05-28 14:18:41 +00:00
Jason Monk
ef4ec26032
am 15dcebe1
: Help fallbacks and intent work
...
* commit '15dcebe1e79ad396a08873f940e2f33d432cf387':
Help fallbacks and intent work
2015-05-28 14:18:38 +00:00
John Spurlock
9dbd616541
Merge "Settings: Update icon sizes for zen auto rules." into mnc-dev
2015-05-28 14:11:10 +00:00
John Spurlock
e6f9c110c7
Settings: Update icon sizes for zen auto rules.
...
Bug: 21474291
Change-Id: I5f2ec0e86f9390ee9c73e4a1be6bc280162b1cab
2015-05-28 10:07:29 -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
56eb3e611d
am ecf4339b
: Fix Eap method selection on screen rotation.
...
* commit 'ecf4339bc74f8d4fb504e8f32b1d4828e9975e37':
Fix Eap method selection on screen rotation.
2015-05-28 01:23:47 +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
70aae38d3d
am 90e9a903
: Merge "Honor password visible setting in CryptKeeper" into mnc-dev
...
* commit '90e9a9031215ae40c058d3c2b7474f8eb28fde44':
Honor password visible setting in CryptKeeper
2015-05-27 22:31:19 +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
Andres Morales
fb171c214f
am 27c13e5d
: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
...
* commit '27c13e5dc6444be87af26e545e4e1163c3767ffc':
[ConfirmCredential] fix issue where patterns of length 4 are not checked
2015-05-27 21:15:56 +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
Maurice Lam
a80694d476
am 2991c526
: am 08b13b02
: am 6fd26aae
: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
...
* commit '2991c52600a15205e6ca0aac76e6e5b00149c23a':
[LockScreen] Setup Wizard pattern lock landscape layout
2015-05-27 21:01:15 +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
Maurice Lam
2991c52600
am 08b13b02
: am 6fd26aae
: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
...
* commit '08b13b0239e70bcb2268cb7ae1aee090300efe81':
[LockScreen] Setup Wizard pattern lock landscape layout
2015-05-27 20:45:50 +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
Chad Brubaker
08ffcb996e
am 227ba29e
: Merge "Clear only keystore credential entires" into mnc-dev
...
* commit '227ba29e3947c8d53cb4a8138f0c3f209ae414e3':
Clear only keystore credential entires
2015-05-27 20:23:44 +00:00
Andres Morales
6042133f48
am b5746cb1
: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
...
* commit 'b5746cb19bef50036eae2353714bc50ff491ba68':
[LockSettings] pipe through HW throttle timeout
2015-05-27 20:23:42 +00:00
Maurice Lam
08b13b0239
am 6fd26aae
: Merge "[LockScreen] Setup Wizard pattern lock landscape layout" into mnc-dev
...
* commit '6fd26aae0d47b6f8ddd472abc8f86cd65c796fda':
[LockScreen] Setup Wizard pattern lock landscape layout
2015-05-27 20:23:41 +00:00