98294 Commits

Author SHA1 Message Date
Dianne Hackborn
2a8de804a2 am 350d5168: Merge "Correcting typo in doc of MEDIA_XXX intents"
* commit '350d5168e495c642873ee511d4e8dc27ac5377ce':
  Correcting typo in doc of MEDIA_XXX intents
2013-01-07 12:16:40 -08:00
Dianne Hackborn
138a3d3f1a am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf."
* commit 'd5d6f04f2ab0db0aea03e3ab1cdd378fcc952bad':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
2013-01-07 12:16:23 -08:00
Romain Guy
7d1c4fa322 Remove out-of-date comment and rename constant
Change-Id: I0c60d349505776cff0d7e5360e87ac5584dc5876
2013-01-07 11:55:27 -08:00
Romain Guy
4a62374544 Merge "Fix issue when toggling profiling from visual to off to visual" 2013-01-07 11:31:49 -08:00
Romain Guy
666d5daab2 Fix issue when toggling profiling from visual to off to visual
Change-Id: I4a623020a9bf0079029d184c13e58d92e692faf8
2013-01-07 11:29:14 -08:00
Chris Wren
64161ccb2f add logging to debug panel touches.
Turn on gesture recorder.
Add events to the Event Log.

Bug:7686690
Change-Id: I53b7d43f5bdc002360e305182597765f3c430b11
2013-01-07 14:25:58 -05:00
Dianne Hackborn
350d5168e4 Merge "Correcting typo in doc of MEDIA_XXX intents" 2013-01-07 11:21:54 -08:00
Romain Guy
31ffc57139 Merge "Update profiling properties" 2013-01-07 11:20:20 -08:00
Dianne Hackborn
d5d6f04f2a Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 2013-01-07 11:19:11 -08:00
Romain Guy
a4fef0260b Update profiling properties
This change merges debug.hwui.profiling and profiling_visualize.
Now only the first property exists and accepts the values true, false
and visual. This enables setting the property from Settings.

Change-Id: I16a11fe23ac1a6bb907a1a826e418d6b3994b56c
2013-01-07 11:18:38 -08:00
Romain Guy
e1730e77a3 Merge "Use dp units instead of px to draw profiling graph" 2013-01-07 11:00:13 -08:00
Romain Guy
98e4a52cc0 Use dp units instead of px to draw profiling graph
Change-Id: Iba24b21ebe46738c6b1d6d320ce34af71f7c769d
2013-01-07 10:58:34 -08:00
Mikhail Naganov
cb000a68cb Update JavaDoc for WebSettings.{get|set}UseWideViewPort
Based on a black-box inspection of WebView behavior.

Change-Id: I8823dab9ef2302cf7d11abec87a64e854db9e116
2013-01-07 17:54:19 +00:00
Alon Albert
35d67ec31a Merge "Put some useful information in User-Agent Header" 2013-01-07 09:18:52 -08:00
Baligh Uddin
025cca9bce Import translations. DO NOT MERGE
Change-Id: I95ee4260cb3815af663678cf1bee15d7e5861862
Auto-generated-cl: translation import
2013-01-07 08:59:47 -08:00
Jeff Sharkey
0ada5d656d Merge "Expose roaming flag for testing." 2013-01-05 09:51:20 -08:00
Romain Guy
63e2098b74 Merge "Make profiling graph more readable in all apps" 2013-01-04 19:32:50 -08:00
Romain Guy
63f4d84ec2 Make profiling graph more readable in all apps
Change-Id: Ic9467d4420c2aa8d295d0045c714c9f8e6269220
2013-01-04 19:31:12 -08:00
Romain Guy
9acd1b4fa8 Merge "Add visual profiling feature" 2013-01-04 19:24:10 -08:00
Romain Guy
672433d90f Add visual profiling feature
When profiling is enabled with debug.hwui.profile set to true,
setting debug.hwui.profile_visualizer to true will display the
profiling data directly on screen.

Change-Id: I3d5fe3f0347090815087b1cbfce66b8e76d9347b
2013-01-04 19:21:54 -08:00
Scott Main
6c3c8a3c9a am 7ba7c19f: am f3b617fd: am bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
* commit '7ba7c19f08cec5bec1e30bbe443e2ec9688fbfdd':
  move the nsdchat sample to proper download directory
2013-01-04 19:07:21 -08:00
Scott Main
7ba7c19f08 am f3b617fd: am bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
* commit 'f3b617fdef50d21a4dd829c8be623455abfa7fb3':
  move the nsdchat sample to proper download directory
2013-01-04 19:04:44 -08:00
Scott Main
f3b617fdef am bc522717: am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
* commit 'bc522717a7bbb0284d6bc37858ddda499b5c0696':
  move the nsdchat sample to proper download directory
2013-01-04 19:02:09 -08:00
Scott Main
c3a2735c98 am 1a67e292: am 79393df9: am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
* commit '1a67e29262acba85396e85cf2d9c5dfdb28241c8':
  move network usage sample zip
2013-01-04 19:01:37 -08:00
Scott Main
bc522717a7 am 93a4ab2f: am 8f70a7c4: move the nsdchat sample to proper download directory
* commit '93a4ab2fa2efd8908c30298796af710c1ec0f85f':
  move the nsdchat sample to proper download directory
2013-01-04 18:59:30 -08:00
Scott Main
1a67e29262 am 79393df9: am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
* commit '79393df90b6e1cd85673d204cc5fd7f1ed542981':
  move network usage sample zip
2013-01-04 18:58:55 -08:00
Scott Main
93a4ab2fa2 am 8f70a7c4: move the nsdchat sample to proper download directory
* commit '8f70a7c46cc3c4732b11fd8088b47c3434cf64d9':
  move the nsdchat sample to proper download directory
2013-01-04 18:57:18 -08:00
Scott Main
79393df90b am bf85e053: am 4bc407e3: am 47e8d20d: move network usage sample zip
* commit 'bf85e0537d0df27ab5229b8745c59a995f560df5':
  move network usage sample zip
2013-01-04 18:56:40 -08:00
Scott Main
8f70a7c46c move the nsdchat sample to proper download directory
Change-Id: I9679e5642ffaa1baad104c5fa1c1f90b59a5b1ff
2013-01-04 18:54:08 -08:00
Scott Main
bf85e0537d am 4bc407e3: am 47e8d20d: move network usage sample zip
* commit '4bc407e3e1948bff1b57f552dba142d54191b264':
  move network usage sample zip
2013-01-04 18:53:50 -08:00
Scott Main
4bc407e3e1 am 47e8d20d: move network usage sample zip
* commit '47e8d20d7b87be59ce38828659231afd425d05f8':
  move network usage sample zip
2013-01-04 18:51:32 -08:00
Scott Main
47e8d20d7b move network usage sample zip
Change-Id: I4ed2ebe357d420fea20d69515d9e91dc73579bba
2013-01-04 18:47:39 -08:00
Scott Main
5effcc5438 am a6d6fbfc: am ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
* commit 'a6d6fbfc8a5809e8164a5bf357540d8e6f5a87cf':
  docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:29:16 -08:00
Scott Main
a6d6fbfc8a am ff941423: am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
* commit 'ff9414235a4d9052bd3003464be4649607447c9a':
  docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:26:14 -08:00
Scott Main
ff9414235a am 181bb3aa: am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
* commit '181bb3aabc81f7e834e62874065c640dbc900f3e':
  docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:23:58 -08:00
Scott Main
181bb3aabc am 921c8a5d: am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
* commit '921c8a5d86b08d331b757534a36ac519694ab2a2':
  docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:20:57 -08:00
Scott Main
921c8a5d86 am 4e483ed3: Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev
* commit '4e483ed30697472aceb05bb1555f14b066ee8502':
  docs: misc bug fixes. including important versioning fixes for first app class
2013-01-04 18:19:00 -08:00
Scott Main
4e483ed306 Merge "docs: misc bug fixes. including important versioning fixes for first app class" into jb-mr1-dev 2013-01-04 18:16:16 -08:00
Scott Main
f8daf19971 docs: misc bug fixes. including important versioning fixes for first app class
Change-Id: Ifda2509fc90dd795bfd6c5e9b3d7eebcbd77892a
2013-01-04 18:09:29 -08:00
Katie McCormick
1582b1d296 am 00ac55ed: am dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
* commit '00ac55ed8b56721536eedf509ea754f4f3737d98':
  Doc update: fixed manifest typo in Network zip
2013-01-04 17:51:08 -08:00
Brian Carlstrom
305efe23a3 am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display"
* commit '498eaf58ad399e42cf7b3aca020b828c35023288':
  Use most specific attributes for distinguished name display
2013-01-04 17:50:52 -08:00
Katie McCormick
00ac55ed8b am dcab3ee6: am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
* commit 'dcab3ee6581fef5a2ed0e1e15a5d86d54ddbec6e':
  Doc update: fixed manifest typo in Network zip
2013-01-04 16:42:06 -08:00
Katie McCormick
dcab3ee658 am 78971634: am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
* commit '789716346ac21248efa37d3a7eadad854bbff350':
  Doc update: fixed manifest typo in Network zip
2013-01-04 16:39:35 -08:00
Katie McCormick
789716346a am 928d2634: am 2b13a475: Doc update: fixed manifest typo in Network zip
* commit '928d2634ff9084ffc9d041b06fd7945cd8463801':
  Doc update: fixed manifest typo in Network zip
2013-01-04 16:36:48 -08:00
Katie McCormick
928d2634ff am 2b13a475: Doc update: fixed manifest typo in Network zip
* commit '2b13a475409aa28890c93088e86c065da1b07044':
  Doc update: fixed manifest typo in Network zip
2013-01-04 16:34:19 -08:00
Katie McCormick
2b13a47540 Doc update: fixed manifest typo in Network zip
Change-Id: Iccf6dbce9d975337ab23b26dce63d3ec31303320
2013-01-04 16:17:45 -08:00
Brian Carlstrom
498eaf58ad am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display"
* commit 'bc7d5a55b22ce30af250cc7468b6c5987cd25dfd':
  Use most specific attributes for distinguished name display
2013-01-04 15:51:09 -08:00
Tor Norbye
72c6137a7a Handle empty flag attributes, such as gravity=""
Without this, an empty string will be passed into
XmlUtils.convertValueToInt, which throws an
index out of range exception.

Change-Id: Ibd1a140e207653b205852087f33ccb87fbbb9bbc
2013-01-04 15:48:58 -08:00
Brian Carlstrom
bc7d5a55b2 am 537fb0af: Merge "Use most specific attributes for distinguished name display"
* commit '537fb0afe24a520e7b9a2442786b6fb4fe194392':
  Use most specific attributes for distinguished name display
2013-01-04 15:47:39 -08:00
Brian Carlstrom
537fb0afe2 Merge "Use most specific attributes for distinguished name display" 2013-01-04 15:40:35 -08:00