Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,474 Commits 3 Branches 0 Tags
d0da0b8aae97d9aadd70fa7b7094d305b5da7305
Commit Graph

30035 Commits

Author SHA1 Message Date
Dianne Hackborn
d0da0b8aae am dff561f4: am 9b59509c: am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 
* commit 'dff561f42bdf15013d10666afdd1fd5fa16e9438':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
 2013-01-07 12:27:25 -08:00
Dianne Hackborn
dff561f42b am 9b59509c: am 138a3d3f: am d5d6f04f: Merge "Hopefully fix PendingIntent.getActivities() documentation wtf." 
* commit '9b59509c6a94f1943ce64d3b5e9b4de2aa846d4d':
  Hopefully fix PendingIntent.getActivities() documentation wtf.
 2013-01-07 12:23:59 -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
e64fb50701 am 7d1c4fa3: Remove out-of-date comment and rename constant 
* commit '7d1c4fa322dec1247f7d509a066e436f1d2706fa':
  Remove out-of-date comment and rename constant
 2013-01-07 11:59:27 -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
023b3ebc46 am 4a623745: Merge "Fix issue when toggling profiling from visual to off to visual" 
* commit '4a62374544152d9cc6dafd3e8dd9b0ba475a974c':
  Fix issue when toggling profiling from visual to off to visual
 2013-01-07 11:35:37 -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
Romain Guy
e5080343ae am 31ffc571: Merge "Update profiling properties" 
* commit '31ffc5713913062c58854b1cc3556547f6681f65':
  Update profiling properties
 2013-01-07 11:24:57 -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
4b9c6b3111 am e1730e77: Merge "Use dp units instead of px to draw profiling graph" 
* commit 'e1730e77a3d02d54f8118e9256ea57d0f489d43e':
  Use dp units instead of px to draw profiling graph
 2013-01-07 11:02:31 -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
Alon Albert
784f01dcc5 am 35d67ec3: Merge "Put some useful information in User-Agent Header" 
* commit '35d67ec31aa43926536a6aefb5a49401509d6fa5':
  Put some useful information in User-Agent Header
 2013-01-07 09:22:56 -08:00
Alon Albert
35d67ec31a Merge "Put some useful information in User-Agent Header" 2013-01-07 09:18:52 -08:00
Jeff Sharkey
a24341eaf9 am 0ada5d65: Merge "Expose roaming flag for testing." 
* commit '0ada5d656de4c1ac76bc06221a1f5e561e50e258':
  Expose roaming flag for testing.
 2013-01-05 09:54:42 -08:00
Jeff Sharkey
0ada5d656d Merge "Expose roaming flag for testing." 2013-01-05 09:51:20 -08:00
Romain Guy
044eca4321 am 63e2098b: Merge "Make profiling graph more readable in all apps" 
* commit '63e2098b7480ce4ca338a220b2de30b182e93b31':
  Make profiling graph more readable in all apps
 2013-01-04 19:35:49 -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
7bac55434c am 9acd1b4f: Merge "Add visual profiling feature" 
* commit '9acd1b4fa897f3a007dd23dc1f0471b151fa03ad':
  Add visual profiling feature
 2013-01-04 19:29:05 -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
Brian Carlstrom
e1b983322a am 305efe23: am 498eaf58: am bc7d5a55: am 537fb0af: Merge "Use most specific attributes for distinguished name display" 
* commit '305efe23a326d0f886d3cf66ea05dfbd30e714e2':
  Use most specific attributes for distinguished name display
 2013-01-04 17:53:12 -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
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
91154ce658 Use most specific attributes for distinguished name display 
Bug: 7894348
Bug: http://code.google.com/p/android/issues/detail?id=41662
Change-Id: I8048a53b8a9a17b384f12b6a4f40071bb3dd3e04
 2013-01-04 15:27:24 -08:00
Selim Gurun
c225fa8549 am 5c11ef10: Remove doc references to private browsing. 
* commit '5c11ef10dbc6734ec028a7112eaaa57920aa184d':
  Remove doc references to private browsing.
 2013-01-04 15:20:18 -08:00
Selim Gurun
5c11ef10db Remove doc references to private browsing. 
Remove reference to private browsing since it is no longer supported.

Change-Id: I65bc8aecd949717f662454d4bd1759ca91ad553d
 2013-01-04 14:58:36 -08:00
Martin Kosiba
0adf335c0d Merge "Ensure the WebView provider is created onVisibilityChanged." into master-chromium 2013-01-04 08:47:33 -08:00
Adam Powell
59e7da6905 am 4b816cc2: am 262b311c: am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '4b816cc269469008820f4fba3f031f9256636345':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:46:02 -08:00
Adam Powell
4b816cc269 am 262b311c: am b7de79d0: am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '262b311c3c7d68204a72d3ba87bd76883aec00e2':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:43:43 -08:00
Adam Powell
b7de79d027 am 41bb82be: Merge "Fix NullpointException problem in onMenuItemSelected" 
* commit '41bb82becea5dd1f995dbca5bf5a719f559102de':
  Fix NullpointException problem in onMenuItemSelected
 2013-01-03 17:37:49 -08:00
Adam Powell
41bb82bece Merge "Fix NullpointException problem in onMenuItemSelected" 2013-01-03 16:46:03 -08:00
Jim Miller
04c209c175 am e15c9024: Merge "Remove unused keyguard code" 
* commit 'e15c90241f1aeb0a4fdcfbd9480c84f3da500dbc':
  Remove unused keyguard code
 2013-01-03 15:52:02 -08:00
Jim Miller
e15c90241f Merge "Remove unused keyguard code" 2013-01-03 15:49:22 -08:00
Christopher Tate
1b4cad6fc9 am a82fe9fa: Merge "Shrink Bundle.getString(key, default) and getCharSequence(key, default)" 
* commit 'a82fe9faa18f7747f3d8f0238eb93f96f267d7cc':
  Shrink Bundle.getString(key, default) and getCharSequence(key, default)
 2013-01-03 15:44:02 -08:00
Christopher Tate
a82fe9faa1 Merge "Shrink Bundle.getString(key, default) and getCharSequence(key, default)" 2013-01-03 15:40:26 -08:00
Jeff Sharkey
836ecb539f Expose roaming flag for testing. 
Change-Id: I29ef6fc59926a97f4e97c561387ac9bc0e4e4769
 2013-01-03 14:07:46 -08:00
Christopher Tate
066b036cd6 am f947930e: Merge "Document ContentProvider\'s API a bit more explicitly" 
* commit 'f947930ed2e7aa4b7cc9f2d9aad0b25ef002c0c7':
  Document ContentProvider's API a bit more explicitly
 2013-01-03 12:26:25 -08:00
Christopher Tate
2bc6eb8c17 Document ContentProvider's API a bit more explicitly 
In particular, call out parameters that must not be null.

Change-Id: I67af73163e36efefefa7df86499937f998be5b00
 2013-01-03 12:16:54 -08:00
Jim Miller
8ca2fc10ce Remove unused keyguard code 
This change removes the old keyguard code because it's obsolete and doesn't run
anymore.

Change-Id: I8ed93f507378a17cf834d2ee9284c098eb8efffe
 2013-01-02 17:07:56 -08:00
Christopher Tate
116751d84f Shrink Bundle.getString(key, default) and getCharSequence(key, default) 
They previously duplicated the full logic of getString(key) and
getCharSequence(key) independently.  Now they both use the no-default
version internally,  resulting both in a single point of implementation
for test & isolation purposes and in a (small) decrease in code size.

Change-Id: If1b1e1fa4a549a0ec4cf221e54998f4fd438f3a2
 2013-01-02 14:01:03 -08:00
Siva Velusamy
360b4d9418 am af80cdd7: Merge "DdmServer: add controls for OpenGL tracing" 
* commit 'af80cdd7dfa28158fa91ab374d8e6d2500de66b1':
  DdmServer: add controls for OpenGL tracing
 2013-01-02 09:14:06 -08:00
Siva Velusamy
af80cdd7df Merge "DdmServer: add controls for OpenGL tracing" 2013-01-02 09:10:06 -08:00
Kristian Monsen
70d417149e am d05e4d82: Merge "Update Geolocation.getInstance() comment." 
* commit 'd05e4d820d72474fbdb20998dce1a697c2f120bc':
  Update Geolocation.getInstance() comment.
 2012-12-26 16:03:40 -08:00
Kristian Monsen
d05e4d820d Merge "Update Geolocation.getInstance() comment." 2012-12-26 16:00:25 -08:00
Martin Kosiba
679e6385d2 Ensure the WebView provider is created onVisibilityChanged. 
It is possible for onVisibilityChanged to be called during
WebView construciton.

BUG=7622923

Change-Id: I2041310c36f9382ebe12018d9aa1f260364d28da
 2012-12-21 12:39:50 +00:00