summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with ↵Ricardo Cervera2014-10-074-12/+948
|\ | | | | | | | | | | | | Google Now actions" into klp-modular-docs * commit '6d30f576146725ee81b8cb753584985a2758b566': docs: Update Common Intents page with Google Now actions
| * am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now ↵Ricardo Cervera2014-10-074-12/+948
| |\ | | | | | | | | | | | | | | | | | | actions" into klp-modular-docs * commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8': docs: Update Common Intents page with Google Now actions
| | * Merge "docs: Update Common Intents page with Google Now actions" into ↵Ricardo Cervera2014-10-074-12/+948
| | |\ | | | | | | | | | | | | klp-modular-docs
| | | * docs: Update Common Intents page with Google Now actionsRicardo Cervera2014-10-064-12/+948
| | | | | | | | | | | | | | | | Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
* | | | Merge "ignore null TaskStack and continue layout for PRIVATE_PRESENTATION ↵keunyoung2014-10-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | window" into lmp-dev
| * | | | ignore null TaskStack and continue layout for PRIVATE_PRESENTATION windowkeunyoung2014-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 17677973 Change-Id: I2666a1c1cf8956e60d7261912da34d1999131eba
* | | | | Merge "Add mProperSigningKeySet to PackageKeySetData constructor." into lmp-devdcashman2014-10-071-0/+1
|\ \ \ \ \
| * | | | | Add mProperSigningKeySet to PackageKeySetData constructor.dcashman2014-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17847565 Change-Id: Iafa9650140e82d244d2336a07232bd40bf3c5eb8
* | | | | | am 4be6fdeb: am ba2199fa: Merge "docs: Modified the notice in the ↵Quddus Chong2014-10-071-16/+14
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | am ba2199fa: Merge "docs: Modified the notice in the android.location ↵Quddus Chong2014-10-041-16/+14
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs * commit 'ba2199fa8c369d9627a216a4c3ea19497bf9e9c7': docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
| | * | | | Merge "docs: Modified the notice in the android.location package file to ↵Quddus Chong2014-10-041-16/+14
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs
| | | * | | | docs: Modified the notice in the android.location package file to stronglyQuddus Chong2014-10-031-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | encourage developers to migrate to the Google Play Services Location API. Change-Id: I9c2602daa7198eca38841582865c6a973f5acec8
* | | | | | | am 0e61e44d: am 2a02b881: Merge "docs: Training class for the Wearable UI ↵Ricardo Cervera2014-10-0717-0/+1276
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Library" into klp-modular-docs * commit '0e61e44ddf8c8abb774020cde90ec44d4ae43bc6': docs: Training class for the Wearable UI Library
| * | | | | | am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into ↵Ricardo Cervera2014-10-0417-0/+1276
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs * commit '2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881': docs: Training class for the Wearable UI Library
| | * | | | | Merge "docs: Training class for the Wearable UI Library" into klp-modular-docsRicardo Cervera2014-10-0317-0/+1276
| | |\ \ \ \ \
| | | * | | | | docs: Training class for the Wearable UI LibraryRicardo Cervera2014-10-0217-0/+1276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93e9f6fc407f9afa79ce9af43d90719eb526bffa
* | | | | | | | am 64460a2b: am 83d5c9bf: docs:change required ADT version to 23.0.2Rich Slogar2014-10-071-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '64460a2b6e0166d4c24b195f850e67265fb485f5': docs:change required ADT version to 23.0.2
| * | | | | | | am 83d5c9bf: docs:change required ADT version to 23.0.2Rich Slogar2014-10-041-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '83d5c9bfbd75831375009e21989de40368afc04a': docs:change required ADT version to 23.0.2
| | * | | | | | docs:change required ADT version to 23.0.2Rich Slogar2014-10-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6312cd45df94a89f2812aa3c53e2974f6cfbb0ed
* | | | | | | | am 8267ffcc: am cef9aab6: Merge "make sdk download links use HTTPS bug: ↵smain@google.com2014-10-071-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8033954" into klp-modular-docs * commit '8267ffccbe58ea348a53a0e6058bf902d6e8932a': make sdk download links use HTTPS bug: 8033954
| * | | | | | | am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into ↵smain@google.com2014-10-031-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs * commit 'cef9aab68ec45340186261d39ded6261ba1c5966': make sdk download links use HTTPS bug: 8033954
| | * | | | | | Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docssmain@google.com2014-10-031-2/+2
| | |\ \ \ \ \ \
| | | * | | | | | make sdk download links use HTTPSsmain@google.com2014-09-261-2/+2
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 8033954 Change-Id: Idffbb31d397b765fc71ec034d30cc58d1423fdc9
* | | | | | | | Merge "Accept any restored wallpaper" into lmp-devChristopher Tate2014-10-071-20/+34
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Accept any restored wallpaperChristopher Tate2014-10-061-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...and let the wallpaper service & hosts figure out what to do with it. Bug 17677006 Change-Id: Ie5bfa549af4da178e621ffc42a759a552897d93a
* | | | | | | | Merge "Fixing where call goes from disconnecting to active to disconnecting ↵Tyler Gunn2014-10-072-0/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | state." into lmp-dev
| * | | | | | | | Fixing where call goes from disconnecting to active to disconnecting state.Tyler Gunn2014-10-072-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | | | | | Merge "Load shared library dependencies for AppWidgets" into lmp-devAdam Lesinski2014-10-077-14/+103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Load shared library dependencies for AppWidgetsAdam Lesinski2014-10-077-14/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-devJason Monk2014-10-073-1/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Hide hotspot tile if 'provisioning' is neededJason Monk2014-10-073-1/+18
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | Fix build, previous commit failed to remove an importAndres Morales2014-10-071-1/+0
| |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17883273 Change-Id: I6ef422eae83fb8b44279f1bf5a811858b791afa7
* | | | | | | | | Merge "Remove dead NFC unlock code from fw/base" into lmp-devAndres Morales2014-10-072-13/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dead NFC unlock code from fw/baseAndres Morales2014-10-062-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17883273 Change-Id: I214d141b0b9d83b5698f596087fabb1f30543606
* | | | | | | | | | Merge "Update 'No notifications' text on configuration change" into lmp-devJorim Jaggi2014-10-071-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update 'No notifications' text on configuration changeJorim Jaggi2014-10-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17821946 Change-Id: Ia4518426ce059be5312d652bb27bbe11a1626518
* | | | | | | | | | | Merge "Set the default user restrictions to disallow calling and sms" into ↵Amith Yamasani2014-10-073-2/+52
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | | | | | Set the default user restrictions to disallow calling and smsAmith Yamasani2014-10-063-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a user via the UI, disallow phone calls and SMS by default. Primary user must explicitly enable it via Settings. Bug: 17832802 Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
* | | | | | | | | | | | Merge "Doze: Avoid pulsing in pockets." into lmp-devJohn Spurlock2014-10-072-34/+154
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Doze: Avoid pulsing in pockets.John Spurlock2014-10-072-34/+154
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Full volume on remote submix for apps that need it" into lmp-devJean-Michel Trivi2014-10-073-6/+154
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Full volume on remote submix for apps that need itJean-Michel Trivi2014-10-073-6/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-devPauloftheWest2014-10-071-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed a Bluetooth Quick Settings update bug.PauloftheWest2014-10-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Now when a Bluetooth device disconnects, and the user is looking at quick settings, the Bluetooth icon and text will update with the new state of diconnected. Bug: 17677593 Change-Id: Iccaf16a23f7e0b8690a32945906a9ccc2382cdd0
* | | | | | | | | | | | | Merge "Fix build break" into lmp-devYorke Lee2014-10-071-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix build breakYorke Lee2014-10-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16852844 Change-Id: I227aab0afdf4a5a5cd5dc38e7af055b7a1b94729
* | | | | | | | | | | | | | Merge "Sms7BitEncodingTranslator" into lmp-devAmit Mahajan2014-10-074-0/+287
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Sms7BitEncodingTranslatorXia Ying2014-10-074-0/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16197894 Change-Id: I2bd5ae0a3c2d5d8f869f5e2de7009fd450070521
* | | | | | | | | | | | | | Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-devYorke Lee2014-10-075-9/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Add ability to add sim-initiated MO call to UI (2/4)Yorke Lee2014-10-065-9/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add supporting (hidden) APIs to TelecomManager to add the ability to add a previous unknown call to Telecom Bug: 17787391 Change-Id: Ibdfaee81a55e11451c146751cf970980dccad435