Vineeta Srivastava
7531e1b153
am 4a66909a
: am 7a40def1
: am 47963424
: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
...
* commit '4a66909a6aae9d35ebc13fb377a41e525bd0f6c9':
Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:17:13 -07:00
John Spurlock
ab44400e45
am d947e49b
: am ada38ffa
: am 311a7845
: Merge "Inherit translucent bars in keyguard widget picker." into klp-dev
...
* commit 'd947e49b02ba7d8d47263b94893d85067ae0c3ad':
Inherit translucent bars in keyguard widget picker.
2013-10-23 16:17:12 -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
21d9dced4a
am ce62f3ef
: am 592ed214
: am 55f03857
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit 'ce62f3efc05fe515a93cc6c368eb37be6a8657c1':
BT keeps on asking me if I want to allow car to do stuff
2013-10-18 11:57:56 -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
Satoshi Kataoka
aa71b635b8
Refresh "InputMethodPreference"s onResume
...
Bug: 11245599
Change-Id: I015075d57ebed94d6b76a66de135ee748e27e3a6
2013-10-18 18:50:37 +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
0b4aec4d7b
am e7f63626
: am 820e7010
: am 3f90a454
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit 'e7f636264b769918ca46148f1db1038d1cd84830':
BT keeps on asking me if I want to allow car to do stuff
2013-10-16 19:35:03 -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
605a49867a
am 06c0a90d
: am a31d8b71
: am 235e5d68
: User ID, not uid, in an EXTRA_USER_HANDLE
...
* commit '06c0a90d7805a8fdce4156af839a6e4d14b33702':
User ID, not uid, in an EXTRA_USER_HANDLE
2013-10-16 13:46:45 -07: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)
deb0a156bb
Resolved conflicts for merge of 67e72aa4
to master
...
Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396
2013-10-15 13:37:35 +01: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
Yuhao Zheng
b8b3f5bee0
Merge "Refresh peer list when entering wifi p2p settings"
2013-10-15 00:25:28 +00: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
Zhihai Xu
b2201f586d
am c326942d
: am cf71c2d3
: am 83936d96
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit 'c326942dfd68ee60b8b0c9f244c8e3c1798b48e1':
BT keeps on asking me if I want to allow car to do stuff
2013-10-11 14:13:33 -07:00
Zhihai Xu
c326942dfd
am cf71c2d3
: am 83936d96
: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
...
* commit 'cf71c2d3e31375fa68fd65f1ec39fcce62a4b4c3':
BT keeps on asking me if I want to allow car to do stuff
2013-10-11 14:10:13 -07:00
Yuhao Zheng
5d2169eb6f
Refresh peer list when entering wifi p2p settings
...
When wifi p2p is connected, entering Wi-Fi Direct UI won't show any peer devices
until a WIFI_P2P_PEERS_CHANGED_ACTION broadcast is received (long after or never).
Users may be confused and think p2p is disconnected. It's more user friendly to
display connected devices right at the beginning.
In addition, this CL removes the useless mWifiP2pManager.requestGroupInfo call.
Bug: 11175553
Change-Id: I0f0834043a2cf6e8fc20319e6861b62484478146
2013-10-11 14:08:48 -07:00
Zhihai Xu
83936d967d
Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev
2013-10-11 21:02:51 +00:00
Dianne Hackborn
5e53e25e8d
am 47be2e84
: am 4f00b368
: am b1e33884
: Allow tapping on memory status regions to filter proc stats.
...
* commit '47be2e84d0b0f603357646ae18a2bc39b8b148cf':
Allow tapping on memory status regions to filter proc stats.
2013-10-11 12:55:04 -07:00
Dianne Hackborn
47be2e84d0
am 4f00b368
: am b1e33884
: Allow tapping on memory status regions to filter proc stats.
...
* commit '4f00b368f9fcc27d43dfc63c3ac9d6fedf8a070d':
Allow tapping on memory status regions to filter proc stats.
2013-10-11 12:50:07 -07:00
Zhihai Xu
9998639a65
BT keeps on asking me if I want to allow car to do stuff
...
We can remember it as a non persist global value when user click no.
This value won't be saved when power down.
We will restore the permission choice
when we are disconnected with the remote device.
So the "no" choice selected by user will only take effect
until we are disconnected with the remote device.
bug:11176511
Change-Id: Ic0c0829587cf7a812b5fa96fbd381921f67c186f
2013-10-11 12:15:19 -07:00
Dianne Hackborn
b1e3388419
Allow tapping on memory status regions to filter proc stats.
...
Change-Id: Iade56907df648a95600919578154635c49ac9dce
2013-10-11 11:54:34 -07:00
Yuhao Zheng
aa62e2be18
Merge "Wi-Fi Direct setting UI: handle p2p disable state"
2013-10-11 18:38:09 +00:00
Andrew Flynn
17c008e9d0
Check for presence of carrier app in Mobile Plan.
...
When the user chooses Mobile Plan in Settings, first do a check to see if
a valid carrier app for the current MCC/MNC exists. If so, launch that app
instead of checking for a provisioning URL or hoping for a DNS redirect in
the browser. If no such app exists, continue on as normal.
Bug: 9623212
Change-Id: I81538063d4cdd147948a83ffc0c2641174ba9001
2013-10-11 09:21:41 -07:00
Svetoslav
b05be5fe0f
am be74fb8d
: am 43b8946f
: am d9f156dd
: Coalescing multiple print job notifications (Settings)
...
* commit 'be74fb8d729828642cce0514e1043c290e8ceea0':
Coalescing multiple print job notifications (Settings)
2013-10-10 10:24:35 -07:00
Svetoslav
be74fb8d72
am 43b8946f
: am d9f156dd
: Coalescing multiple print job notifications (Settings)
...
* commit '43b8946fb3071a1454aa17c352a34c2d389c096e':
Coalescing multiple print job notifications (Settings)
2013-10-10 10:17:46 -07:00
Yuhao Zheng
acac38011b
Wi-Fi Direct setting UI: handle p2p disable state
...
This is not a normal use case as we can't enter Wi-Fi Direct setting when p2p
is disabled. However we can make this happen by entering Wi-Fi Direct setting
screen then disabling wifi via quick settings.
Previous UI implementation didn't handle p2p enable->disable change completely,
leaving the screen out-of-date until we change the screen orientation.
Now we always attach mThisDevicePref/mPeersGroup/mPersistentGroup to the screen,
but just disable them when p2p is disabled. Another advantage of doing this is
to avoid b/11050625, which occurs when a PreferenceGroup is not attached to the
PreferenceScreen.
Bug: 11133069
Change-Id: I9be7b6e396d7677b5a33df8e6294b4a0aa6bd389
2013-10-10 10:08:45 -07:00
Yuhao Zheng
e4d0d1e0c4
Merge "Fix NPE in Wi-Fi Direct Setting UI"
2013-10-10 16:18:07 +00:00
Svetoslav
d9f156ddf0
Coalescing multiple print job notifications (Settings)
...
We used to show a single notificaiton for every print job but
this is against th UX guidelines. Since we have to lead by
example, this change adds coalescing of multiple notifications.
bug:11155212
Change-Id: I865450495e7e85bd6620c1f42aeef07d2f83a01a
2013-10-09 23:40:56 -07:00
Dianne Hackborn
f337e3eb23
am 1acb82c5
: am c2d73bed
: am 02099910
: Fix issue #11033002 : Percentages in proc stats details are not rounded correctly
...
* commit '1acb82c563badb953831ed06216349260a89c3ac':
Fix issue #11033002 : Percentages in proc stats details are not rounded correctly
2013-10-09 12:23:52 -07:00
Dianne Hackborn
1acb82c563
am c2d73bed
: am 02099910
: Fix issue #11033002 : Percentages in proc stats details are not rounded correctly
...
* commit 'c2d73bed9d1ed3cac7236bc9bf7b247871c9285d':
Fix issue #11033002 : Percentages in proc stats details are not rounded correctly
2013-10-09 12:21:42 -07:00
Dianne Hackborn
020999103b
Fix issue #11033002 : Percentages in proc stats details are not rounded correctly
...
Use round instead of ceil. Also, when showing services from multiple packages,
sort the package categories by the duration of the longest running service in
each, so that the more important ones come first.
Change-Id: I42b47b0522cd786a1c4ee5b59a549ec7c0c6ffe1
2013-10-09 12:06:59 -07:00
Lifu Tang
7ada0da0e9
am e40897a8
: am 9dc55e34
: am 8a4c53ac
: Limits the broadcast to system apps only
...
* commit 'e40897a8808d62ead601982a7d7771d64a2359c6':
Limits the broadcast to system apps only
2013-10-09 09:14:28 -07:00
Lifu Tang
e40897a880
am 9dc55e34
: am 8a4c53ac
: Limits the broadcast to system apps only
...
* commit '9dc55e348af75d7f22090de03e2a123bf961ab08':
Limits the broadcast to system apps only
2013-10-08 21:34:17 -07:00
Svetoslav
7dfacf5f8c
resolved conflicts for merge of 372cd6ab
to master
...
Change-Id: I9232fbe01926436e8ad5c6c7e63ce95fbe842ccb
2013-10-08 17:42:25 -07:00
Lifu Tang
8a4c53ac2b
Limits the broadcast to system apps only
...
- Part of b/10974059
Change-Id: I1f0b6eeece88a2ee29b76636b9ce58dcc3d71aad
2013-10-08 16:23:52 -07:00
Christopher Tate
c7158f4e57
am 7e776ad7
: am 3eb0f422
: am eff0927d
: Merge "Once we decide to show Home settings, keep it shown forever" into klp-dev
...
* commit '7e776ad76ce60eb0c68fb54b640b18c0e9843a04':
Once we decide to show Home settings, keep it shown forever
2013-10-08 16:02:45 -07:00