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

154210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
d9b48e94a1 am 4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev 
* commit '4561be01934cdc462570b56afb4c602cbf3295c4':
  add TV quality page to Develop landing carousel
 2014-10-17 07:29:26 +00:00
Scott Rowe
fafb6c7080 am dd886683: docs: Notifications changes for L 
* commit 'dd88668392839509c812a544b1132185b3825b69':
  docs: Notifications changes for L
 2014-10-17 07:29:22 +00:00
Joe Fernandez
f8d6891c69 am 4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev 
* commit '4deed3ecc3b47d520ca6084f2fa6ad7a9dc8c018':
  docs: Android TV App Quality Requirements v2
 2014-10-17 07:29:19 +00:00
Scott Rowe
583cf69c00 am 6bd081ca: docs: Displaying a Now Playing Card 
* commit '6bd081ca8a555fd71fbe856374b8efe68ede6144':
  docs: Displaying a Now Playing Card
 2014-10-17 07:29:15 +00:00
Joe Fernandez
770f57e068 am 321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev 
* commit '321e7645c305dbc4f7444d364c879bad8946da2b':
  docs: Recents screen for tasks and activities
 2014-10-17 07:29:12 +00:00
smain@google.com
4a0f162df7 am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 
* commit 'c6400892b56ee217ed01a41abb769fb1aebc9830':
  add Lollipop highlights and revision to 5.0 API overview intro
 2014-10-17 07:29:08 +00:00
Joe Fernandez
491fa0570d am d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev 
* commit 'd664dc93f47e32df865384718055b200585e0e88':
  Android 5.0 changes to IME switching
 2014-10-17 07:29:04 +00:00
Joe Fernandez
be09752318 am c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev 
* commit 'c49acf029e65928d07815631a0160fe179458add':
  docs:  Update Android TV home for L announcement
 2014-10-17 07:29:00 +00:00
David Friedman
4e5ebb994a am c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev 
* commit 'c2a556ffe8a5949a0e3d7baf8122ea38b4ae1d30':
  Notificiations Design for Android L Release
 2014-10-17 07:28:56 +00:00
David Friedman
981c97ecc0 am 597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 
* commit '597d3861298d8c3e2bc50c92ecffb4003cd265f7':
  NDK-r10c release notes (change log) for publication to NDK page on DAC.
 2014-10-17 07:28:53 +00:00
smain@google.com
238b479546 am 271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement 
* commit '271078f50dc730e0fda8e80c66b81ac2442f64f0':
  update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
 2014-10-17 07:28:49 +00:00
Ricardo Cervera
f14250014b am 2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev 
* commit '2e57c2c956588b3f08111c323e811d4cbe46dabd':
  docs: Migrating material design info from the Preview site
 2014-10-17 07:28:45 +00:00
Quddus Chong
0fae717e20 am 67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 
* commit '67b5c8ebc4a9895e065a9314cb9afbf8e3e60197':
  docs: Updates to Android 5.0 API Overview.
 2014-10-17 07:28:41 +00:00
smain@google.com
4561be0193 Merge "add TV quality page to Develop landing carousel" into lmp-dev 2014-10-17 06:51:43 +00:00
Scott Rowe
dd88668392 docs: Notifications changes for L 
Change-Id: I53c744734358401adefbcffd5ce5a3676d6d955a
 2014-10-16 23:48:25 -07:00
Joe Fernandez
4deed3ecc3 Merge "docs: Android TV App Quality Requirements v2" into lmp-dev 2014-10-17 06:38:37 +00:00
Joe Fernandez
957cddd71b docs: Android TV App Quality Requirements v2 
Change-Id: I54c53d90faf1605945bb8397278b9057a9c687f4
 2014-10-16 23:31:08 -07:00
Scott Rowe
6bd081ca8a docs: Displaying a Now Playing Card 
Change-Id: I68cd305618caff24cf2de564d7b085c663702d0c
 2014-10-16 23:29:51 -07:00
smain@google.com
e1c95081b4 add TV quality page to Develop landing carousel 
Change-Id: I736654e248645bfda7f94156b8c0f520a8be4bac
 2014-10-16 23:22:50 -07:00
Joe Fernandez
321e7645c3 Merge "docs: Recents screen for tasks and activities" into lmp-dev 2014-10-17 05:40:43 +00:00
smain@google.com
c6400892b5 Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev 2014-10-17 05:17:02 +00:00
Scott Rowe
73d799dda2 docs: Recents screen for tasks and activities 
Change-Id: I94774e60e6a7453a047ad394c3bbfff0cc4dfc7d
 2014-10-16 22:16:13 -07:00
smain@google.com
4c169e03fb add Lollipop highlights and revision to 5.0 API overview intro 
Change-Id: Ic50db6ea2ea9893088f271ce2427ccda69fc6b75
 2014-10-16 22:15:18 -07:00
Joe Fernandez
d664dc93f4 Merge "Android 5.0 changes to IME switching" into lmp-dev 2014-10-17 05:01:04 +00:00
Joe Fernandez
c49acf029e Merge "docs: Update Android TV home for L announcement" into lmp-dev 2014-10-17 04:58:03 +00:00
David Friedman
e802d5432e Android 5.0 changes to IME switching 
Change-Id: I158736ee36706889a5277f02a652162194289514
 2014-10-16 21:52:53 -07:00
David Friedman
c2a556ffe8 Merge "Notificiations Design for Android L Release" into lmp-dev 2014-10-17 04:48:32 +00:00
David Friedman
0df77e988a Notificiations Design for Android L Release 
Change-Id: I32723dafa2d3bd455da9c6e03c09c668b2bd6446
 2014-10-16 21:39:25 -07:00
Joe Fernandez
d5c4c26869 docs: Update Android TV home for L announcement 
Change-Id: Ie98da5efa59dd3c797dda38bb465b7cc66b4d2e7
 2014-10-16 21:38:17 -07:00
David Friedman
597d386129 Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev 2014-10-17 04:30:29 +00:00
David Friedman
2fe086c21f NDK-r10c release notes (change log) for publication to NDK page on DAC. 
Change-Id: I0f8bc87b741ec1ef978c3fc22954d43519172299
 2014-10-16 21:18:03 -07:00
smain@google.com
271078f50d update L preview landing page for 5.0 SDK launch 
includes new system images
also update the DAC homepage announcement

Change-Id: I6e249e4ec5ef4b4329b145b334b31cfe11dd136c
 2014-10-16 18:48:17 -07:00
Ricardo Cervera
2e57c2c956 Merge "docs: Migrating material design info from the Preview site" into lmp-dev 2014-10-17 01:06:06 +00:00
Ricardo Cervera
414978a821 docs: Migrating material design info from the Preview site 
Change-Id: I3a2f71e41cc1371b8cce2d8860b116cf0f8b8ed2
 2014-10-16 17:52:28 -07:00
Dianne Hackborn
d3511d4be1 SDK only: hide the old L API version constant. 
Also update the LOLLIPOP version constant to describe more things
that change when you target it.

Change-Id: I15e2c26a0f997ff2bfc8dd5076c827da7f42ee66
 2014-10-16 17:49:45 -07:00
vandwalle
29a30d41a1 set autojoin associated scan frequency to 20 seconds 
Change-Id: I00cc11bfebcde99bc1bcfeaa682ec78fdd8d5ff2
 2014-10-16 17:48:21 -07:00
Quddus Chong
67b5c8ebc4 Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev 2014-10-17 00:39:31 +00:00
Nancy Chen
a6a1c52f58 Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev 2014-10-16 22:00:29 +00:00
Nancy Chen
443e501c46 Use Telecom API for checking if a number is voicemail (1/2) 
Since we don't want to communicate directly with Telephony in dialer, call
PhoneNumberUtils.isVoiceMailNumber (a Telephony method) through the
Telecom API. Add a method in TelecomManager to do this.

Bug: 17925501

Change-Id: Iecea82a0e5f0b106eaf105e9026d606110acf122
 2014-10-16 14:48:09 -07:00
Christopher Tate
61737d81a2 am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 
* commit '040d89bb0a4563d93073b7a27b3f201ce11dcf58':
  Eliminate race condition around backup completion + resumption
 2014-10-16 21:30:39 +00:00
Christopher Tate
040d89bb0a Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 2014-10-16 21:26:26 +00:00
Nancy Chen
c913c2dec1 Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev 2014-10-16 21:17:03 +00:00
Andrew Solovay
8150734faa am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev 
* commit '6b53fb6227b884db2761fa146ed2f4f28100962d':
  docs: Updating support library pages for v.21.
 2014-10-16 21:14:56 +00:00
Andrew Solovay
6b53fb6227 Merge "docs: Updating support library pages for v.21." into lmp-dev 2014-10-16 21:10:20 +00:00
Andrew Solovay
32b459e5c5 am 4461e926: Merge "docs: Restored the preview license." into lmp-dev 
* commit '4461e9268ba010f9cd6e8881a57b7af7b031ea31':
  docs: Restored the preview license.
 2014-10-16 21:09:57 +00:00
Nancy Chen
af6732ef6f Revert "Add API method to extract subscription ID from phone account (1/3)" 
This reverts commit b0cad32c3cadd0387f6dcd82aade629e6f2f6bee.

Change-Id: I54b6373ba0fc7d1ecc64c6ceedc7b371c7017cd8
 2014-10-16 21:08:39 +00:00
Andrew Solovay
4461e9268b Merge "docs: Restored the preview license." into lmp-dev 2014-10-16 21:01:07 +00:00
Chenjie Luo
76ed803fbd Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 2014-10-16 20:57:56 +00:00
Andrew Solovay
347257a74d docs: Restored the preview license. 
Added the preview license back, with changes as previously negotiated
with legal.

See first comment for staging directory link.

Change-Id: Ibc23d4d89b4380546d61ed052ba15dc81b8b1336
 2014-10-16 13:57:20 -07:00
Christopher Tate
a28b5c5160 Eliminate race condition around backup completion + resumption 
Ensure that the callback always sees the current-operation state in sync
with the various other bits of internal backup-operation state.  Previously
only the current-operation state was managed inside the critical section;
this resulted in a slim race window where a callback could see an ongoing
operation as still valid, but after the internal state on which that
operation depended had already been cleared.

Bug 17931760

Change-Id: Ia032668e7a9d22f1029c57fc98db9e86484d5719
 2014-10-16 13:56:45 -07:00