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

125366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose Lima
4882ddfae2 am 53ac5ef2: am 91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev 
* commit '53ac5ef2141c7e7d99d5c00195bc65e86e7fc403':
  Add banner attribute to app manifest
 2014-03-13 18:08:51 +00:00
Christopher Tate
83b31aae81 am d5b25cbd: am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'd5b25cbd570680c361da8807fdfddf135472d338':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 18:08:49 +00:00
Baligh Uddin
e4f1c8ab27 am c48e3d03: (-s ours) am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c48e3d03436bd428ef5425114ea138ae097f1f20':
  Import translations. DO NOT MERGE
 2014-03-13 18:08:46 +00:00
Alan Viverette
70994e9eef am d7cc4bf4: am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit 'd7cc4bf482d69d146eb5386b790816c8a46f278a':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 18:08:43 +00:00
Alan Viverette
17bbdcc549 am 839321a3: am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '839321a362ec1cd40fc7267a7883641bcc8ee429':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 18:08:40 +00:00
Alan Viverette
c59474d281 am ba3d0fd5: am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'ba3d0fd5fc520d1a6dcf6e6abc5f9d90c08e9f88':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 18:08:37 +00:00
Adam Powell
b287043c3d am 4a5c9e94: am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '4a5c9e941a78299d869b4c9d916fd86187057150':
  Fix a bug in submenu presenter priority handling
 2014-03-13 18:08:34 +00:00
Jason Sams
440613f5c3 am 276565c8: am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. 
* commit '276565c83c05e24819454dea4008ad5096792e4f':
  Force merge of remaining KLP changes to fix build.
 2014-03-13 18:08:31 +00:00
Jose Lima
53ac5ef214 am 91726f4e: Merge "Add banner attribute to app manifest" into klp-modular-dev 
* commit '91726f4ea7b60025490209ccb2637d712e8d75fd':
  Add banner attribute to app manifest
 2014-03-13 18:02:50 +00:00
Christopher Tate
d5b25cbd57 am aaaeb6a2: am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'aaaeb6a21bb6cc540fefa6868493bda612a63f22':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 18:02:45 +00:00
Baligh Uddin
c48e3d0343 am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4c9ebc4c149627e4ea0ee82f053628021ef8bfe8':
  Import translations. DO NOT MERGE
 2014-03-13 18:02:42 +00:00
Alan Viverette
d7cc4bf482 am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit 'cf2b65ce7a5a1d60755a00ae4da6cd6b1101af8c':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 18:02:17 +00:00
Alan Viverette
839321a362 am c25dbb50: am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'c25dbb50c30816c97227b9a26cc46afec4e5318e':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 18:02:14 +00:00
Alan Viverette
ba3d0fd5fc am af6288b7: am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit 'af6288b721110ffc4b4e68d55398b5ca31fc32e8':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 18:02:11 +00:00
Adam Powell
4a5c9e941a am 68ec033b: am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '68ec033b7c9ea28155bbb007b01d5dbce2239392':
  Fix a bug in submenu presenter priority handling
 2014-03-13 18:02:08 +00:00
Jason Sams
276565c83c am 0ebc6b37: (-s ours) Force merge of remaining KLP changes to fix build. 
* commit '0ebc6b378dca76b3253b10cf17c3a38a0a50c073':
  Force merge of remaining KLP changes to fix build.
 2014-03-13 18:02:03 +00:00
Mike Lockwood
1cb98aeaad Merge "USB: Add support for disabling USB permission dialogs." 2014-03-13 17:58:33 +00:00
Jose Lima
91726f4ea7 Merge "Add banner attribute to app manifest" into klp-modular-dev 2014-03-13 17:40:37 +00:00
Mike Lockwood
e97b62ed0d USB: Add support for disabling USB permission dialogs. 
Setting scom.android.internal.R.bool.config_disableUsbPermissionDialogs to true
will disable all USB permission dialogs, allowing apps access to USB devices
and accessories by default.

For prototyping purposes only. This should not be used in real devices.

Bug: 13437578
Change-Id: Ie7bf83882943930b15e5f1edb3044a4a52034273
 2014-03-13 10:26:53 -07:00
Christopher Tate
aaaeb6a21b am 87503f85: am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit '87503f8561296fea489f8a3fe8384f61150976da':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-13 17:19:17 +00:00
Baligh Uddin
4c9ebc4c14 am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c6ccb8a3d436f2cfe563daf78a5c6706cb7d4274':
  Import translations. DO NOT MERGE
 2014-03-13 17:19:14 +00:00
Dianne Hackborn
08fc3a7fc2 Merge "Fix some uid issues in battery stats." 2014-03-13 17:04:54 +00:00
Dianne Hackborn
bbb7472b8e Fix some uid issues in battery stats. 
Change-Id: I9f7773568ff12603d51b26d50d758add09bedbb2
 2014-03-13 09:50:24 -07:00
Baligh Uddin
5468ae4125 Merge "Import translations. DO NOT MERGE" 2014-03-13 16:22:49 +00:00
Baligh Uddin
df385f2b4c Merge "Import translations. DO NOT MERGE" 2014-03-13 16:22:45 +00:00
Jaewan Kim
68c9d2592c Merge "EthernetDataTracker: Return proper interface name" 2014-03-13 12:07:36 +00:00
Kenny Guy
4979ff9f28 Merge "Show notifications from related users." 2014-03-13 11:57:55 +00:00
Jason Sams
21f97de0bc am 35a9e339: am fc15f899: Fix build issues from bad merge 
* commit '35a9e339687a0c5423c3433ff0c335ad9e1e0656':
  Fix build issues from bad merge
 2014-03-13 10:53:01 +00:00
Jason Sams
4a268affbf am 534606b4: am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev 
* commit '534606b44a865874b00fba24517a8e218ec56075':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 10:52:56 +00:00
Jason Sams
35a9e33968 am fc15f899: Fix build issues from bad merge 
* commit 'fc15f899b86aa39bd32e3d38a9f5369ee8f0e2c8':
  Fix build issues from bad merge
 2014-03-13 10:50:19 +00:00
Jason Sams
534606b44a am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev 
* commit '632c915ce8675033bbb7d356239d16594b26dffb':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 10:50:15 +00:00
Alan Viverette
cf2b65ce7a am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '9ebe031cdc916646e95ffcd92dde67e1655be7ba':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-13 10:01:39 +00:00
Alan Viverette
c25dbb50c3 am 7b09a4e5: am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit '7b09a4e5df908783a95dbfef3bc9fabda339c3a1':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-13 10:01:35 +00:00
Alan Viverette
af6288b721 am 3c3377a2: am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '3c3377a2290764937548de5a49ca8ec28dc98153':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-13 10:01:30 +00:00
Adam Powell
68ec033b7c am 75958c29: am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '75958c298477a3d1e556c4fe36e516b9e828c311':
  Fix a bug in submenu presenter priority handling
 2014-03-13 10:01:15 +00:00
Alexandra Gherghina
aaebbbff73 Merge "Check for empty activity stack. This avoids a null pointer exception when switching from an user with no open apps." 2014-03-13 09:31:53 +00:00
Jason Sams
457c955476 am 2ffcffd0: am 280db650: am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '2ffcffd046e321b871a04480552cef6ee4735e62':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 09:28:22 +00:00
Jason Sams
abe8dfb0e3 am 0641a5d4: am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '0641a5d4b1a3b0675c36f44adb05d0a5e20c3d56':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 09:28:19 +00:00
Jason Sams
2ffcffd046 am 280db650: am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit '280db65032fe0ed6897bc33c627ae176daecb1c2':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 09:12:14 +00:00
Jason Sams
0641a5d4b1 am 7f8a4107: am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '7f8a41079c342ff1f4f0ba3bf8e4f4e203da2649':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 09:12:09 +00:00
Alexandra Gherghina
dae57a1414 Check for empty activity stack. This avoids a null pointer exception 
when switching from an user with no open apps.

Change-Id: I02629818f2bc82ee3a2825cf484ef1e32e3e6067
 2014-03-13 08:55:56 +00:00
Jason Sams
0ebc6b378d Force merge of remaining KLP changes to fix build. 
Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
 2014-03-13 01:49:05 -07:00
Jason Sams
fc15f899b8 Fix build issues from bad merge 
Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
 2014-03-13 01:17:49 -07:00
Jason Sams
632c915ce8 resolved conflicts for merge of 780d57b8 to klp-modular-dev 
Change-Id: Idf2f939c25c342fff98da6b83be875d7708deba0
 2014-03-13 07:40:24 +00:00
Jason Sams
280db65032 am e14d5e90: am 5757bf89: Add hidden minor version ID for support lib workarounds. 
* commit 'e14d5e901172559a5e18077bde3ccafd03e8a6e2':
  Add hidden minor version ID for support lib workarounds.
 2014-03-13 01:35:42 +00:00
Jason Sams
7f8a41079c am 0165db38: (-s ours) am ff7256e7: Fix destruction issues relating to AllocationAdapter. 
* commit '0165db3802f0fafe0ad86b7699be7adaea6686da':
  Fix destruction issues relating to AllocationAdapter.
 2014-03-13 01:35:38 +00:00
Maxim Siniavine
a305d7229f Fixes for download manager test. 
When checking that the download is in progress, check the number number
of bytes downloaded as reported by download manager, rather than looking at the file size.

When waiting for the download to complete rely on the received broadcast.

Bug: 13326931

Change-Id: I4c2431dd71e17602e758bc482be185683040ea98
 2014-03-12 18:22:02 -07:00
Jose Lima
f78e312db2 Add banner attribute to app manifest 
Change-Id: I28b0dc6dee9623ec7534bb0e741b88f439b48c9f
 2014-03-12 18:07:38 -07:00
Michael Wright
444b0c6b72 am f80f60ba: am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 
* commit 'f80f60ba2b61df9f9544fcae8d8bdbe5542269fc':
  Controllers must have buttons and a movement mechanism.
 2014-03-13 00:42:43 +00:00
Michael Wright
f80f60ba2b am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev 
* commit 'd23d916e0fc573ccde8a622aaa42ccfae9d31f82':
  Controllers must have buttons and a movement mechanism.
 2014-03-13 00:40:03 +00:00