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

158146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
df609c3fa3 am 692bb81c: am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '692bb81c120ae6366f69216274d7845534ef7d73':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 23:58:14 +00:00
Ricardo Cervera
692bb81c12 am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '6d30f576146725ee81b8cb753584985a2758b566':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 23:48:48 +00:00
keunyoung
e3bbf149b2 am d76f80bd: Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev 
* commit 'd76f80bd3a38e11d27935cbe461c3a9d4243dd76':
  ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window
 2014-10-07 23:07:18 +00:00
keunyoung
d76f80bd3a Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window" into lmp-dev 2014-10-07 22:58:48 +00:00
dcashman
c3e45cab20 am 90f46eca: Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev 
* commit '90f46eca86df268d8df276fb68dac2e731f35479':
  Add mProperSigningKeySet to PackageKeySetData constructor.
 2014-10-07 22:40:41 +00:00
dcashman
90f46eca86 Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-dev 2014-10-07 22:37:21 +00:00
Quddus Chong
3f5184c394 am 6ec5a256: am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs 
* commit '6ec5a256d78579057e82691e4cc21ca6222e2b1f':
  docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
 2014-10-07 22:32:08 +00:00
Ricardo Cervera
adc5504a6e am c2b35efb: am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
* commit 'c2b35efb58623b778d0feaf49cc00e5e8bc9eed4':
  docs: Training class for the Wearable UI Library
 2014-10-07 22:32:04 +00:00
Rich Slogar
8f325c2d1c am d4303161: am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 
* commit 'd4303161b106e57c5d73081d5a729d233d9ad792':
  docs:change required ADT version to 23.0.2
 2014-10-07 22:32:00 +00:00
smain@google.com
55152ac229 am a2561db3: am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
* commit 'a2561db3869fea0dfc193ae6b5fc2d09c40cb3eb':
  make sdk download links use HTTPS bug: 8033954
 2014-10-07 22:31:55 +00:00
Quddus Chong
6ec5a256d7 am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs 
* commit '4be6fdebdd386dc18159c5557db91936a62f42ab':
  docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
 2014-10-07 22:23:40 +00:00
Ricardo Cervera
c2b35efb58 am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
* commit '0e61e44ddf8c8abb774020cde90ec44d4ae43bc6':
  docs: Training class for the Wearable UI Library
 2014-10-07 22:23:31 +00:00
Rich Slogar
d4303161b1 am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2 
* commit '64460a2b6e0166d4c24b195f850e67265fb485f5':
  docs:change required ADT version to 23.0.2
 2014-10-07 22:23:24 +00:00
smain@google.com
a2561db386 am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
* commit '8267ffccbe58ea348a53a0e6058bf902d6e8932a':
  make sdk download links use HTTPS bug: 8033954
 2014-10-07 22:23:04 +00:00
Christopher Tate
0968bfa96f am ae456fd8: Merge "Accept any restored wallpaper" into lmp-dev 
* commit 'ae456fd894c5a41f859196016a7c49113b235eda':
  Accept any restored wallpaper
 2014-10-07 21:53:35 +00:00
Christopher Tate
ae456fd894 Merge "Accept any restored wallpaper" into lmp-dev 2014-10-07 21:50:08 +00:00
keunyoung
030a93feb8 ignore null TaskStack and continue layout for PRIVATE_PRESENTATION window 
bug: 17677973
Change-Id: I2666a1c1cf8956e60d7261912da34d1999131eba
 2014-10-07 14:46:24 -07:00
dcashman
d876a1d368 Add mProperSigningKeySet to PackageKeySetData constructor. 
Bug: 17847565
Change-Id: Iafa9650140e82d244d2336a07232bd40bf3c5eb8
 2014-10-07 14:16:35 -07:00
Tyler Gunn
d0becdf3f3 am 3bde32e6: Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev 
* commit '3bde32e68d201f2dda4a4847d2818c74b120cdbb':
  Fixing where call goes from disconnecting to active to disconnecting state.
 2014-10-07 20:52:10 +00:00
Adam Lesinski
5959304e58 am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp-dev 
* commit '1a98dd5cc7ea89793208b51983198bfbeade5ccc':
  Load shared library dependencies for AppWidgets
 2014-10-07 20:47:19 +00:00
Jason Monk
1229a372a7 am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 20:47:09 +00:00
Tyler Gunn
3bde32e68d Merge "Fixing where call goes from disconnecting to active to disconnecting state." into lmp-dev 2014-10-07 20:46:39 +00:00
Andres Morales
fa70e67917 am 258d2221: Fix build, previous commit failed to remove an import 
* commit '258d222152a410341ddad045ce92e57dd7ab454e':
  Fix build, previous commit failed to remove an import
 2014-10-07 19:59:13 +00:00
Andres Morales
d74c277bbe am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 
* commit 'd6a2ab930972d5578957ca919abd38fca074deec':
  Remove dead NFC unlock code from fw/base
 2014-10-07 19:59:09 +00:00
Jorim Jaggi
c746ef5179 am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit '988a8a9820bb3ae331be4932eb9e672a4614efd5':
  Update 'No notifications' text on configuration change
 2014-10-07 19:58:56 +00:00
Adam Lesinski
1a98dd5cc7 Merge "Load shared library dependencies for AppWidgets" into lmp-dev 2014-10-07 19:51:17 +00:00
Adam Lesinski
d00bb5edcf Load shared library dependencies for AppWidgets 
PackageManager and AppWidgetHostServiceImpl should
be loading the resources of any shared libraries being
used by the app, as they have references in their Widgets
or application icons/labels, etc.

Bug:17668152
Change-Id: I359662334edb125d7570089916727df4eeba02bb
 2014-10-07 12:14:45 -07:00
Jason Monk
733bcc7fbe Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev 2014-10-07 18:53:20 +00:00
Jason Monk
20ef4024ed Hide hotspot tile if 'provisioning' is needed 
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.

Bug: 17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
 2014-10-07 14:43:11 -04:00
Amith Yamasani
53322b9f7b am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 18:27:10 +00:00
Andres Morales
258d222152 Fix build, previous commit failed to remove an import 
Bug:17883273
Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
 2014-10-07 11:15:58 -07:00
Andres Morales
d6a2ab9309 Merge "Remove dead NFC unlock code from fw/base" into lmp-dev 2014-10-07 18:11:21 +00:00
Jorim Jaggi
988a8a9820 Merge "Update 'No notifications' text on configuration change" into lmp-dev 2014-10-07 17:48:01 +00:00
Tyler Gunn
4afc6afd20 Fixing where call goes from disconnecting to active to disconnecting state. 
- Adding disconnecting state to telecom used to communicate that a call is
being disconnected to InCall UI (rather than it existing only as a state
in the InCall UI).

Bug: 17821930
Change-Id: I6c2d9521915ba154c0468eea62c12c30060edd2e
 2014-10-07 10:14:55 -07:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
John Spurlock
c32105d7b9 am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.
 2014-10-07 16:22:24 +00:00
John Spurlock
0d334365c6 Merge "Doze: Avoid pulsing in pockets." into lmp-dev 2014-10-07 16:17:46 +00:00
Jean-Michel Trivi
77bea65432 am dce7a427: Merge "Full volume on remote submix for apps that need it" into lmp-dev 
* commit 'dce7a427593c6e11277d9e3075ab027512923276':
  Full volume on remote submix for apps that need it
 2014-10-07 16:16:49 +00:00
Jean-Michel Trivi
dce7a42759 Merge "Full volume on remote submix for apps that need it" into lmp-dev 2014-10-07 16:12:08 +00:00
Jean-Michel Trivi
ba5270b887 Full volume on remote submix for apps that need it 
If an AudioRecord is created with the "fixedVolume" tag
  when recording from REMOTE_SUBMIX, treat the
  device DEVICE_OUT_REMOTE_SUBMIX as a fixed full volume
  device during the recording. Also register a death
  handler during the recording.
  Otherwise this is a no-op.

Bug 17635294

Change-Id: I8d26fe777047126f34308e1e1b7ac28ba269ad89
 2014-10-07 09:09:41 -07:00
John Spurlock
92b8d41096 Doze: Avoid pulsing in pockets. 
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.

Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
 2014-10-07 12:01:56 -04:00
PauloftheWest
2b5fe1cd2e am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit '53c84002911362c913bc72cd28d186718a33149d':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 13:06:06 +00:00
PauloftheWest
53c8400291 Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 2014-10-07 13:01:28 +00:00
Ricardo Cervera
6d30f57614 am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:49:17 +00:00
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00
Yorke Lee
4c88403bda am 7f22eb98: Merge "Fix build break" into lmp-dev 
* commit '7f22eb981812309a1e751a891428dffe6b1da175':
  Fix build break
 2014-10-07 02:16:59 +00:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Yorke Lee
7f22eb9818 Merge "Fix build break" into lmp-dev 2014-10-07 02:12:02 +00:00
Yorke Lee
9858af0ec6 Fix build break 
Bug: 16852844
Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
 2014-10-06 18:58:52 -07:00
Amit Mahajan
661a149187 am 69555fc2: Merge "Sms7BitEncodingTranslator" into lmp-dev 
* commit '69555fc2c8726912ae5c1afb966c8a1b9c65400b':
  Sms7BitEncodingTranslator
 2014-10-07 01:33:18 +00:00