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
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
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
Martijn Coenen
0aee1b1506
am 53083ab2
: Instantiate correct classes for tap&say settings.
...
* commit '53083ab2bbcadf7f1bcbefbaa2e4ee5c85349d84':
Instantiate correct classes for tap&say settings.
2013-08-09 15:22:19 -07:00
Geoffrey Borggaard
863b8839c7
am fc6bc201
: Allow navigation to TrustedCredentials User Certs by intent.
...
* commit 'fc6bc20161edea9e93a7abcd82af5c26870c58bb':
Allow navigation to TrustedCredentials User Certs by intent.
2013-08-09 15:22:15 -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
Martijn Coenen
53083ab2bb
Instantiate correct classes for tap&say settings.
...
Change-Id: I59b08fb8093ec1f9798dc41d8069eccdfc0b2098
2013-08-09 13:41:41 -07:00
Geoffrey Borggaard
fc6bc20161
Allow navigation to TrustedCredentials User Certs by intent.
...
Adds an activity, and an entry in the AndroidManifest.xml
Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63
2013-08-09 16:21:08 -04: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
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
1eb6105f25
am a42cacb3
: Merge "Potential fix for Bug: 10241642" into klp-dev
...
* commit 'a42cacb34b8b6a5c9c0fd1b6c1ba63a121658d6f':
Potential fix for Bug: 10241642
2013-08-08 16:17:51 -07:00
Amith Yamasani
a42cacb34b
Merge "Potential fix for Bug: 10241642" into klp-dev
2013-08-08 23:14:03 +00:00
Amith Yamasani
8287658863
Potential fix for Bug: 10241642
...
Check if the fragment is running before handling click.
Change-Id: I78ab3db5c5d0b3e041cff7525239698c361fd5fb
2013-08-08 16:06:39 -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
Baligh Uddin
921a3144a0
am dcd15ee0
: (-s ours) am 7256942b
: (-s ours) am d01ca3ce
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit 'dcd15ee04bf30f3400c9e5f790ff543bed83734a':
Import translations. DO NOT MERGE
2013-08-08 15:56:12 -07:00
The Android Open Source Project
8c1845a6d6
am 76cbd841
: am f4316f6d
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit '76cbd841931d0de490f4f63c467d6bbdd0feb057':
Import translations. DO NOT MERGE
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Import translations. DO NOT MERGE
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Revert "Completely remove app ops activity."
Completely remove app ops activity.
2013-08-08 15:56:11 -07:00
Baligh Uddin
c7891c6c8d
am ff2aed99
: (-s ours) am b4d720f9
: (-s ours) am 9a53339d
: (-s ours) am e211fd11
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ff2aed99fcc0656c5d5dd989ddd373834631286c':
Import translations. DO NOT MERGE
2013-08-08 15:56:11 -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
Svetoslav
0427cb67d1
am 3f257c4d
: Fix a crash in accessibiility settings.
...
* commit '3f257c4dfba2acc2d61b91baf4f69524a1dc02af':
Fix a crash in accessibiility settings.
2013-08-08 15:52:32 -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
Baligh Uddin
dfa4596778
am 7494ff47
: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '7494ff47aa1e756285810a73a2488af65f2d4cda':
Import translations. DO NOT MERGE
2013-08-08 15:51:19 -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
Baligh Uddin
dcd15ee04b
am 7256942b
: (-s ours) am d01ca3ce
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '7256942bb757bfaa14db128386c0ecb363b26935':
Import translations. DO NOT MERGE
2013-08-08 14:14:17 -07:00
The Android Open Source Project
76cbd84193
am f4316f6d
: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
* commit 'f4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad':
Import translations. DO NOT MERGE
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Import translations. DO NOT MERGE
Fix issue #10190597 : "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Revert "Completely remove app ops activity."
Completely remove app ops activity.
2013-08-08 14:14:12 -07:00
Baligh Uddin
ff2aed99fc
am b4d720f9
: (-s ours) am 9a53339d
: (-s ours) am e211fd11
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b4d720f9d739f5618d6acef9bd87837700c908eb':
Import translations. DO NOT MERGE
2013-08-08 14:14:02 -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
Svetoslav
3f257c4dfb
Fix a crash in accessibiility settings.
...
Change-Id: I27920668191742ab032de7b71c8f71cc35432e9f
2013-08-08 12:37:48 -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
7256942bb7
am d01ca3ce
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit 'd01ca3ce4a5b93dc0dad46ad0674d6b28d89b0ee':
Import translations. DO NOT MERGE
2013-08-07 10:28:43 -07:00
Baligh Uddin
7494ff47aa
Merge "Import translations. DO NOT MERGE"
2013-08-07 17:26:15 +00:00
Baligh Uddin
d01ca3ce4a
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-08-07 17:24:07 +00:00
The Android Open Source Project
f4316f6d5b
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
...
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934
2013-08-07 09:43:18 -07:00