Tom O'Neill
4a41f33c5a
am 0574c26c
: am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit '0574c26c36b1b760d80107fb4171cdcb642aabf1':
Settings app supports location settings injection
2013-08-13 17:37:55 -07:00
Tom O'Neill
0574c26c36
am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
Settings app supports location settings injection
2013-08-13 17:34:20 -07:00
Tom O'Neill
cabe7e8218
Merge "Settings app supports location settings injection" into klp-dev
2013-08-14 00:30:30 +00:00
Tom O'Neill
e2921c9566
Settings app supports location settings injection
...
- Partial fix for b/10287745
Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
2013-08-12 16:22:48 -07:00
Baligh Uddin
f5ecf575da
Import translations. DO NOT MERGE
...
Change-Id: Id616ecb4c01bfd2a4ee8fa3199c3e2dfc0140f62
Auto-generated-cl: translation import
2013-08-12 11:54:53 -07:00
Baligh Uddin
a45cd5a60e
Import translations. DO NOT MERGE
...
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
2013-08-12 11:51:11 -07:00
Zhihai Xu
9bef999b87
am eb9cecd9
: am 6ee5b450
: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit 'eb9cecd98b280c508b88d03ad788202ac0e35e53':
Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 18:52:07 -07:00
Zhihai Xu
eb9cecd98b
am 6ee5b450
: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit '6ee5b4508083fd0dd340396d66927c0fc8870a9b':
Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 18:49:59 -07:00
Zhihai Xu
6ee5b45080
Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
2013-08-10 01:46:22 +00:00
Dianne Hackborn
0d78150a1f
am 3c7fdfd9
: am a582a051
: Proc stats UI improvements.
...
* commit '3c7fdfd9e957ddb68fccba524a12fab84b469744':
Proc stats UI improvements.
2013-08-09 16:49:18 -07:00
Dianne Hackborn
3c7fdfd9e9
am a582a051
: Proc stats UI improvements.
...
* commit 'a582a051951be9b1afd57e05fd6a405bccd9a46f':
Proc stats UI improvements.
2013-08-09 16:38:11 -07:00
Dianne Hackborn
a582a05195
Proc stats UI improvements.
...
Now have a chart showing the memory state, and text showing the
current memory state. Trying to do better at picking the application
to blame for a process hosting multiple apps. Start of infrastructure
for more detailed reporting.
Change-Id: I93ca7ecf2fd0bc01e3be8d28b80212ac78fe7607
2013-08-09 16:17:27 -07:00
Dianne Hackborn
19d80679a6
am b690af54
: am f3796d0b
: Merge "Improve process stats UI." into klp-dev
...
* commit 'b690af54dc0c5e82d15226c5a85be713bcd25db2':
Improve process stats UI.
2013-08-09 15:54:15 -07:00
Alan Viverette
2a19a31c94
am 85c37e78
: am c0f79432
: Merge "Update captioning settings to match final design" into klp-dev
...
* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
Update captioning settings to match final design
2013-08-09 15:54:15 -07:00
Matthew Xie
5b5b1e39dd
Bluetooth MAP profile - sms and mms support initial check-in
...
bug:10116530
Change-Id: I3f50e66420e53bf21a1ecba06aed6b8261ff3064
2013-08-09 15:47:10 -07:00
Dianne Hackborn
b690af54dc
am f3796d0b
: Merge "Improve process stats UI." into klp-dev
...
* commit 'f3796d0bf8bfa3a0e4359dcdf4017961bd312dea':
Improve process stats UI.
2013-08-09 15:22:08 -07:00
Alan Viverette
85c37e78b5
am c0f79432
: Merge "Update captioning settings to match final design" into klp-dev
...
* commit 'c0f79432cff613e993a86bece93ab1ef674d9054':
Update captioning settings to match final design
2013-08-09 15:22:05 -07:00
Dianne Hackborn
f3796d0bf8
Merge "Improve process stats UI." into klp-dev
2013-08-09 19:14:00 +00:00
Alan Viverette
c0f79432cf
Merge "Update captioning settings to match final design" into klp-dev
2013-08-09 19:11:25 +00:00
Dianne Hackborn
c9e4bd1116
Improve process stats UI.
...
Now roll up multiple process stats to have at least a
day of data, change the visualization to have the bars show
"weight" (duration*pss) and the text the percent of total
time running, add label to show how much time the stats
are over.
Change-Id: I73763cb6a66d03d856ea4bf517eac0fe39c79c52
2013-08-09 12:08:54 -07:00
Amith Yamasani
d0a3f8727f
am d04e36e6
: am 2f219c51
: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
...
* commit 'd04e36e6f2259747dac4c4a1fa0393f72dc078af':
Fix inconsistent text in Settings>Security>Screen lock
2013-08-09 06:06:52 -07:00
Dianne Hackborn
942c6e5ca3
am cd20ebcc
: am c6d658e3
: Initial rough stab at a proc stats UI.
...
* commit 'cd20ebcc8c0261765fa8e6de57df3f72062c710e':
Initial rough stab at a proc stats UI.
2013-08-09 02:37:10 -07:00
Amith Yamasani
d04e36e6f2
am 2f219c51
: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
...
* commit '2f219c51ad2151c9d31912d836276679e0dd747d':
Fix inconsistent text in Settings>Security>Screen lock
2013-08-08 17:31:23 -07:00
Amith Yamasani
2f219c51ad
Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
2013-08-09 00:28:49 +00:00
Amith Yamasani
def5e5eb06
Fix inconsistent text in Settings>Security>Screen lock
...
Bug: 10157179
Change-Id: Ib508b161d87248679fb9b8f3dae1584f73f18dcb
2013-08-08 17:27:23 -07:00
Amith Yamasani
6d60f2dee1
am 05e2459f
: am 82f7c064
: Merge "Developer option to force RTL layout direction" into klp-dev
...
* commit '05e2459fb85848b19362554a7ffeb2e9b50da720':
Developer option to force RTL layout direction
2013-08-08 16:58:43 -07:00
David Christie
4628dcaaec
am aba6eb64
: am b8fa4d9f
: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
...
* commit 'aba6eb64633e7957afe036a5d7c506b9c059ec3e':
Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off.
2013-08-08 16:58:42 -07:00
Lifu Tang
83617ffcf8
am 098061c2
: am 88afb32f
: Displays a list of most recent location apps
...
* commit '098061c2022164e169ec40e6114b48dd5bfcaff2':
Displays a list of most recent location apps
2013-08-08 16:58:40 -07:00
Dianne Hackborn
cd20ebcc8c
am c6d658e3
: Initial rough stab at a proc stats UI.
...
* commit 'c6d658e37d7c0ab2d264fff4850ea20823669558':
Initial rough stab at a proc stats UI.
2013-08-08 16:06:21 -07:00
Amith Yamasani
05e2459fb8
am 82f7c064
: Merge "Developer option to force RTL layout direction" into klp-dev
...
* commit '82f7c064483732c925dfd12547bd32ffac211cd5':
Developer option to force RTL layout direction
2013-08-08 15:52:33 -07:00
David Christie
aba6eb6463
am b8fa4d9f
: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
...
* commit 'b8fa4d9fe85c7513a8a5d9b1b6bcf3b8e5473849':
Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off.
2013-08-08 15:52:33 -07:00
Lifu Tang
098061c202
am 88afb32f
: Displays a list of most recent location apps
...
* commit '88afb32fc6422139dcf8340aa88f3de9112a1485':
Displays a list of most recent location apps
2013-08-08 15:51:21 -07:00
Lifu Tang
7b449db21e
am b14698ee
: Merge "Finished the location settings"
...
* commit 'b14698ee6063960d48a691add890a5072f89ea2e':
Finished the location settings
2013-08-08 15:51:20 -07:00
Jason Monk
49d6f604f1
am 71decb7b
: Merge "Restriction pin changes."
...
* commit '71decb7b072d69613083285cee6014d37b2e6ef8':
Restriction pin changes.
2013-08-08 15:51:20 -07:00
Dianne Hackborn
c6d658e37d
Initial rough stab at a proc stats UI.
...
You see procs, and you see some stats.
Change-Id: I91c86d198fd5e64a41c72901e150466b3c602caf
2013-08-08 15:01:59 -07:00
Amith Yamasani
82f7c06448
Merge "Developer option to force RTL layout direction" into klp-dev
2013-08-08 20:46:24 +00:00
David Christie
b8fa4d9fe8
Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
2013-08-08 20:19:06 +00:00
Alan Viverette
660223ff43
Update captioning settings to match final design
...
BUG: 9926077
Change-Id: I058c05643f33aca89327f23bcdee53dd8afb3bbb
2013-08-08 12:51:54 -07:00
David Christie
681f799007
Modify Power Widget Gps Icon To Represent Location.
...
Instead of directly controlling gps on/off, it will
control master location switch on/off.
Change-Id: I12a20fb77c12b5099172167821ff7ed00ba9ea7c
2013-08-08 19:35:31 +00:00
Amith Yamasani
df1eda8ef7
Developer option to force RTL layout direction
...
Sets a global setting and system property and forces a config change
when developer selects to force RTL screen layout direction.
Bug: 10244047
Change-Id: Id91e52be5e492515ff1eef3cbccfb08e944bfc92
2013-08-08 12:34:56 -07:00
Lifu Tang
88afb32fc6
Displays a list of most recent location apps
...
Change-Id: I8e34ca8c30f308744022f17fac2444a496abd9e6
(cherry picked from commit 16ab0eca74751c331c1c74612548a27735a450b7)
2013-08-08 18:38:11 +00:00
Lifu Tang
b14698ee60
Merge "Finished the location settings"
2013-08-08 00:55:39 +00:00
Lifu Tang
e631423290
Finished the location settings
...
Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9
2013-08-07 17:45:24 -07:00
Jason Monk
71decb7b07
Merge "Restriction pin changes."
2013-08-07 19:10:42 +00:00
Geoffrey Borggaard
6e1102d9fa
Restriction pin changes.
...
Fixed bug in WirelessSettings where it was asking users for a PIN when
they weren't restricted. Did this by refactoring the preference level
pin checking into the superclass, where it checks for the restricted mode first.
Also pin protected changes to certificates for restricted users.
Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
2013-08-07 14:57:43 -04:00
Baligh Uddin
7494ff47aa
Merge "Import translations. DO NOT MERGE"
2013-08-07 17:26:15 +00:00
Martijn Coenen
7f34fab684
Merge "NFC payment settings."
2013-08-07 02:28:40 +00:00
Martijn Coenen
26515da087
NFC payment settings.
...
First version, pending final UX.
Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148
2013-08-06 19:16:54 -07:00
Amith Yamasani
56f51a8927
Single pane for 10" Settings
...
Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
2013-08-06 16:23:37 -07:00
Alan Viverette
cc0e782871
Add captioning preferences screen
...
BUG: 9926077
Change-Id: Iea141d5d6fd0e4f134c36c51d89830b3c31abd09
2013-08-06 13:53:58 -07:00