Dianne Hackborn
4f00b368f9
am b1e33884
: Allow tapping on memory status regions to filter proc stats.
...
* commit 'b1e33884190732a58bfbfe659898e02d41fe39f4':
Allow tapping on memory status regions to filter proc stats.
2013-10-11 11:59:51 -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
Baligh Uddin
66b197f32e
am b13b7995
: (-s ours) am bcdb5eec
: (-s ours) am 6e96aff5
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b13b7995884570bbc3f24ac6e15d6fcc72bd7d4d':
Import translations. DO NOT MERGE
2013-10-11 08:37:18 -07:00
Baligh Uddin
b13b799588
am bcdb5eec
: (-s ours) am 6e96aff5
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bcdb5eec863be4b46b608bda586c889760afba0a':
Import translations. DO NOT MERGE
2013-10-11 08:30:50 -07:00
Baligh Uddin
bac6a7e89a
am 672c00c3
: (-s ours) am 3104c1ce
: (-s ours) Import translations. DO NOT MERGE
...
* commit '672c00c34b1494d6681d414b4ca4a6ca0b18ad64':
Import translations. DO NOT MERGE
2013-10-11 08:30:09 -07:00
Baligh Uddin
bcdb5eec86
am 6e96aff5
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6e96aff5546f02199cf4c8aba0bae132d7d35e43':
Import translations. DO NOT MERGE
2013-10-11 08:27:19 -07:00
Baligh Uddin
672c00c34b
am 3104c1ce
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3104c1ce9fd8e06e5c380898b1e9f017825c996a':
Import translations. DO NOT MERGE
2013-10-11 08:27:07 -07:00
Baligh Uddin
855f866cdd
Merge "Import translations. DO NOT MERGE"
2013-10-11 15:22:45 +00:00
Baligh Uddin
38d0357739
Import translations. DO NOT MERGE
...
Change-Id: I2ef84bf546ddd4be1daa67e14bf5152a4bf2b381
Auto-generated-cl: translation import
2013-10-11 01:22:14 -07:00
Baligh Uddin
3104c1ce9f
Import translations. DO NOT MERGE
...
Change-Id: I227ca980e6c3ac5e58184a2b06f8e9151cf99edf
Auto-generated-cl: translation import
2013-10-11 01:17:11 -07:00
Baligh Uddin
6e96aff554
Import translations. DO NOT MERGE
...
Change-Id: I7a39d70c7962e6c2721ea408712e9bdd23770cea
Auto-generated-cl: translation import
2013-10-11 01:12:20 -07:00
Alan Viverette
b57fe58e6e
Merge "Update color blindness descriptions for translation"
2013-10-11 00:34:55 +00:00
Alan Viverette
7ec57940c0
Update color blindness descriptions for translation
...
BUG: 11079175
Change-Id: I4498613c4ce796c2b86de714aebcf7397dffc7c8
2013-10-10 17:34:08 -07:00
David Christie
774a06593e
am 156cec37
: am df0698e9
: am 6d6d4976
: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
...
* commit '156cec37aaf0159ac89199021ce725960e43571d':
Change location settings icons from crosshair to pin -b/8142654
2013-10-10 16:08:21 -07:00
David Christie
156cec37aa
am df0698e9
: am 6d6d4976
: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
...
* commit 'df0698e9f655718743c2d065eae481f1f9d1aba3':
Change location settings icons from crosshair to pin -b/8142654
2013-10-10 16:05:36 -07:00
David Christie
df0698e9f6
am 6d6d4976
: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
...
* commit '6d6d4976104e811dab2eb8a4d3ff0680fc7eb46a':
Change location settings icons from crosshair to pin -b/8142654
2013-10-10 15:39:06 -07:00
David Christie
6d6d497610
Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
2013-10-10 22:28:31 +00: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
Svetoslav
43b8946fb3
am d9f156dd
: Coalescing multiple print job notifications (Settings)
...
* commit 'd9f156ddf072775c894db1ca3c3fe8989be4dbeb':
Coalescing multiple print job notifications (Settings)
2013-10-10 10:14:27 -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
The Android Automerger
b695bb97af
merge in klp-release history after reset to klp-dev
2013-10-10 06:01:39 -07: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
Alan Viverette
4625cac938
am cb2cf8aa
: am b371444b
: am 16ad5748
: Merge "Fix caption settings picker layouts" into klp-dev
...
* commit 'cb2cf8aa4375fc6ba0abf9abffeafebeeb0964e1':
Fix caption settings picker layouts
2013-10-09 13:34:26 -07:00
Alan Viverette
cb2cf8aa43
am b371444b
: am 16ad5748
: Merge "Fix caption settings picker layouts" into klp-dev
...
* commit 'b371444b2fee94045ea97c7f4e97a08610595d61':
Fix caption settings picker layouts
2013-10-09 13:31:04 -07:00
Alan Viverette
b371444b2f
am 16ad5748
: Merge "Fix caption settings picker layouts" into klp-dev
...
* commit '16ad57483d7bba6f5c05ffd64431a900c400eff5':
Fix caption settings picker layouts
2013-10-09 13:29:08 -07:00
Alan Viverette
16ad57483d
Merge "Fix caption settings picker layouts" into klp-dev
2013-10-09 20:25:09 +00: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
c2d73bed9d
am 02099910
: Fix issue #11033002 : Percentages in proc stats details are not rounded correctly
...
* commit '020999103b34860a89576cd5dba862009337e9a9':
Fix issue #11033002 : Percentages in proc stats details are not rounded correctly
2013-10-09 12:18:10 -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
David Christie
6207fc6aef
Change location settings icons from crosshair to pin
...
-b/8142654
Change-Id: I4c0b6aeb56a9a100c2869032bb09dc11cc66dcea
2013-10-09 10:27:10 -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
Ed Heyl
18f4527018
am 9433dc8a
: am 3cc7cf13
: am d8154590
: merge in KFS78N (no-op)
...
* commit '9433dc8ad1fd23d472ee1d80bfad3061505c120d':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-09 09:13:26 -07:00
Ed Heyl
ffb8925d4a
am 92bbd954
: am e1346bc7
: am cfa55e16
: merge in KQS81M
...
* commit '92bbd95423a03b1c021eb047b484bf12432fac4d':
Import translations. DO NOT MERGE
Print settings polish
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-09 09:12:40 -07:00
Nick Kralevich
a5418e33e3
Fix build.
...
I have no idea if this is an appropriate change, but it's the
smallest patch I could come up with that lets the code compile.
Change-Id: I363386a23cd70f7a1207c5711d2e4b92e8e23937
2013-10-09 08:57:19 -07:00
The Android Automerger
6fdb862e1a
merge in klp-release history after reset to klp-dev
2013-10-09 06:01:57 -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
Lifu Tang
9dc55e348a
am 8a4c53ac
: Limits the broadcast to system apps only
...
* commit '8a4c53ac2bbd2eca81a8725212d4d61672fbfdef':
Limits the broadcast to system apps only
2013-10-08 21:32:08 -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
Ed Heyl
9433dc8ad1
am 3cc7cf13
: am d8154590
: merge in KFS78N (no-op)
...
* commit '3cc7cf1396a3e405f4b3eb8c51962423e2bcd10e':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-08 16:16:03 -07:00
Ed Heyl
3cc7cf1396
am d8154590
: merge in KFS78N (no-op)
...
* commit 'd8154590d5062598db8067c460aff54cbe49dd9e':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-08 16:09:39 -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
Ed Heyl
d8154590d5
merge in KFS78N (no-op)
2013-10-08 16:02:00 -07:00
Ed Heyl
92bbd95423
am e1346bc7
: am cfa55e16
: merge in KQS81M
...
* commit 'e1346bc75ae62bb9ceb31d42b5293df23150f7d2':
Import translations. DO NOT MERGE
Print settings polish
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
2013-10-08 15:58:16 -07:00
Ed Heyl
e1346bc75a
am cfa55e16
: merge in KQS81M
...
* commit 'cfa55e164b78c8b150cab82345c1c5be01f69c90':
Import translations. DO NOT MERGE
Print settings polish
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Fix bug when sharing to bluetooth.
Fix for TTS settings crash.
Restriction pin changes.
Remove Restrictions UI
Add some missing fragments to the whitelist
Potential fix for Settings instability on x-large.
Fix accidental creation of restriction entry for required apps
Fix broken strings in Settings
Always allow formatting of physical storage.
Guard against missing terminal app.
2013-10-08 15:47:50 -07:00