Commit Graph

11039 Commits

Author SHA1 Message Date
Baligh Uddin
c41b1e93d0 am b142c946: (-s ours) am a45cd5a6: (-s ours) Import translations. DO NOT MERGE
* commit 'b142c9462f138de363ea1f6c42eaf5884ff2b645':
  Import translations. DO NOT MERGE
2013-08-13 00:47:30 -07:00
Baligh Uddin
b142c9462f am a45cd5a6: (-s ours) Import translations. DO NOT MERGE
* commit 'a45cd5a60ef71e70c4d4530370f46766d517541a':
  Import translations. DO NOT MERGE
2013-08-13 00:43:55 -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
Martijn Coenen
75d525fc88 am 0aee1b15: am 53083ab2: Instantiate correct classes for tap&say settings.
* commit '0aee1b150624f4b36e52e47fa97b8a18350d2df5':
  Instantiate correct classes for tap&say settings.
2013-08-09 15:54:17 -07:00
Geoffrey Borggaard
a934cff8eb am 863b8839: am fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
* commit '863b8839c7685554b41f3143472a6f379fd29ad1':
  Allow navigation to TrustedCredentials User Certs by intent.
2013-08-09 15:54:16 -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
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
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
Amith Yamasani
3fd2bbecc2 am 1eb6105f: am a42cacb3: Merge "Potential fix for Bug: 10241642" into klp-dev
* commit '1eb6105f25dcecde565f9d56e5c87feed7bd520d':
  Potential fix for Bug: 10241642
2013-08-09 06:05:56 -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
Baligh Uddin
fcf69cbb9d am 921a3144: (-s ours) am dcd15ee0: (-s ours) am 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '921a3144a06496acfb06b512e443473141056304':
2013-08-08 16:58:46 -07:00
The Android Open Source Project
9a2548db22 am 8c1845a6: (-s ours) am 76cbd841: am f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '8c1845a6d669b03c2827965042f2e47e49f2d6b1':
2013-08-08 16:58:45 -07:00
Baligh Uddin
1023be95cd am c7891c6c: (-s ours) am ff2aed99: (-s ours) am b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit 'c7891c6c8d309710a4b948ad2084e43bcd7ebe5c':
2013-08-08 16:58:44 -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
Svetoslav
fe5d465877 am 0427cb67: am 3f257c4d: Fix a crash in accessibiility settings.
* commit '0427cb67d1545d38859e6522905b4a78d82bacc7':
  Fix a crash in accessibiility settings.
2013-08-08 16:58:41 -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
Lifu Tang
0292bfe072 am 7b449db2: am b14698ee: Merge "Finished the location settings"
* commit '7b449db21ecae05f95355544936bd840a89601c7':
2013-08-08 16:58:39 -07:00
Jason Monk
e273d0b22f am 49d6f604: am 71decb7b: Merge "Restriction pin changes."
* commit '49d6f604f1ce05d90c8bdf25330fe8eb3eb924c9':
2013-08-08 16:58:39 -07:00
Baligh Uddin
623b444932 am dfa45967: (-s ours) am 7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit 'dfa4596778b39d07aa7f27145baedee31d17cd48':
2013-08-08 16:58:38 -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