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

163172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
 2015-01-31 00:54:07 +00:00
Deepanshu Gupta
3d5535cfb7 Merge "Limited AppCompat support" into lmp-dev 2015-01-31 00:50:35 +00:00
Deepanshu Gupta
1d59871e4e Merge "Resource resolution fixes." into lmp-dev 2015-01-31 00:48:57 +00:00
Joe Fernandez
95fa88250a am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
automerge: 3548de6

* commit '3548de60735a79d3e7087c26ae491a7f38da5b4d':
  docs: studio emulator platform update
 2015-01-31 00:25:04 +00:00
Joe Fernandez
3548de6073 am 5c37c8e6: am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '5c37c8e66227b15d471047e7c4c986cf3c67876a':
  docs: studio emulator platform update
 2015-01-31 00:14:39 +00:00
Jon Larimer
9e7e8afbb9 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
automerge: 5c9d0de

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-31 00:05:54 +00:00
Joe Fernandez
5c37c8e662 am d801a123: am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit 'd801a1238392b8c7a8e0131cee89370143363046':
  docs: studio emulator platform update
 2015-01-30 23:41:10 +00:00
Joe Fernandez
d801a12383 am 2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs 
* commit '2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
  docs: studio emulator platform update
 2015-01-30 23:34:44 +00:00
Joe Fernandez
2b68ab3add Merge "docs: studio emulator platform update" into lmp-docs 2015-01-30 23:25:51 +00:00
Jon Larimer
3a6d8f5473 am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '90d5bd8daab404afc50470f5c19ea725bd2466fe':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:33:13 +00:00
Jon Larimer
90d5bd8daa am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'feb362a5d194b30226caf2efbaae77991007c65c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:24:43 +00:00
Jon Larimer
feb362a5d1 am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'a0d3bfbe8736fd638621ae48371b6e4e237ed4b1':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:18:34 +00:00
Stuart Scott
712d5b3d58 am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 
* commit '147b6a3522b7032ede24101f5ac32ec7d7afa9e9':
  [DS] Correct the access method for telephony system property
 2015-01-30 22:17:42 +00:00
Jon Larimer
a0d3bfbe87 am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:11:56 +00:00
Stuart Scott
147b6a3522 Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev 2015-01-30 22:09:38 +00:00
Jinsuk Kim
42e785fbf7 am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 
* commit '3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
  Revert "CEC: Let playback device switch TV input after bootup"
 2015-01-30 22:06:09 +00:00
Jon Larimer
5c9d0de174 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '545dd853bffbf778a0a44816ac6ed381b13f2158':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 22:01:50 +00:00
Jinsuk Kim
3457ae4709 Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev 2015-01-30 22:00:40 +00:00
Jinsuk Kim
4361549891 Revert "CEC: Let playback device switch TV input after bootup" 
This reverts commit 8913a0e1e8559d96e82b1ff408dd312ed279021b.

Change-Id: Ibfabdd94206141274a69040e0ed90ba29aeae75b
 2015-01-30 21:58:18 +00:00
Jon Larimer
545dd853bf am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:54:31 +00:00
Jon Larimer
9a425aa71c am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:44:17 +00:00
Jon Larimer
159aa73574 am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 21:28:59 +00:00
Jon Larimer
d403180997 am 48c95c43: Fix build breakage in older branches by avoiding <> notation 
* commit '48c95c4370533bf27e537cbca1e64d060a016c5f':
  Fix build breakage in older branches by avoiding <> notation
 2015-01-30 19:30:57 +00:00
Jason Monk
d2f15ecb08 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 
automerge: b2dd5cb

* commit 'b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 18:48:15 +00:00
Jason Monk
f38824928c Fix expandSettingsPanel status bar call 
automerge: 3c68ca2

* commit '3c68ca2feab6d3cd09c297ddc2e77af67694feec':
  Fix expandSettingsPanel status bar call
 2015-01-30 18:46:31 +00:00
Jason Monk
b2dd5cb900 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 2015-01-30 18:27:53 +00:00
Jason Monk
8ba572a327 Fix QS bluetooth tile accessibility issue 
Bluetooth tile was not announcing its state when the top half was
clicked.  This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information.  So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.

Bug: 19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
 2015-01-30 13:02:27 -05:00
Jason Monk
3c68ca2fea Fix expandSettingsPanel status bar call 
Use the same mechanism as the two finger gesture to get it to open
correctly.

Bug: 19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
 2015-01-30 12:10:15 -05:00
Alan Viverette
f607fa6b73 am d38cc749: Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 
* commit 'd38cc749215c0e41bcb06703066c379de83d91e4':
  Avoid bug in LinearLayout measurement
 2015-01-30 03:20:44 +00:00
Alan Viverette
d38cc74921 Merge "Avoid bug in LinearLayout measurement" into lmp-mr1-dev 2015-01-30 03:15:07 +00:00
Legler Wu
85973dcf8c [DS] Correct the access method for telephony system property 
Revise the method to access telephony system property.
Add several PROPERTY_XXX_XXX_MSIM for MSIM type system properties. If
caller use the old one, it will be dispatched to new one and get by
default phone id.
Ex. PROPERTY_ICC_OPERATOR_NUMERIC

Bug: 18675498
Change-Id: I008a7390fefbbcd9f6569f059d48eedf1da28de0
 2015-01-29 19:02:55 -08:00
Christopher Ferris
5d0cf917c3 am fd41feee: Merge "Fix wrap property creation when truncating." into lmp-mr1-dev 
* commit 'fd41feee6b909670010da79a0800c1aa2ce44255':
  Fix wrap property creation when truncating.
 2015-01-30 02:33:34 +00:00
Christopher Ferris
fd41feee6b Merge "Fix wrap property creation when truncating." into lmp-mr1-dev 2015-01-30 02:29:27 +00:00
Rich Slogar
4649dcd7c4 am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
automerge: e9e2707

* commit 'e9e2707feffd01c39252afcdea15523c9883a7ea':
  docs: linux requirements update
 2015-01-30 02:10:53 +00:00
Scott Rowe
b27882361e am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
automerge: 1b5a0fb

* commit '1b5a0fb681c3e2c1aad2d8a9b5313c2bd1b93220':
  docs: Card View for Android TV training
 2015-01-30 02:09:16 +00:00
Scott Rowe
4ca01ef21d am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
automerge: 9ad282f

* commit '9ad282fd73141685a2fc0d3474676ab10ddc4e1f':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 02:07:44 +00:00
Rich Slogar
e9e2707fef am f4fa2acb: am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit 'f4fa2acb22acdf2ddb536fd1e7e5b9df51d6a787':
  docs: linux requirements update
 2015-01-30 01:58:22 +00:00
Scott Rowe
1b5a0fb681 am 8f5714d3: am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit '8f5714d3e1f29c0ec761c3471a12d2f486bbaee3':
  docs: Card View for Android TV training
 2015-01-30 01:53:53 +00:00
Scott Rowe
9ad282fd73 am 2d1c5dc8: am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit '2d1c5dc8ef3dfa8e4eea25197b38b654d7e8cc9d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:53:48 +00:00
Rich Slogar
f4fa2acb22 am 6ccb72e6: am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit '6ccb72e685da6769d43545c21182ca44e039da3e':
  docs: linux requirements update
 2015-01-30 01:49:12 +00:00
Scott Rowe
8f5714d3e1 am a3031211: am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'a303121168f1e3cfe62f6836a38ba1a33f3e336d':
  docs: Card View for Android TV training
 2015-01-30 01:44:43 +00:00
Scott Rowe
2d1c5dc8ef am e4249f29: am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit 'e4249f29ea56f35aab1337323a0e55992ee9247f':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:44:39 +00:00
Rich Slogar
6ccb72e685 am e0063faa: Merge "docs: linux requirements update" into lmp-docs 
* commit 'e0063faa8707e2424a33625aaf2228540fa67e85':
  docs: linux requirements update
 2015-01-30 01:41:58 +00:00
Scott Rowe
a303121168 am b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs 
* commit 'b86c3b80db09da85b50c1809520bbf893cb83d93':
  docs: Card View for Android TV training
 2015-01-30 01:37:23 +00:00
Scott Rowe
e4249f29ea am 87a1bf09: docs: b/19193358 Android TV overscan instructions: settings reversed in text 
* commit '87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
  docs: b/19193358 Android TV overscan instructions: settings reversed in text
 2015-01-30 01:37:21 +00:00
Rich Slogar
e0063faa87 Merge "docs: linux requirements update" into lmp-docs 2015-01-30 01:32:18 +00:00
Scott Rowe
b86c3b80db Merge "docs: Card View for Android TV training" into lmp-docs 2015-01-30 01:30:44 +00:00
Alan Viverette
3e2ec1cc9c Avoid bug in LinearLayout measurement 
Reverts to Holo-style layout where the View divider masks the bug.
Uses a 0-height divider to avoid visual changes.

Bug: 19201079
Change-Id: Ib9e701815c57b23d5ba7173f8de553e90e27ed11
 2015-01-30 01:30:23 +00:00
Amit Mahajan
d492aa0820 am 45446c63: Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 
* commit '45446c632162eb61a213815363149175732de78d':
  Adding new API to ISms to check if default SMS SIM needs to be chosen by user.
 2015-01-30 00:56:35 +00:00
Amit Mahajan
45446c6321 Merge "Adding new API to ISms to check if default SMS SIM needs to be chosen by user." into lmp-mr1-dev 2015-01-30 00:52:50 +00:00