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

163239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
c64630d013 am cd9ec79b: am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 
* commit 'cd9ec79b10d335e964ce4a43be4ea962bbe171bf':
  PowerUI: Uncategorize battery notifications as _SYSTEM.
 2014-10-17 16:49:27 +00:00
John Spurlock
cd9ec79b10 am 6daac003: Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 
* commit '6daac00331fa79d8ab249ef148a8116e58ca9a56':
  PowerUI: Uncategorize battery notifications as _SYSTEM.
 2014-10-17 16:43:42 +00:00
John Spurlock
6daac00331 Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev 2014-10-17 16:39:21 +00:00
John Spurlock
3cf316f71d am 0f0ee577: am 289d797a: QS: 7 day timeout for color-inversion tile. 
* commit '0f0ee577f64d7fed31ba2688fb58f607abc22a39':
  QS: 7 day timeout for color-inversion tile.
 2014-10-17 16:25:48 +00:00
John Spurlock
0f0ee577f6 am 289d797a: QS: 7 day timeout for color-inversion tile. 
* commit '289d797a6a748cfc7dcca8c815fab6c37061bf05':
  QS: 7 day timeout for color-inversion tile.
 2014-10-17 16:20:48 +00:00
John Spurlock
5b038b4b2b PowerUI: Uncategorize battery notifications as _SYSTEM. 
So they don't interrupt in priority mode.

Bug: 17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029
 2014-10-17 12:16:57 -04:00
John Spurlock
289d797a6a QS: 7 day timeout for color-inversion tile. 
Bug: 17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4
 2014-10-17 12:06:38 -04:00
Neil Fuller
3b96bfb103 am 9b0109eb: am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit '9b0109eb051fcf0a7ad801d03e73aa4e0bf2d7a7':
  Removing some more FloatMath references
 2014-10-17 14:59:48 +00:00
Neil Fuller
9b0109eb05 am c7aa8fe6: Merge "Removing some more FloatMath references" 
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references
 2014-10-17 14:54:17 +00:00
Neil Fuller
c7aa8fe623 Merge "Removing some more FloatMath references" 2014-10-17 14:48:17 +00:00
Dan Albert
59df570abf am b9734228: (-s ours) am 69c8d39d: Merge "Clean up unused parameter warnings." 
* commit 'b9734228046d541539ae7ce4f5ba22b9e2153e77':
  Clean up unused parameter warnings.
 2014-10-17 09:02:54 +00:00
Dan Albert
b973422804 am 69c8d39d: Merge "Clean up unused parameter warnings." 
* commit '69c8d39d1f9ebb55844ad7794d12fedf8b5be5bf':
  Clean up unused parameter warnings.
 2014-10-17 07:38:20 +00:00
Nancy Chen
7d5e31907a am a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev automerge: df385ff 
automerge: 28bfe49

* commit '28bfe49e8fb90ce372008ac54a5dbdaac7032cb7':
  Use Telecom API for checking if a number is voicemail (1/2)
 2014-10-17 01:18:34 +00:00
Christopher Tate
29cef75ddf am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev automerge: 11bac0e 
automerge: ed1e999

* commit 'ed1e999cb71f3af51ee96a6ed8ac3f3b031e1968':
  Eliminate race condition around backup completion + resumption
 2014-10-17 01:17:13 +00:00
Nancy Chen
a4a8aa7940 am c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev automerge: 6f0c3f1 
automerge: 96c6213

* commit '96c6213e443cc9cec85ff056865d54a8178d28bc':
  Revert "Add API method to extract subscription ID from phone account (1/3)"
 2014-10-17 01:16:09 +00:00
Andrew Solovay
4d07538f40 am 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev automerge: f029a41 
automerge: b995dbc

* commit 'b995dbcbb3e7d7e8fe1aac8e98c016b4ab746c51':
  docs: Updating support library pages for v.21.
 2014-10-17 01:15:14 +00:00
Andrew Solovay
b9bc1b7e58 am 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev automerge: f1816c2 
automerge: b658608

* commit 'b658608baed0889787d07d05a3d82129fa6faa4f':
  docs: Restored the preview license.
 2014-10-17 01:14:18 +00:00
Nancy Chen
28bfe49e8f am a6a1c52f: Merge "Use Telecom API for checking if a number is voicemail (1/2)" into lmp-sprout-dev 
automerge: df385ff

* commit 'df385fffe822a7854fb7ce9c5e46ee007646c89e':
  Use Telecom API for checking if a number is voicemail (1/2)
 2014-10-17 00:43:13 +00:00
Christopher Tate
ed1e999cb7 am 61737d81: am 040d89bb: Merge "Eliminate race condition around backup completion + resumption" into lmp-dev 
automerge: 11bac0e

* commit '11bac0ed21e67c2282ae6fff38ed026e904571d4':
  Eliminate race condition around backup completion + resumption
 2014-10-17 00:41:31 +00:00
Nancy Chen
96c6213e44 am c913c2de: Merge "Revert "Add API method to extract subscription ID from phone account (1/3)"" into lmp-sprout-dev 
automerge: 6f0c3f1

* commit '6f0c3f1a9a0a7a72c560e756504541e5fa8ac584':
  Revert "Add API method to extract subscription ID from phone account (1/3)"
 2014-10-17 00:39:51 +00:00
Andrew Solovay
b995dbcbb3 am 8150734f: am 6b53fb62: Merge "docs: Updating support library pages for v.21." into lmp-dev 
automerge: f029a41

* commit 'f029a419189954beccd8cddd4f9fb48aa79ae51e':
  docs: Updating support library pages for v.21.
 2014-10-17 00:38:47 +00:00
Andrew Solovay
b658608bae am 32b459e5: am 4461e926: Merge "docs: Restored the preview license." into lmp-dev 
automerge: f1816c2

* commit 'f1816c2bc7ba64055c56805dc47036cc261921f5':
  docs: Restored the preview license.
 2014-10-17 00:37:39 +00:00
Alan Viverette
777949c64d Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev automerge: 0db6536 
automerge: e0fceba

* commit 'e0fceba162a3bd583fa8ed16d3d69920cadd4a4c':
  Update AM/PM selectors for clock face TimePicker
 2014-10-17 00:15:02 +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
Dan Albert
69c8d39d1f Merge "Clean up unused parameter warnings." 2014-10-17 00:03:06 +00:00
Alan Viverette
e0fceba162 Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev 
automerge: 0db6536

* commit '0db6536190fa34910c0bfe376c47b8d594f32a25':
  Update AM/PM selectors for clock face TimePicker
 2014-10-17 00:00:30 +00:00
Dan Albert
692018430f Clean up unused parameter warnings. 
Change-Id: Ifbf310a0c10bd6afc3099bcad1026990bd1e6a22
 2014-10-16 16:55:29 -07:00
xinhe
be8d287533 Merge "telephony re-registry error" into lmp-mr1-dev automerge: efdddef 
automerge: 094c313

* commit '094c3136690d9d75b151666aad65a7f77d731e8a':
  telephony re-registry error
 2014-10-16 23:52:56 +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
094c313669 Merge "telephony re-registry error" into lmp-mr1-dev 
automerge: efdddef

* commit 'efdddefaf5932f81b16aa49a2394f9b3d4e48bf5':
  telephony re-registry error
 2014-10-16 23:32:11 +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
Chenjie Luo
420aec8a38 am 67b086f9: am b08ee9b7: am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit '67b086f9f16de57b2680966feaa60156a33135a5':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
 2014-10-16 21:17:25 +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
Chenjie Luo
67b086f9f1 am b08ee9b7: am 76ed803f: Merge "Add system property config.disable_networktime to configure NetworkTimeUpdateService" into lmp-sprout-dev 
* commit 'b08ee9b728347abf67ee193981b84db54810538b':
  Add system property config.disable_networktime to configure NetworkTimeUpdateService
 2014-10-16 21:12:10 +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
Rich Slogar
87e144de8e am fbe9a6af: am 18535b07: am 68c537f1: am 60e74b49: Merge ":docs Platform Tools Rel Note Nexus 6/9 dpi updates" into lmp-dev 
* commit 'fbe9a6affc47b7d32e55a347001c2ed4cedc5f31':
  :docs Platform Tools Rel Note Nexus 6/9 dpi updates
 2014-10-16 21:00:45 +00:00