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
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
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
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
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
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
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
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
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
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
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
Vineeta Srivastava
4a66909a6a
am 7a40def1
: am 47963424
: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
...
* commit '7a40def17c40279faf8ad01d730c88498cd2f549':
Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:14:35 -07:00
John Spurlock
d947e49b02
am ada38ffa
: am 311a7845
: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
...
* commit 'ada38ffa3b8dca416a169d57061d2b1bdfc0cfdc':
Inherit translucent bars in keyguard widget picker.
2013-10-23 16:14:35 -07:00
Vineeta Srivastava
479634248d
Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
2013-10-23 23:09:48 +00:00
Sungmin Choi
2490315e49
Remove Manage Mobile Plan when config_show_mobile_plan is set to false
...
config_show_mobile_plan is set to true by default.
When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay.
Bug: 10819853
Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987
2013-10-23 21:29:14 +00:00
John Spurlock
daace3fa2e
Inherit translucent bars in keyguard widget picker.
...
Bug:11337231
Change-Id: Ie65d5474328cec859637ba7771da5e93509236ae
2013-10-22 16:12:58 -04:00
Zhihai Xu
1b5bd091eb
need persist adding bluetooth MAP profile to profile list in case the settings process being killed
...
bug:11303213
Change-Id: I1f227839931872ba6fdca0b5932a24e0b002ec44
2013-10-19 23:37:35 -07:00
Zhihai Xu
ce62f3efc0
am 592ed214
: am 55f03857
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit '592ed21459e543dc70c3845e808834d3226492cb':
BT keeps on asking me if I want to allow car to do stuff
2013-10-18 11:55:21 -07:00
Zhihai Xu
55f03857b7
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
2013-10-18 18:51:16 +00:00
Satoshi Kataoka
544db7fad0
am 56f47bf1
: am ea90cd2f
: Do not merge. Refresh "InputMethodPreference"s onResume
...
* commit '56f47bf11bb041eff3333c9047a6ebef5d50a59e':
Do not merge. Refresh "InputMethodPreference"s onResume
2013-10-18 11:21:32 -07:00
Satoshi Kataoka
ea90cd2fca
Do not merge. Refresh "InputMethodPreference"s onResume
...
Corresponding change is I015075d57ebed94d6b
Bug: 11245599
Change-Id: I8be2b9a81d41fab979afe000bd1bce6fc57550c7
2013-10-18 18:55:07 +09:00
Zhihai Xu
1083b4726b
BT keeps on asking me if I want to allow car to do stuff
...
Persist the "no" count
bug:11176511
Change-Id: I39674334fe8bf09d1f3f2b07c12513a6c46f053b
2013-10-17 17:11:38 -07:00
Zhihai Xu
e7f636264b
am 820e7010
: am 3f90a454
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit '820e70102e61e290a59ad545f42fac4336aa4e9c':
BT keeps on asking me if I want to allow car to do stuff
2013-10-16 19:31:52 -07:00
Zhihai Xu
3f90a45448
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
2013-10-17 02:27:10 +00:00
Christopher Tate
06c0a90d78
am a31d8b71
: am 235e5d68
: User ID, not uid, in an EXTRA_USER_HANDLE
...
* commit 'a31d8b7194793a2ef01f36bd07d70043762de02e':
User ID, not uid, in an EXTRA_USER_HANDLE
2013-10-16 13:43:46 -07:00
Christopher Tate
235e5d686f
User ID, not uid, in an EXTRA_USER_HANDLE
...
Bug 11208808
Change-Id: Ica30c2114c922fc38460cafc14c02f10051717c9
2013-10-16 13:27:27 -07:00
Kenny Root
94d4f23dcc
Accessibility: filter touches to Enable button
...
To prevent tap-jacking, filter touches to the enable button if there is
another window obscuring the screen.
Bug: 11242907
Change-Id: I0228cd480faf8e7ebf70394d9bb60fa2e4138fb4
2013-10-16 10:10:47 -07:00
Zhihai Xu
3fd5e2839f
BT keeps on asking me if I want to allow car to do stuff
...
remember how many time the user choose the "no",
if user choose "no" twice, we will make it persist.
bug:11176511
Change-Id: I7234e7b4ba4586065dea462029e2da5ddaf53316
2013-10-15 11:27:54 -07:00
Torne (Richard Coles)
67e72aa49e
am 9880646e
: am f88e5442
: Merge "Remove experimental WebView setting." into klp-dev
...
* commit '9880646e197331b99ba9824b7d47f12391c82bf4':
Remove experimental WebView setting.
2013-10-15 03:37:07 -07:00
Torne (Richard Coles)
0bf324c628
Remove experimental WebView setting.
...
The experimental WebView is no longer experimental; remove the setting
from the settings app.
Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
2013-10-14 17:35:43 +01:00