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

129755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
fab50875b9 Add support for building split APKs 
Build multiple APKs, each containing a disjoint subset
of configurations. These can then be loaded into the device
AssetManager and should operate as if they were never split.

Use the idea of building multiple sets of files, where each
set represents an APK. An ApkBuilder can place files
in a set based on its configuration, but you can actually
add directly to a set, in the case of the resources.arsc and
generated AndroidManifest.xml for splits.

Change-Id: Ic65d3f0ac1bbd290185695b9971d425c85ab1de3
 2014-05-11 18:30:12 -07:00
Matthew Williams
57df4fd69e Address comments/fix javadoc in TaskManager API 
Change-Id: I0cdff12971b88acb40571a5e63b7d644ef629911
 2014-05-01 11:28:47 -07:00
RoboErik
c9b859a422 Merge "Fix build" 2014-05-01 18:19:32 +00:00
RoboErik
8da1e46ede Fix build 
A CL missed running update-api after making a change before submitting.
6e31c5c82b

Change-Id: I62b33f07a98ecd546d8128c1eeb4c01bd338f202
 2014-05-01 11:16:19 -07:00
Wink Saville
51d427ca9b am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM" 
* commit '437994578272f9770748b152c53ec655059d19ec':
  Add support for NETWORK_TYPE_GSM
 2014-05-01 18:03:57 +00:00
Wink Saville
4379945782 am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM" 
* commit '74ec580873bb56cb5045a25efdb1eb7e2bac384c':
  Add support for NETWORK_TYPE_GSM
 2014-05-01 18:00:50 +00:00
Wink Saville
74ec580873 am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM" 
* commit '7e411f74efe6dd383e59634760cccd96da1c209b':
  Add support for NETWORK_TYPE_GSM
 2014-05-01 17:57:51 +00:00
Robert Ly
d955ad9acd am 0c88867c: am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 
* commit '0c88867c7c626c805e9f466bf9010d2a3115eb42':
  Revert "update wear stack notifications to coincide with devbyte code"
 2014-05-01 17:56:45 +00:00
Robert Ly
75b17dff9c am edbabd28: am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name" 
* commit 'edbabd2806a9c5c717eff24c65a718f4d2ece817':
  Revert "docs: fix method name"
 2014-05-01 17:56:40 +00:00
Wink Saville
7e411f74ef Merge "Add support for NETWORK_TYPE_GSM" 2014-05-01 17:53:55 +00:00
Sandeep Kunta
10731a6140 Add support for NETWORK_TYPE_GSM 
Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries for getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.

Change-Id: Ibe4672b04a5044710d63499c4cf2b6ebe91444bf
 2014-05-01 17:53:42 +00:00
Robert Ly
0c88867c7c am 01352613: am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 
* commit '0135261361e21f3585b21ff4498b05bd6d1bf88d':
  Revert "update wear stack notifications to coincide with devbyte code"
 2014-05-01 17:51:23 +00:00
Robert Ly
edbabd2806 am e3135059: am 9f129366: am 80b2cbbe: Revert "docs: fix method name" 
* commit 'e3135059dee534c9d93cfb0c6e4fa7574eff1049':
  Revert "docs: fix method name"
 2014-05-01 17:51:20 +00:00
Robert Ly
0135261361 am a9dfeaa9: am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 
* commit 'a9dfeaa94083c322fb95d8bd2ac765521ae8bceb':
  Revert "update wear stack notifications to coincide with devbyte code"
 2014-05-01 17:47:23 +00:00
Robert Ly
e3135059de am 9f129366: am 80b2cbbe: Revert "docs: fix method name" 
* commit '9f129366e6963aacb00893e0be1892003bc0b39d':
  Revert "docs: fix method name"
 2014-05-01 17:47:19 +00:00
Matthew Williams
674bc2fca5 Merge "TaskManager API first pass." 2014-05-01 17:45:34 +00:00
Robert Ly
a9dfeaa940 am 7fadcf84: Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 
* commit '7fadcf84244172004568c4107083d415f1285b75':
  Revert "update wear stack notifications to coincide with devbyte code"
 2014-05-01 17:44:16 +00:00
Robert Ly
9f129366e6 am 80b2cbbe: Revert "docs: fix method name" 
* commit '80b2cbbe6c134ff415072f29eaa7392c1ebb0c52':
  Revert "docs: fix method name"
 2014-05-01 17:44:13 +00:00
Robert Ly
7fadcf8424 Merge "Revert "update wear stack notifications to coincide with devbyte code"" into klp-docs 2014-05-01 17:41:39 +00:00
Robert Ly
80b2cbbe6c Revert "docs: fix method name" 
This reverts commit b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed.

Change-Id: Ib7ed4fac07301dd5640fc41348af0d49ad9ef518
 2014-05-01 17:40:33 +00:00
Robert Ly
5f1192c9a3 Revert "update wear stack notifications to coincide with devbyte code" 
This reverts commit b8e3f209af70a7707be75d866b142dc1fccc8d5f.

Change-Id: Iba48e235b23cb0b6ce191809e6eb87395c6d1766
 2014-05-01 17:40:16 +00:00
Mark Renouf
61bc9f37cc am 5b72a6ab: am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev 
* commit '5b72a6abf85b26e66589db478cc105e7bfec6116':
  SwipeDismiss: limit fade to 50% alpha while swiping
 2014-05-01 17:36:04 +00:00
Mark Renouf
5b72a6abf8 am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev 
* commit '41615284dfb00595ed642c4e31da6a035ff53224':
  SwipeDismiss: limit fade to 50% alpha while swiping
 2014-05-01 17:32:10 +00:00
Mark Renouf
41615284df Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev 2014-05-01 17:26:45 +00:00
RoboErik
6e6a6e863d Merge "Add Session API calls to RCC and AudioManager" 2014-05-01 17:14:56 +00:00
RoboErik
f1372428f2 Add Session API calls to RCC and AudioManager 
This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready.

Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
 2014-05-01 17:14:01 +00:00
RoboErik
67e2196d07 Merge "Add dump to MediaSessionService" 2014-05-01 17:11:34 +00:00
Baligh Uddin
4a26164316 am 1ffec559: (-s ours) am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '1ffec559d04618fbd31eaf972a81c6df324965c1':
  Import translations. DO NOT MERGE
 2014-05-01 16:25:29 +00:00
Baligh Uddin
1ffec559d0 am bf4927ee: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'bf4927ee0d085fd0c7eaf1221f709811f3be6f4f':
  Import translations. DO NOT MERGE
 2014-05-01 16:21:50 +00:00
Baligh Uddin
bf4927ee0d Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-01 16:18:21 +00:00
Baligh Uddin
4fb660cb6a Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:18 +00:00
Baligh Uddin
fc08b6008f Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:12 +00:00
Baligh Uddin
0d5bebb35d Merge "Import translations. DO NOT MERGE" 2014-05-01 16:18:06 +00:00
Robert Ly
3f99436761 am f8df90fd: am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit 'f8df90fd6a4afffd9ff51a91df55e3a6fd62f67c':
  docs: fix method name
 2014-05-01 16:06:05 +00:00
Robert Ly
f8df90fd6a am 007fad0d: am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit '007fad0dbd3f8bd3a8b7323a4587eab954093f27':
  docs: fix method name
 2014-05-01 16:02:16 +00:00
Selim Cinek
f75c7b6b98 Merge "Fixed several bugs regarding the state of the notifications" 2014-05-01 16:01:50 +00:00
Robert Ly
007fad0dbd am 6b7f3936: am b39ce1b6: docs: fix method name 
* commit '6b7f3936ede97bf29ab5d606c172ff2be7bf9160':
  docs: fix method name
 2014-05-01 15:56:58 +00:00
Robert Ly
6b7f3936ed am b39ce1b6: docs: fix method name 
* commit 'b39ce1b6c1dc34b3c99d312bc3f02dcc9efbbaed':
  docs: fix method name
 2014-05-01 15:53:03 +00:00
Robert Ly
b39ce1b6c1 docs: fix method name 
Change-Id: If7efbc891eb8f1403bd167ae21d17a2847b257cc
 2014-05-01 08:47:14 -07:00
Alexandra Gherghina
973a1d2741 Merge "Revert "Temporarily switch off returning only enabled profiles to support dogfooding"" 2014-05-01 15:42:07 +00:00
Selim Cinek
4a1ac84e35 Fixed several bugs regarding the state of the notifications 
Fixed an issue where the last card was hidden even though there would
have been enough space to show it when it was expanded.
Also fixed an issue where the first card was not expandable when it was
the only one.
In addition the scroll range was corrected, to ensure that the last card
could always be scrolled to full visibility, which was not the case
previously when the last card was expanded.

Bug: 14376035
Change-Id: I372a55dc1fc6e381dd9aef3d631447912e3d1024
 2014-05-01 17:41:47 +02:00
Marco Nelissen
ae84e20b2a am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:35:31 +00:00
Marco Nelissen
4375e84882 am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:32:17 +00:00
Marco Nelissen
ab962b54e3 am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 
* commit 'ab3977d21161815c130bdedf21e2571382d208da':
  MetadataRetriever: Check null pointer to avoid tombstone crash.
 2014-05-01 15:28:14 +00:00
Marco Nelissen
ab3977d211 Merge "MetadataRetriever: Check null pointer to avoid tombstone crash." 2014-05-01 15:25:13 +00:00
Narayan Kamath
2c4e44b374 am 53138105: am 5dca099d: am 1cec7f85: Merge "Don\'t adjust ABI if PackageSetting#pkg is null." 
* commit '531381056fac077cffcd509b1e89d9b41f400fca':
  Don't adjust ABI if PackageSetting#pkg is null.
 2014-05-01 14:51:04 +00:00
Narayan Kamath
576cfd96a7 am d6809b35: am c1f81f90: am 27f2bfc4: Merge "Fix dex file pruning logic." 
* commit 'd6809b35aff02fdccf7ac433005aba2d06bbc3ff':
  Fix dex file pruning logic.
 2014-05-01 14:51:00 +00:00
Narayan Kamath
c98ca4c326 am fbd80b58: (-s ours) am 51f4367c: am bcc3b312: Merge "Adjust instruction sets for shared UID apps." 
* commit 'fbd80b58db2aa8f650acf26305e8cbed24a5755b':
  Adjust instruction sets for shared UID apps.
 2014-05-01 14:50:57 +00:00
Narayan Kamath
71b3467a8a am 3a951e52: (-s ours) resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp 
* commit '3a951e52d93697b7e232501b78f9ffb0ec605516':
  Package manager changes for dual zygote stack.
 2014-05-01 14:44:38 +00:00
George Mount
794853f61c Merge "Fixed transition start delay propagation when duration = 0." 2014-05-01 14:44:03 +00:00