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

147294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shishir Agrawal
81f10dbd01 am b169a41e: am 1d678b52: am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit 'b169a41e409ee6e62dc3c9403fd5a7129f921a23':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:22:35 +00:00
Andres Morales
8de157275c am 789b2b55: am 9884a1ac: am 3df55fc3: NFC Unlock api changes 
* commit '789b2b5558aaa379f00ec81496cbb29f00ee47fc':
  NFC Unlock api changes
 2014-07-31 01:22:31 +00:00
Shishir Agrawal
28bfd3810d am 1d678b52: am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit '1d678b5277b5d96a53481c8b6934b755b6973ab7':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:18:58 +00:00
Andres Morales
0e6bab86ae am 9884a1ac: am 3df55fc3: NFC Unlock api changes 
* commit '9884a1ac65522d381c8a5682cc6804a3c6378dd9':
  NFC Unlock api changes
 2014-07-31 01:18:54 +00:00
Shishir Agrawal
2682030a73 am 20832529: Merge "Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager." into lmp-dev 
* commit '20832529b27a523738ae46c2da036bcf2bb09011':
  Add new APIs iccExchangeSimIO and iccTransmitApduBasicChannel to TelephonyManager.
 2014-07-31 01:13:52 +00:00
Andres Morales
ce3a35f41f am 3df55fc3: NFC Unlock api changes 
* commit '3df55fc32ec023f40a1cb22653d50915e05316c4':
  NFC Unlock api changes
 2014-07-31 01:13:48 +00:00
Andres Morales
11d2e53dc0 NFC Unlock api changes 
Bug: 16401635
Change-Id: I994bd80be40052c2f894199bb44ebbde40077f27
 2014-07-31 01:09:02 +00:00
Roozbeh Pournader
ff7a86c16f Re-remove AndroidEmoji.ttf. 
It was mistakenly re-added in 6feb729b686b902be2520a91281e1a000c055da2.

Change-Id: I99a41ed8e6f1975e9808d8063e594fbb996d4334
 2014-07-30 17:20:36 -07:00
destradaa
d2cf9d98da am f4fdceb1: am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs. 
* commit 'f4fdceb117ebdc41c2937da86a751936c0f8c21a':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:51:17 +00:00
destradaa
10d6ac9f42 am b46316dd: am 823ac05c: Add support for sources in Geofencing APIs. 
* commit 'b46316ddee783ed75b1155a89004a3cb00a0426f':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:46:24 +00:00
destradaa
b9d8f99fdd am 823ac05c: Add support for sources in Geofencing APIs. 
* commit '823ac05cce1c324b8d9c8688b89a439fdfae6600':
  Add support for sources in Geofencing APIs.
 2014-07-30 23:42:50 +00:00
destradaa
f9a274c9b8 Add support for sources in Geofencing APIs. 
Support setting the source when adding geofences.
b/14117199

Surface the source when FLP geofence changes state.
b/14119200

Change-Id: I50dc40a9caee400594e1778c98e284e0db0d5e66
 2014-07-30 23:35:08 +00:00
Ruben Brunk
3c9e3c8211 am 49848592: am 6946415f: am e95f2a0e: camera2: Implement request templates for LEGACY. 
* commit '4984859292319f2f2ac42ea745012215e5bea84f':
  camera2: Implement request templates for LEGACY.
 2014-07-30 23:27:35 +00:00
Ruben Brunk
2a9bd01d3d am 6946415f: am e95f2a0e: camera2: Implement request templates for LEGACY. 
* commit '6946415f57e1af4988c2422eb62577165b24ff24':
  camera2: Implement request templates for LEGACY.
 2014-07-30 23:23:34 +00:00
Ruben Brunk
0c1a5a8d59 am e95f2a0e: camera2: Implement request templates for LEGACY. 
* commit 'e95f2a0ee4f3062ca42dc4fc1c128172df651969':
  camera2: Implement request templates for LEGACY.
 2014-07-30 23:18:07 +00:00
Ruben Brunk
6a7d8c4289 camera2: Implement request templates for LEGACY. 
Bug: 15116722
Change-Id: Ic32e2f597997489642e98bfd8c7582a300f6f29b
 2014-07-30 23:15:16 +00:00
Yao Chen
291abc24f7 am de3094fd: am 89ad0a89: am 2705fc25: Adds toString() in MediaBrowserItem 
* commit 'de3094fd608e508cdd7026885ba94236da65ae57':
  Adds toString() in MediaBrowserItem
 2014-07-30 22:56:30 +00:00
Yao Chen
56942738d0 am 89ad0a89: am 2705fc25: Adds toString() in MediaBrowserItem 
* commit '89ad0a8911980ff2d458d5ccf96239b2f59e9ee7':
  Adds toString() in MediaBrowserItem
 2014-07-30 22:52:37 +00:00
Yao Chen
61e3ee49b6 am 2705fc25: Adds toString() in MediaBrowserItem 
* commit '2705fc25c7c0c7c9e04fa52a05fff7dcd277a71a':
  Adds toString() in MediaBrowserItem
 2014-07-30 22:48:13 +00:00
Yao Chen
4056871031 Adds toString() in MediaBrowserItem 
Bug: 16676746
Change-Id: I61152dca66e6715807868a5c72a1fdf06c78d7ab
 2014-07-30 15:36:25 -07:00
Ruben Brunk
c91eb58c4e am 91aedfe5: am ecdb20ca: am 3916e3ba: camera2: Add scene and effect mode for LEGACY. 
* commit '91aedfe5a21f0df770af6379af76211e3d6b12d1':
  camera2: Add scene and effect mode for LEGACY.
 2014-07-30 22:23:40 +00:00
Ruben Brunk
a938df8501 am ecdb20ca: am 3916e3ba: camera2: Add scene and effect mode for LEGACY. 
* commit 'ecdb20cab808f1e9424a9f234f4d528ed1b3956f':
  camera2: Add scene and effect mode for LEGACY.
 2014-07-30 22:19:40 +00:00
Ruben Brunk
2b776ec710 am 3916e3ba: camera2: Add scene and effect mode for LEGACY. 
* commit '3916e3ba989cae92246c35c02f8230bc2cdc2505':
  camera2: Add scene and effect mode for LEGACY.
 2014-07-30 22:15:04 +00:00
Ruben Brunk
3fe9eba904 camera2: Add scene and effect mode for LEGACY. 
Bug: 15116722

Change-Id: I0797fccb5fdd8b959622c100f25b2950cfe4e115
 2014-07-30 22:09:41 +00:00
Adam Lesinski
4c41d5c13d am cedeb363: am 872df53b: am bb8ac196: Add shared library support to aapt dump 
* commit 'cedeb363c2b0d982ca21570b3bf2866489666db5':
  Add shared library support to aapt dump
 2014-07-30 22:06:43 +00:00
Adam Lesinski
de581a0578 am 872df53b: am bb8ac196: Add shared library support to aapt dump 
* commit '872df53bc44fb08a93c1ad0cd8fb3e42f076734f':
  Add shared library support to aapt dump
 2014-07-30 22:02:44 +00:00
Adam Lesinski
47b94ed322 am bb8ac196: Add shared library support to aapt dump 
* commit 'bb8ac19684449644bd5218b57c9b14b3de12818e':
  Add shared library support to aapt dump
 2014-07-30 21:58:40 +00:00
Adam Lesinski
63e646eed5 Add shared library support to aapt dump 
AAPT dump should be able to handle dynamic references
that often come with shared library resources.

Bug:16678251
Change-Id: I6c8cd943145aab20ca9db9694c8c433b3c64279b
 2014-07-30 21:53:48 +00:00
Behdad Esfahbod
2793070f5b am 08302cf8: am 74b5b699: am 8bbd753a: Support FontFeatureSettings in Paint 
* commit '08302cf887eb1265179479e5883141b16d14e715':
  Support FontFeatureSettings in Paint
 2014-07-30 21:51:41 +00:00
Andres Morales
d63b641505 am 6f770576: am 0de25904: am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev 
* commit '6f770576d30ec901de45415a2ce37d0dfbb29fcc':
  Revert "NFC Unlock api changes"
 2014-07-30 21:46:41 +00:00
Behdad Esfahbod
365cebd700 am 74b5b699: am 8bbd753a: Support FontFeatureSettings in Paint 
* commit '74b5b699e634031042204aa9a085b3c96d84854e':
  Support FontFeatureSettings in Paint
 2014-07-30 21:46:04 +00:00
Behdad Esfahbod
6dea9bec3f am 8bbd753a: Support FontFeatureSettings in Paint 
* commit '8bbd753a20cc3fdcc4e92fb99e807b5a69cae6b2':
  Support FontFeatureSettings in Paint
 2014-07-30 21:42:22 +00:00
Andres Morales
d8cd23fb6a am 0de25904: am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev 
* commit '0de25904c41a47f6e233bc0ee9fa2264e6d9bf92':
  Revert "NFC Unlock api changes"
 2014-07-30 21:41:56 +00:00
Behdad Esfahbod
805f6ebf17 Support FontFeatureSettings in Paint 
New API is hidden.

Bug: 15246510
Change-Id: Idefca06a366de0d87f53d123b5291788448de4d0
 2014-07-30 21:38:23 +00:00
Alan Viverette
4bfbac82e4 am 72cb9b21: am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '72cb9b21a3fc4173b42f85c052c0dee2fd137ac2':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:35:26 +00:00
keunyoung
176ded3d62 am 4e8e785e: am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '4e8e785e2b7f58de656c7d473dcedd96c1a91e80':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:35:18 +00:00
Andres Morales
8d249222c7 am bdb80096: Merge "Revert "NFC Unlock api changes"" into lmp-dev 
* commit 'bdb800965afbb3a4b94ed5a43ef3662d703ebb31':
  Revert "NFC Unlock api changes"
 2014-07-30 21:34:36 +00:00
Alan Viverette
7d36e7be8b am 28affba6: am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '28affba60ec851f950b308d72d1e1c6a89a703bd':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:30:35 +00:00
keunyoung
a627c3886f am 669f8f22: am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '669f8f22c9e1b88e151c293300345164e8dfc012':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:30:31 +00:00
Andres Morales
d99760e87a am 8ecfad36: am 6b53a8a7: am 9fef5fbc: NFC Unlock api changes 
* commit '8ecfad3616258c191c23ff1048b7965c0bb03a06':
  NFC Unlock api changes
 2014-07-30 21:30:24 +00:00
Joe Fernandez
0f207454f4 am af33fc38: am 69d33398: am 2c3b3f53: am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit 'af33fc38dd12352590db3b74b9f70b1077a171d1':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:30:20 +00:00
Alan Lau
6c4814677c am a05862ab: (-s ours) am b1d2ce67: am 990606f0: am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit 'a05862ab5698de2ef2d5bdfec8d8ff9f96479ad9':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:30:16 +00:00
Alan Lau
29450df2a3 am 8e4172be: (-s ours) am 0109c7a3: am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '8e4172beceaed0459b6983908c3ada3078ac3a7e':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 21:30:11 +00:00
Alan Viverette
0e0d9ac023 am 077daef9: Merge "Update switch assets, fix SearchView asset 9-patch areas" into lmp-dev 
* commit '077daef9a28827318790f134adae6d8cd56fd1d3':
  Update switch assets, fix SearchView asset 9-patch areas
 2014-07-30 21:26:24 +00:00
keunyoung
d099c80959 am 4d2751c5: Merge "add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode" into lmp-dev 
* commit '4d2751c5596b9a8e85635db483ffd91091ccc557':
  add UiModeManager.ENABLE_CAR_MODE_NO_WAKE_LOCK flag for enableCarMode
 2014-07-30 21:26:20 +00:00
Andres Morales
f1ed4bf47f am 6b53a8a7: am 9fef5fbc: NFC Unlock api changes 
* commit '6b53a8a7f7fb1bb01b4d11219d8210072d77146e':
  NFC Unlock api changes
 2014-07-30 21:26:13 +00:00
Joe Fernandez
4aadeb8e61 am 69d33398: am 2c3b3f53: am a3e52154: am ecf76d1c: am b83127f0: Merge "docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ" into klp-modular-docs 
* commit '69d33398402d565cb1a30bbecc10f23849583b87':
  docs: Add adb over TCP/IP connection instructions to ADT-1 FAQ
 2014-07-30 21:26:09 +00:00
Alan Lau
5b5ec39c26 am b1d2ce67: am 990606f0: am 40274ada: (-s ours) am b12318be: Merge "Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""" into klp-modular-dev 
* commit 'b1d2ce67d2f951fb62a138342abe0138e1267dee':
  Revert "Revert "DO NOT MERGE Fix line breaking for clusters in narrow views""
 2014-07-30 21:26:05 +00:00
Alan Lau
08217beefa am 0109c7a3: am 1e438bef: am 839ca0d5: (-s ours) am 06a84554: Merge "Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""" into klp-modular-dev 
* commit '0109c7a329da4a478d212d58e131d8dc7ff16498':
  Revert "Revert "DO NOT MERGE Fix extraneous allocation and copying""
 2014-07-30 21:26:02 +00:00
Sean Wan
b38d76d338 am 3cea91e0: am 3c2a02dc: am b4a0e3ef: Merge "Fixed a NullPointerException in AccountManagerService." into lmp-dev 
* commit '3cea91e07330b6778c03510dbf7a7f71fc8477d5':
  Fixed a NullPointerException in AccountManagerService.
 2014-07-30 21:24:09 +00:00