Jim Miller
fb3d5cad48
Don't show keyguard on top of CryptKeeper
...
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.
CryptKeeper itself should explicitly dismiss keyguard.
Fixes bug 11680832
Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
2013-11-14 14:40:22 -08:00
David Christie
f420843a44
am 9605791d
: am 7ff9f2b4
: am b1ded62f
: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
...
* commit '9605791d4165435330979497191a6ac902762271':
Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:25:09 -08:00
David Christie
9605791d41
am 7ff9f2b4
: am b1ded62f
: Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
...
* commit '7ff9f2b488e4017c7b3385fb067a14cfc07764fb':
Update power widget icons and fix location behavior Bug: 11242129
2013-11-14 14:20:31 -08:00
David Christie
b1ded62f3f
Merge "Update power widget icons and fix location behavior Bug: 11242129" into klp-dev
2013-11-14 20:12:42 +00:00
Lorenzo Colitti
deb8f08ace
Dynamically update connectivity and IP address.
...
The settings status page dynamically updates mobile network
status (in/out of service, signal strength, network type, etc.)
but not IP address and connectivity information. Dynamically
update that information as well, for consistency.
For consistency, also update the advanced wifi settings page.
Bug: 10232006
Change-Id: I3a292d8bd9e36ab16c37e107eefff4b37d884a4c
2013-11-15 02:38:36 +09:00
Lorenzo Colitti
6eb6a90821
Cache preferences and services in status dialog.
...
Currently, the status dialog fetches the preferences and system
services that it uses to display connectivity information (e.g.,
IP and MAC addresses) only when the dialog is first opened. This
is fine because the connectivity information is only filled in
once and never updated.
In order to have this information update dynamically (like the
rest of the dialog), fetch and cache these objects in onCreate.
The next change will actually make this information update on
network changes.
Bug: 10232006
Change-Id: Ib4072674543e517cf6935e3e03f35090e728090a
2013-11-15 02:38:35 +09:00
Jeff Brown
71504b1f71
am 0df39f39
: am 2fba8be9
: am 4e54c2a1
: Integrate remote display routes into screen cast settings UI.
...
* commit '0df39f39fcc45ff3efe92740ee46d7a762410b86':
Integrate remote display routes into screen cast settings UI.
2013-11-11 20:51:05 -08:00
Jeff Brown
0df39f39fc
am 2fba8be9
: am 4e54c2a1
: Integrate remote display routes into screen cast settings UI.
...
* commit '2fba8be9c0c9da814e40af00847f3f2d28cf7f01':
Integrate remote display routes into screen cast settings UI.
2013-11-11 10:27:24 -08:00
Jeff Brown
4e54c2a177
Integrate remote display routes into screen cast settings UI.
...
Merged remote display route selection into the existing wifi
display preference UI. Moved the on/off toggle over to a menu item.
The preference page is now mainly implemented in terms of the
media router. It only interacts with the display manager for the purpose
of pairing with new devices or making wifi display certification
controls available.
This means that the observed state is now completely consistent across
the system ui, settings, and applications that use the media router.
Bug: 11257292
Change-Id: I3705570812384fef4bfffeccaaccf7895d370d12
2013-11-10 21:20:16 -08:00
Robert Greenwalt
3bdc1eb38a
am 6c20565d
: am 384bf727
: am 29b7a844
: Merge "Add batch scan data to power stats." into klp-dev
...
* commit '6c20565d97339751f22123a4b40893f2df7ea3ad':
Add batch scan data to power stats.
2013-11-07 15:12:58 -08:00
David Christie
587e6bf3fc
Update power widget icons and fix location behavior
...
Bug: 11242129
Change-Id: I29f5b4cf914ece4b0991229f384012eb66ba3820
2013-11-07 11:20:35 -08:00
Robert Greenwalt
6c20565d97
am 384bf727
: am 29b7a844
: Merge "Add batch scan data to power stats." into klp-dev
...
* commit '384bf72708b623bf48a0395a51db94bda055f496':
Add batch scan data to power stats.
2013-11-07 10:43:11 -08:00
Robert Greenwalt
29b7a8446a
Merge "Add batch scan data to power stats." into klp-dev
2013-11-07 18:31:03 +00:00
Kenny Root
856c998aab
am d0e1c273
: am 279c1e15
: am d0de39e7
: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
...
* commit 'd0e1c273dbf9518b84a0a6f8bdcaa14f13246110':
Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:17:49 -08:00
Kenny Root
d0e1c273db
am 279c1e15
: am d0de39e7
: Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
...
* commit '279c1e15d23254728783ad99faff7349d9543ac4':
Revert "Accessibility: filter touches to Enable button"
2013-11-06 15:14:35 -08:00
Kenny Root
d0de39e716
Merge "Revert "Accessibility: filter touches to Enable button"" into klp-dev
2013-11-06 23:09:06 +00:00
Kenny Root
b974fa8034
Revert "Accessibility: filter touches to Enable button"
...
This reverts commit 94d4f23dcc
.
Change-Id: I26a77faed6798e5bf1d51048ffde4aa8b35aae2f
2013-11-06 22:03:52 +00:00
Lifu Tang
9ec08d65c5
am 227043b5
: am 5b68e4c8
: am 741bc054
: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
...
* commit '227043b55722b38cde8508011e2b1748e5ef66bc':
Shows LGAAYL when launching Location Settings
2013-11-06 08:51:56 -08:00
Lifu Tang
227043b557
am 5b68e4c8
: am 741bc054
: Merge "Shows LGAAYL when launching Location Settings" into klp-dev
...
* commit '5b68e4c8d09d9c0cc864e32970c9af925dd0d643':
Shows LGAAYL when launching Location Settings
2013-11-05 22:26:19 -08:00
Lifu Tang
741bc05424
Merge "Shows LGAAYL when launching Location Settings" into klp-dev
2013-11-06 06:20:56 +00:00
Jason Monk
492c8ef15e
am 58f53f9c
: am c85359ef
: am 4e42c808
: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
...
* commit '58f53f9c351329bf51bb548409c047e024d94fc4':
Add PAC UI to Wi-Fi Settings
2013-11-05 18:59:11 -08:00
Jason Monk
58f53f9c35
am c85359ef
: am 4e42c808
: Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
...
* commit 'c85359ef11221c09e7a5d55692ffda0f98b8e00c':
Add PAC UI to Wi-Fi Settings
2013-11-05 18:56:49 -08:00
Jason Monk
4e42c80872
Merge "Add PAC UI to Wi-Fi Settings" into klp-dev
2013-11-06 02:20:50 +00:00
Elliott Hughes
78ab4a51e9
am c26cdd10
: am 98f5e186
: am c3a6cd6e
: Merge "Move a line into try block"
...
* commit 'c26cdd10cfc1e6d209f57247f8ba3fc24ca2f546':
Move a line into try block
2013-11-05 13:00:58 -08:00
Kenny Root
0ea0a07c84
am 8f40097e
: am 18964c90
: am 8cc60da4
: Merge "Accessibility: filter touches to Enable button" into klp-dev
...
* commit '8f40097e169232f9813ad3cf8e8e0a280106de16':
Accessibility: filter touches to Enable button
2013-11-05 12:02:08 -08:00
Jason Monk
070f3560d5
Add PAC UI to Wi-Fi Settings
...
Now when a PAC URL is set it shows it in settings rather than the proxy
spinner set to None. This should only be visible in EDU users as only EDU
has PAC.
Bug: 11528608
Change-Id: Ie4bad8ea935f0a8f1bb7877eb2be146e06d71c2d
2013-11-05 14:39:44 -05:00
Elliott Hughes
c26cdd10cf
am 98f5e186
: am c3a6cd6e
: Merge "Move a line into try block"
...
* commit '98f5e1861da4d708e7199b5d563895cf4d2c8db7':
Move a line into try block
2013-11-05 10:35:25 -08:00
Elliott Hughes
98f5e1861d
am c3a6cd6e
: Merge "Move a line into try block"
...
* commit 'c3a6cd6ee531c81f776551caa40b63732115e971':
Move a line into try block
2013-11-05 10:30:01 -08:00
Kenny Root
8f40097e16
am 18964c90
: am 8cc60da4
: Merge "Accessibility: filter touches to Enable button" into klp-dev
...
* commit '18964c90638dd6d2cdaaaed3001aec40482f45b1':
Accessibility: filter touches to Enable button
2013-11-04 21:55:21 -08:00
Kenny Root
8cc60da4c9
Merge "Accessibility: filter touches to Enable button" into klp-dev
2013-11-05 00:12:19 +00:00
Lifu Tang
fe9420f7da
Shows LGAAYL when launching Location Settings
...
- Partial fix of b/10897468
Change-Id: Iec96909b87e71869c5a020ce848c6cf4fada3616
2013-11-04 11:37:55 -08:00
Shuhrat Dehkanov
7e77699895
Move a line into try block
...
Currently, NumberFormatException is never handled as
Integer.parseInt() is called outside try block.
This moves that line inside try block.
Change-Id: I54544f5a665ca0f821de5351001755cb965078dc
Signed-off-by: Shuhrat Dehkanov <k@efir.uz >
2013-11-01 17:39:44 +09:00
Satoshi Kataoka
6c08377ce8
am 67b3039d
: am 2cab1344
: am aa4fa0ea
: Fix a bug on updating enabled IMEs
...
* commit '67b3039d37c0ca4b4314129bb151183fde614aed':
Fix a bug on updating enabled IMEs
2013-10-31 15:13:47 -07:00
Satoshi Kataoka
67b3039d37
am 2cab1344
: am aa4fa0ea
: Fix a bug on updating enabled IMEs
...
* commit '2cab1344037ada26710047138b59c2f8f0f4dfee':
Fix a bug on updating enabled IMEs
2013-10-31 15:10:17 -07:00
Satoshi Kataoka
aa4fa0ea09
Fix a bug on updating enabled IMEs
...
Bug: 11354619
Change-Id: Ie33630b3dc150536bc0325ad6116ea5fdcf60740
2013-11-01 07:00:13 +09:00
Chris Wren
a32331de8b
am ed4c3aac
: am 455bf4d3
: am 1630ef4f
: remove lockscreen widget checkbox when there\'s no lockscreen.
...
* commit 'ed4c3aacfb020886d420299523059b37abd3f415':
remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 12:05:13 -07:00
Chris Wren
ed4c3aacfb
am 455bf4d3
: am 1630ef4f
: remove lockscreen widget checkbox when there\'s no lockscreen.
...
* commit '455bf4d3395e828dfbeca1f2ef5696e960874ad1':
remove lockscreen widget checkbox when there's no lockscreen.
2013-10-29 12:01:47 -07:00
Chris Wren
1630ef4fc5
remove lockscreen widget checkbox when there's no lockscreen.
...
Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
2013-10-29 13:42:05 -04:00
Jeff Sharkey
457284e858
am 8cd39351
: am bd5cbb04
: am fd845410
: Merge "remove primary condition check on storage format." into klp-dev
...
* commit '8cd39351fe9d1164a06bb4420e2b95c5dd9259fb':
remove primary condition check on storage format.
2013-10-25 16:14:01 -07:00
Jeff Sharkey
8cd39351fe
am bd5cbb04
: am fd845410
: Merge "remove primary condition check on storage format." into klp-dev
...
* commit 'bd5cbb0400366faade3586e19f1deae2350c0ddd':
remove primary condition check on storage format.
2013-10-25 15:06:12 -07:00
Jeff Sharkey
fd845410aa
Merge "remove primary condition check on storage format." into klp-dev
2013-10-25 22:00:07 +00:00
Pierre
93df01e3a7
remove primary condition check on storage format.
...
this change seemed to have been introduced originally
via commit d2a6f28fa7
as a workaround to fix interoperability problem with MTP,
then commit 8218d3ba18
seemed to have address this problem.
therefore it looks like removing the original restriction
is in order to allow formating of the sd-card when not
primary storage.
Bug: 11352632
Change-Id: I0419135a607dac08c44a3f30a7ccdcad17c46437
Signed-off-by: Pierre <pierre@broadcom.com >
2013-10-25 13:12:28 -07:00
Andrew Flynn
d1808bd6c8
Merge "Check for presence of carrier app in Mobile Plan."
2013-10-25 19:55:22 +00:00
Zhihai Xu
5e0b5bd100
am f8ac9d60
: am c9c92647
: am cb9d32e5
: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
...
* commit 'f8ac9d60d4da1a467e02b658d08f3d140f074390':
need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:19:37 -07:00
Zhihai Xu
f8ac9d60d4
am c9c92647
: am cb9d32e5
: Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
...
* commit 'c9c92647d1ab0f75c9f7a499e05fd556c96fa128':
need persist adding bluetooth MAP profile to profile list in case the settings process being killed
2013-10-25 11:17:15 -07:00
Zhihai Xu
cb9d32e55f
Merge "need persist adding bluetooth MAP profile to profile list in case the settings process being killed" into klp-dev
2013-10-25 18:12:48 +00:00
Wink Saville
64217355be
am b557b89c
: am 01b7ae29
: am 83671ff8
: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
...
* commit 'b557b89c4dde4c760b1ce7c6317d3077378692e0':
Display remaining attempts when using or changing SIM PIN
2013-10-25 09:54:35 -07:00
Wink Saville
b557b89c4d
am 01b7ae29
: am 83671ff8
: Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
...
* commit '01b7ae29600f934d491cdc6dafdacf22821baf8d':
Display remaining attempts when using or changing SIM PIN
2013-10-25 09:49:34 -07:00
Wink Saville
83671ff815
Merge "Display remaining attempts when using or changing SIM PIN" into klp-dev
2013-10-25 16:41:09 +00:00
Wink Saville
8246579fa1
Display remaining attempts when using or changing SIM PIN
...
Bug: 9928717
Change-Id: I73718c9e6a8aa7244097e0dd4593a6226ff0ac08
2013-10-23 17:07:10 -07:00