drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
131,080 Commits 1 Branch 0 Tags
Commit Graph

131080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
b7bafba7c6 am 099f40a9: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '099f40a950a14b66005b17657d967ef080569a15':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:49:57 +00:00
Deepanshu Gupta
51dd8878cb am 60b52ee9: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit '60b52ee929c8765c2d99f1b1e35d326e03895ba0':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 01:49:55 +00:00
Deepanshu Gupta
503aaa48e4 am 7c6f6481: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit '7c6f6481f46b8244406790604c5f8b3f712c369f':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 01:49:52 +00:00
Deepanshu Gupta
30db282f2a am 22de7c4c: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit '22de7c4c3d44e51aef6937e1b39540703ad01f5c':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 01:49:50 +00:00
Deepanshu Gupta
b67b1b450c am 094fd8ec: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '094fd8ecb6f4b666be6c9e7332679bce28fdc3ca':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 01:49:42 +00:00
Deepanshu Gupta
2c8fea2ad4 am 56759be8: Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE] 
* commit '56759be8960ea1b5dc8b6de1810a84e2f10e2058':
  Overflow menu popup for Action Bar in Layoutlib [DO NOT MERGE]
 2014-05-13 01:49:39 +00:00
Deepanshu Gupta
0bb06b91e7 am fe38489f: Action bar rendering in layoutlib [DO NOT MERGE] 
* commit 'fe38489f6734fefd0a216e9cfe12f8f978ff371f':
  Action bar rendering in layoutlib [DO NOT MERGE]
 2014-05-13 01:49:37 +00:00
Deepanshu Gupta
f326473865 am cc5340bc: Add missing dependency in layoutlib build file [DO NOT MERGE] 
* commit 'cc5340bc6301f8d9bf2cdb6ad2036964a3d179f5':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-05-13 01:49:34 +00:00
Deepanshu Gupta
49d47a02e8 am 76dccb7f: Fix theme/style resolution in Layoutlib [DO NOT MERGE] 
* commit '76dccb7f436565136ff5e15b1ca57530940f5642':
  Fix theme/style resolution in Layoutlib [DO NOT MERGE]
 2014-05-13 01:49:31 +00:00
Deepanshu Gupta
de3b2c06ab am 1ed75bde: Remove references to non-std Java classes. [DO NOT MERGE] 
* commit '1ed75bde09275c9f2bd1f81830e381ea864ac7f5':
  Remove references to non-std Java classes. [DO NOT MERGE]
 2014-05-13 01:49:28 +00:00
Deepanshu Gupta
2f94c1db0d am 6136af32: Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE] 
* commit '6136af326e64037184a7a2a3ae60c399f04d631f':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]
 2014-05-13 01:49:25 +00:00
Deepanshu Gupta
ef9596a1ea am 2bd65db1: Layoutlib tests now check methods return value [DO NOT MERGE] 
* commit '2bd65db15fa6a265ccc4023161611088bc791b4e':
  Layoutlib tests now check methods return value [DO NOT MERGE]
 2014-05-13 01:49:21 +00:00
Deepanshu Gupta
0e595741cf am 5fbb6118: am c014eb68: am 7a5f7265: Merge "Support actionProviderClass attribute for menus [DO NOT MERGE]" into klp-dev 
* commit '5fbb6118b57ff522942de7e73dadd093e9c44f86':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:49:20 +00:00
Aaron Whyte
064789efc1 am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 
* commit '24f3d0915e55d490b7537b20aeadbfa2e6a780a9':
  Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
 2014-05-13 01:49:16 +00:00
Deepanshu Gupta
5fbb6118b5 am c014eb68: am 7a5f7265: Merge "Support actionProviderClass attribute for menus [DO NOT MERGE]" into klp-dev 
* commit 'c014eb681bd700c24b9513c847cc6ee88c5410d7':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:47:56 +00:00
Deepanshu Gupta
52a86f17ea am 7f56beb8: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '7f56beb8403b597a676faf12643fef585a31007e':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:44:41 +00:00
Deepanshu Gupta
680219f2e3 am f61bd002: Fix class name for OverflowMenuButton [DO NOT MERGE] 
* commit 'f61bd0020642cf0868486d307f2e68c8c02d6102':
  Fix class name for OverflowMenuButton [DO NOT MERGE]
 2014-05-13 01:44:38 +00:00
Deepanshu Gupta
78b176b34c am d558ebdb: Add special system view cookie to OverflowButton. [DO NOT MERGE] 
* commit 'd558ebdb433af498a87e25673f7dd828a0e7439a':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 01:44:36 +00:00
Deepanshu Gupta
a4384d4e8c am a98121ef: Fix style warnings in RenderSessionImpl [DO NOT MERGE] 
* commit 'a98121ef5251b5ebdb8c1b0b6780d570844284b2':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 01:44:33 +00:00
Deepanshu Gupta
d9a137bd84 am 77048379: Add view cookies for action bar menus. [DO NOT MERGE] 
* commit '7704837947455909f295b088a3d15a20e107dbd7':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 01:44:29 +00:00
Aaron Whyte
24f3d0915e Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev 2014-05-13 01:44:18 +00:00
Deepanshu Gupta
c014eb681b am 7a5f7265: Merge "Support actionProviderClass attribute for menus [DO NOT MERGE]" into klp-dev 
* commit '7a5f726525f597bf5dd65fd6bb106511715c2109':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 01:42:42 +00:00
Deepanshu Gupta
7a5f726525 Merge "Support actionProviderClass attribute for menus [DO NOT MERGE]" into klp-dev 2014-05-13 01:37:04 +00:00
Robert Greenwalt
5152c0987d Merge "Add has* utility functions to NetworkCapabilities" 2014-05-13 01:35:02 +00:00
Robert Greenwalt
5c55e3335c Add has* utility functions to NetworkCapabilities 
Change-Id: Icf735b778a3956812be522db39c29cf54c757a25
 2014-05-12 18:32:22 -07:00
Brian Williammee
1c89ec28fd Merge "Correct comment on putStringSet" 2014-05-13 01:15:49 +00:00
Zhentao Sun
adcc576363 Merge "Make sure nativeInit is called on an object." 2014-05-13 01:13:54 +00:00
Lorenzo Colitti
0b38f08ede Fix reboot loop. 
The multinetwork branch is rebooting on startup with:

E/AndroidRuntime( 1024): *** FATAL EXCEPTION IN SYSTEM PROCESS: NetworkStats
[...]
E/AndroidRuntime( 1024): Caused by: java.lang.NullPointerException: Attempt to read from field 'long android.net.NetworkCapabilities.mNetworkCapabilities' on a null object reference
E/AndroidRuntime( 1024): 	at android.net.NetworkCapabilities.<init>(NetworkCapabilities.java:235)
E/AndroidRuntime( 1024): 	at android.net.BaseNetworkStateTracker.getNetworkCapabilities(BaseNetworkStateTracker.java:103)
E/AndroidRuntime( 1024): 	at com.android.server.ConnectivityService.getAllNetworkState(ConnectivityService.java:1134)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfacesLocked(NetworkStatsService.java:877)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.updateIfaces(NetworkStatsService.java:849)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService.access$600(NetworkStatsService.java:139)
E/AndroidRuntime( 1024): 	at com.android.server.net.NetworkStatsService$2.onReceive(NetworkStatsService.java:717)
E/AndroidRuntime( 1024): 	at android.app.LoadedApk$ReceiverDispatcher$Args.run(LoadedApk.java:766)
E/AndroidRuntime( 1024): 	... 4 more

This seems to be due to NetworkCapabilities' copy constructor
not null-checking its argument.  Unbreak things by ignoring null.

Change-Id: Iff3c38e6d72390fa86e51bfce534ebd42a262e19
 2014-05-12 18:06:47 -07:00
Zhentao Sun
a4dfc2c56b Make sure nativeInit is called on an object. 
This bug is introduced by the attempt to fix b/14117917.
Worked around b/14469172. The implementation of nativeInit assumes that
it's called on a object instead of class.

Change-Id: I73241e62aa73ce98358ff37b772d1a26daf9e53c
 2014-05-12 17:57:22 -07:00
Robert Greenwalt
56e13f2d08 Merge "Add NetworkRequest to the multinetwork API" 2014-05-13 00:54:20 +00:00
Robert Greenwalt
3c0bf5e536 Add NetworkRequest to the multinetwork API 
bug:13885501
Change-Id: I7b9a01aadf26b6ff104d088b6e283c838ec4dfac
 2014-05-12 17:52:48 -07:00
Brian Williammee
c8b055aa8b Correct comment on putStringSet 
Works with both commit and apply.

Bug: 14838826
Change-Id: I86758139aca8fd06123c06544d1901bb394cbf15
 2014-05-12 17:52:18 -07:00
Brian Carlstrom
027c75d5e2 am f230061b: am 2ce02bba: am b7d7cbc9: Merge "Fix background PackageUsage writing." 
* commit 'f230061b383f3e5fa63a266d84477963dc5f226c':
  Fix background PackageUsage writing.
 2014-05-13 00:44:39 +00:00
Brian Carlstrom
f230061b38 am 2ce02bba: am b7d7cbc9: Merge "Fix background PackageUsage writing." 
* commit '2ce02bba1eea682282408b8521dad8c91837fbab':
  Fix background PackageUsage writing.
 2014-05-13 00:40:12 +00:00
Brian Carlstrom
2ce02bba1e am b7d7cbc9: Merge "Fix background PackageUsage writing." 
* commit 'b7d7cbc9c3a9315a5c5ecd85e16f5916c4bc3f3a':
  Fix background PackageUsage writing.
 2014-05-13 00:34:42 +00:00
Sungsoo Lim
d6672b51c5 Replace ComponentName to InputId. 
Change-Id: Ia4b5b7fa3f2dfa68629f78981b4ea7f7017d6504
 2014-05-13 09:33:12 +09:00
Brian Carlstrom
b7d7cbc9c3 Merge "Fix background PackageUsage writing." 2014-05-13 00:31:34 +00:00
Aaron Whyte
3f3e3e87e2 Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. 
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859

Change-Id: I0a8641894b41058f53a5bf241763a9a0605244d1
 2014-05-12 17:20:02 -07:00
ztenghui
f65bfe3ba4 Merge "Remove the <group> tag" 2014-05-13 00:13:06 +00:00
bulic
5ae2afdc2a Merge "Prevent home task from being set as ontopofhome" 2014-05-13 00:02:01 +00:00
Brian Carlstrom
112a720638 Fix background PackageUsage writing. 
Change-Id: Ia358b61e648b427c86cf75ae096cd2a68ace209f
 2014-05-12 16:56:34 -07:00
Robert Greenwalt
f9cb86aebe Replace LinkCapabilities with NetworkCapabilities 
Also remove unused LinkSocket and LinkSocketNotifier.
bug:13885501

Change-Id: Id426e31b201fa4f29109b5fea485d8efb34519d3
 2014-05-12 16:52:56 -07:00
ztenghui
42008940e7 Remove the <group> tag 
Change-Id: I80e9ba3dabb7394db85dcd34539cf534ba3da79d
 2014-05-12 16:48:05 -07:00
Robert Greenwalt
6681e32fff Merge "Add NetworkCapabilities part of API." 2014-05-12 23:32:03 +00:00
Alan Viverette
2feaa1837a Merge "Simplify accessibility display adjustments" 2014-05-12 23:05:48 +00:00
Alan Viverette
2b477f2c44 Merge "Simplify accessibility display adjustments in Quick Settings" 2014-05-12 23:05:33 +00:00
Matthew Williams
30d9badeab Merge "First implementation of the TaskManager internals." 2014-05-12 22:47:30 +00:00
ztenghui
b7869fb3ff Merge "Remove the group tag." 2014-05-12 22:41:43 +00:00
Matthew Williams
6de79e2b17 First implementation of the TaskManager internals. 
Sketching out the TaskManagerService, and provide an implementation
of the Connectivity & Time controllers to use as a basis for how the
IdleMode controller will function.

Change-Id: I9163b8b9df1f8a027354720b469a0fb4c8e37194
 2014-05-12 15:41:43 -07:00
Etienne Le Grand
1796635f7f Merge "Add wake gesture as a hidden sensor in Sensor.java" 2014-05-12 22:41:19 +00:00