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

155353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dianne Hackborn
3b6968876f Add API level for MR1. 
Change-Id: I3f2fd6b47f762f9b81afa4c9ae1e19997484b59e
 2014-10-16 18:14:12 -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
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
df385fffe8 am a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev 
* commit 'a6a1c52f58f24194de2665bb922577a9d7f6dccf':
  Use Telecom API for checking if a number is voicemail (1/2)
 2014-10-17 00:05:36 +00:00
Christopher Tate
11bac0ed21 am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 
* commit '61737d81a2e0a2cc327210bf771239655f62c3d9':
  Eliminate race condition around backup completion + resumption
 2014-10-17 00:05:22 +00:00
Nancy Chen
6f0c3f1a9a am c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev 
* commit 'c913c2dec18519ae5b989f65b207c7b3fec2d0ef':
  Revert "Add API method to extract subscription ID from phone account (1/3)"
 2014-10-17 00:05:14 +00:00
Andrew Solovay
f029a41918 am 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev 
* commit '8150734faa7feb8547f369db949c1149663ae2ee':
  docs: Updating support library pages for v.21.
 2014-10-17 00:05:10 +00:00
Andrew Solovay
f1816c2bc7 am 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev 
* commit '32b459e5c56cd1ccb0c9bb15336f796cb75e75f0':
  docs: Restored the preview license.
 2014-10-17 00:05:06 +00:00
Alan Viverette
0db6536190 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev 2014-10-16 23:48:38 +00:00
xinhe
efdddefaf5 Merge "telephony re-registry error" into lmp-mr1-dev 2014-10-16 22:37:45 +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
xinhe
75c2c159eb telephony re-registry error 
telephony re-registry do not update the callback and other parameter

Bug:17920733

Change-Id: I288e8b9a6747fc3c5c4794553435b29b49d379f0
 2014-10-16 21:54:38 +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
Chenjie Luo
b08ee9b728 am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit '76ed803fbd3d7be015cc25f521b73a9436c14fdb':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
 2014-10-16 21:05:51 +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
Rich Slogar
18535b07a8 am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '68c537f1981970f0ccac0fe46d5c522d5e05a82c':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:49:53 +00:00
Rich Slogar
68c537f198 am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit '60e74b4924dee6d033ca61854cac42768006ced5':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 20:45:31 +00:00
Rich Slogar
60e74b4924 Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 2014-10-16 20:41:18 +00:00
Chenjie Luo
2cab8825b3 Add system property config.disable_networktime to configure NetworkTimeUpdateService 
Bug: 17934875
Change-Id: Ie5acf7266a5766f407db8f23d2c3d26920fa4020
 2014-10-16 13:33:25 -07:00
Chenjie Luo
50fcdf9d46 am fe09db1e: Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 
* commit 'fe09db1e0d5af46e7b643c37ba52f62500b7f043':
  Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"
 2014-10-16 20:28:02 +00:00
Chenjie Luo
fe09db1e0d Merge "Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService"" into lmp-sprout-dev 2014-10-16 20:23:10 +00:00
Chenjie Luo
d25e4efdc1 Revert "Add system property config.disable_timeupdate to configure NetworkTimeUpdateService" 
This reverts commit c597c55ffeb9debcf2dba8a77a80caa9016ea4d1.

Change-Id: Idc83e582c10dda2c6245ec19921785f361a07a68
 2014-10-16 20:22:24 +00:00
Svet Ganov
0ee1d87c38 am 515f14d4: am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit '515f14d4659626ebf8381a5cc2d6a44063d30b42':
  Send accessibility events with no window.
 2014-10-16 19:47:27 +00:00
Svet Ganov
515f14d465 am b22552c3: Merge "Send accessibility events with no window." into lmp-dev 
* commit 'b22552c35bc939619c2e7c967e4eae618d8b93cc':
  Send accessibility events with no window.
 2014-10-16 19:40:15 +00:00
Svet Ganov
b22552c35b Merge "Send accessibility events with no window." into lmp-dev 2014-10-16 19:35:41 +00:00
Rich Slogar
8ee2b2dace :docs Platform Tools Rel Note Nexus 6/9 dpi updates 
Change-Id: I34d71a4c42fababbce1ad13dee4fa8f722798e7b
 2014-10-16 12:07:35 -07:00