PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,312 Commits 1 Branch 0 Tags
49c1180bcadf4d6d027e683314fb8f8cd47ff90c
Commit Graph

12312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
8dd824b60b Import translations. DO NOT MERGE 
Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import
 2013-10-11 14:51:44 -07:00
Baligh Uddin
9c861f80a2 Import translations. DO NOT MERGE 
Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import
 2013-10-11 14:47:56 -07: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
cf71c2d3e3 am 83936d96: Merge "BT keeps on asking me if I want to allow car to do stuff" into klp-dev 
* commit '83936d967d0e880401843161feda649c5bd96bc1':
  BT keeps on asking me if I want to allow car to do stuff
 2013-10-11 14:06:13 -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
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