Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,078 Commits 3 Branches 0 Tags
44e203a6bf2c4b08277c05166fe2fa7f84950be0
Commit Graph

164078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clay Murphy
44e203a6bf am ef20147e: Merge branch \'lmp-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev 
automerge: 3b3b378

* commit '3b3b378d93bf57db79f0f3b77f79ee201719e9d2':
  Remove SystemApi annotations.
 2014-10-24 02:00:08 +00:00
Luan Nguyen
fd5e2e56f1 am bc3b3439: am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
automerge: c89b2ad

* commit 'c89b2ade48144901baf8b1d268a4adc1a02dab53':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-24 01:58:57 +00:00
Clay Murphy
3b3b378d93 am ef20147e: Merge branch \'lmp-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev 
* commit 'ef20147e2ba03c1532301f31027705f4a08e6b87':
  Remove SystemApi annotations.
 2014-10-23 23:02:56 +00:00
Luan Nguyen
c89b2ade48 am bc3b3439: am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit 'bc3b3439010128cfd422d6ab9c96a95042cee254':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 23:02:52 +00:00
Clay Murphy
ef20147e2b Merge branch 'lmp-mr1-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev 2014-10-23 22:58:41 +00:00
Santos Cordon
db7fc1e833 Merge "Remove SystemApi annotations." into lmp-mr1-dev 2014-10-23 22:58:29 +00:00
Luan Nguyen
bc3b343901 am fd73db22: am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit 'fd73db22570bb1bf87b2f32685a31b4c295c848d':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 22:58:28 +00:00
Luan Nguyen
fd73db2257 am 578210db: Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 
* commit '578210db199f41dc7c14e53ba925956de835f3c0':
  docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution.
 2014-10-23 22:51:09 +00:00
Luan Nguyen
578210db19 Merge "docs: Update thumbnail images for resources, update minor text for WR-GS, and update the title image resolution." into lmp-dev 2014-10-23 22:45:03 +00:00
Nancy Chen
225ace3b2b am 1c3553b5: am c1d001c3: Merge "Fix build breakage because missing API methods." into lmp-mr1-dev 
* commit '1c3553b57f455665deb32c328298ab70152410e8':
  Fix build breakage because missing API methods.
 2014-10-23 22:40:38 +00:00
Nancy Chen
1c3553b57f am c1d001c3: Merge "Fix build breakage because missing API methods." into lmp-mr1-dev 
* commit 'c1d001c3349e02fda7a23d93e101dff8c77441bf':
  Fix build breakage because missing API methods.
 2014-10-23 22:35:01 +00:00
Nancy Chen
c1d001c334 Merge "Fix build breakage because missing API methods." into lmp-mr1-dev 2014-10-23 22:27:27 +00:00
Trevor Johns
2cf2406d98 am 86272c9c: am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '86272c9c9c7bb0603cf1626b01f55ac4d94047dd':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:24:07 +00:00
Trevor Johns
86272c9c9c am 4c24abe9: am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '4c24abe9489d35b965161b5375fbc6b8ace819b2':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:16:09 +00:00
John Reck
b64e4372bb am 82572cc4: am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 
* commit '82572cc458053e8cec292a708e18d0de7cfbead2':
  Add some free zoom to lockHardwareCanvas
 2014-10-23 22:15:46 +00:00
Trevor Johns
4c24abe948 am 2988436b: am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit '2988436b65d5fbabff8a6b9cb7c9b56dcd31b84a':
  Docs: Add TOC page for Wearable samples
 2014-10-23 22:05:49 +00:00
John Reck
82572cc458 am badac04d: Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'badac04dfd445a1fd3e3ecea04815e83fad5226c':
  Add some free zoom to lockHardwareCanvas
 2014-10-23 22:05:40 +00:00
George Mount
890f20e8e8 am 039cc060: am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 
* commit '039cc060493a88a603cc8f3224a9ac2fa31908be':
  Protect against ImageView changing to a null Drawable during Transition.
 2014-10-23 22:04:28 +00:00
Yigit Boyar
ab43570f5d am f3ab4410: am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'f3ab441090a05bd428b9488b2e8e175f33bd6fe9':
  Added a generic configuration and theme based cache
 2014-10-23 22:04:11 +00:00
John Reck
35447aeabd am fed6f4ef: am aca6ccf4: Merge "Improve documentation" into lmp-mr1-dev 
* commit 'fed6f4ef2310ab3ec33d439702ea47f9b623795a':
  Improve documentation
 2014-10-23 22:04:01 +00:00
Legler Wu
b8b65586ef am d9afc9c5: am 2b0a2ad3: am c11a944a: [DS] Change the copyright 
* commit 'd9afc9c5361406bf3eae91f168af24a415d9b111':
  [DS] Change the copyright
 2014-10-23 22:03:53 +00:00
Alan Viverette
cccea2b976 am 265f8106: am 4ad964d9: Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 
* commit '265f8106c374ce72284e86a5bb6df4514d320d51':
  Swap names for clock delegates so they are correct
 2014-10-23 22:03:43 +00:00
George Mount
b5742f997d am 941252d3: am 523a129c: Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 
* commit '941252d3f002bbace92212e4f6340980984ce3ae':
  Use one method to change bounds in ChangeBounds.
 2014-10-23 22:03:38 +00:00
Etan Cohen
cf565e6235 am 926ff714: am fad9dd3a: Uniform configurations for all T-Mobile MCC/MNCs: VoLTE & MTU size. 
* commit '926ff714b795ec101537f87dd151acda07478cf0':
  Uniform configurations for all T-Mobile MCC/MNCs: VoLTE & MTU size.
 2014-10-23 22:03:07 +00:00
Pavel Zhamaitsiak
34e4dc4b09 am b01a5979: am c8a09d54: Merge "Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT." into lmp-mr1-dev 
* commit 'b01a597924ab7afed689f7710c264684d1fac944':
  Separate VoLTE and VT configurations to enable devices/carriers to have VoLTE without VT.
 2014-10-23 22:02:59 +00:00
Nancy Chen
968c16ce6d am 12be45d7: am 9016ecab: am 0145e17d: Merge "Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount." into lmp-sprout-dev 
* commit '12be45d7c48bf3c0722a794bb44c37b7264e7244':
  Add getter methods in SubInfoRecord for UI. Adapt PhoneAccount.
 2014-10-23 22:02:54 +00:00
Filip Gruszczynski
2c90a0282b am 2e052429: am b977ade1: am 625ec484: Check if context is actually an activity. 
* commit '2e052429d04c11b69b3b3ac85a6344bd3687a0dc':
  Check if context is actually an activity.
 2014-10-23 22:02:48 +00:00
Ricardo Cervera
8ead5df0c3 am 9c36848d: am 713869b2: am ce3d72e4: am 8755d9a5: Merge "docs: Updating dependency vers nums for support libs." into lmp-dev 
* commit '9c36848da68cfe6c70b799c6b1db1266a86577f4':
  docs: Updating dependency vers nums for support libs.
 2014-10-23 22:02:43 +00:00
Ricardo Cervera
b2a6784aa7 am 96e4f75c: am 0dc82921: am 92ddea18: am 30d0b242: Merge "docs: Support lib dependency fix. Bug: 18029377" into lmp-dev 
* commit '96e4f75c160bf61de7d7c44b60838c252bbf9530':
  docs: Support lib dependency fix. Bug: 18029377
 2014-10-23 22:02:37 +00:00
Sreeram Ramachandran
4573944e96 am b9248a55: am b1df48e4: Merge "Add an API to select a network for a DatagramSocket." into lmp-mr1-dev 
* commit 'b9248a5552dde8bf76db77054ed31a59300fe0cd':
  Add an API to select a network for a DatagramSocket.
 2014-10-23 22:02:25 +00:00
John Reck
badac04dfd Merge "Add some free zoom to lockHardwareCanvas" into lmp-mr1-dev 2014-10-23 21:59:26 +00:00
Adam Lesinski
08d1c80847 Merge commit 'cd8442d4' into manualmerge 
Conflicts:
	tools/aapt/ResourceIdCache.cpp

Change-Id: I5341d47ed0fe891d6fefb174f644e636ce966eb8
 2014-10-23 14:55:57 -07:00
Trevor Johns
2988436b65 am fb28bd15: Merge "Docs: Add TOC page for Wearable samples" into lmp-dev 
* commit 'fb28bd158dd387225bb55e31da60101436e7b13c':
  Docs: Add TOC page for Wearable samples
 2014-10-23 21:52:47 +00:00
George Mount
039cc06049 am 82fd8428: Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 
* commit '82fd842827fcdb3570d0c606bd049f42bf2b3fba':
  Protect against ImageView changing to a null Drawable during Transition.
 2014-10-23 21:52:13 +00:00
George Mount
82fd842827 Merge "Protect against ImageView changing to a null Drawable during Transition." into lmp-mr1-dev 2014-10-23 21:46:54 +00:00
Nancy Chen
5fc3863655 Fix build breakage because missing API methods. 
Add new API methods for PhoneAccount. This is because PhoneAccount
recently became public in mr1, but not in sprout.

Bug: 18078388
Change-Id: I0c74d13fa4eb274be499158c19891a5bc6c66464
 2014-10-23 14:37:36 -07:00
Yigit Boyar
f3ab441090 am fa9ed8ca: Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 
* commit 'fa9ed8ca0a08be0b32b2ccc33563a47df1f6d3da':
  Added a generic configuration and theme based cache
 2014-10-23 21:16:06 +00:00
Yigit Boyar
fa9ed8ca0a Merge "Added a generic configuration and theme based cache" into lmp-mr1-dev 2014-10-23 21:06:24 +00:00
John Reck
fed6f4ef23 am aca6ccf4: Merge "Improve documentation" into lmp-mr1-dev 
* commit 'aca6ccf403a4b861419fae1be64500e3df3a81f7':
  Improve documentation
 2014-10-23 21:04:20 +00:00
Legler Wu
d9afc9c536 am 2b0a2ad3: am c11a944a: [DS] Change the copyright 
* commit '2b0a2ad3a3f15def063693b913160c35b376df47':
  [DS] Change the copyright
 2014-10-23 21:04:16 +00:00
John Reck
aca6ccf403 Merge "Improve documentation" into lmp-mr1-dev 2014-10-23 21:00:45 +00:00
John Reck
1125d1fa92 Add some free zoom to lockHardwareCanvas 
Bug: 18099195

Don't use EGL_SWAP_BUFFER_PRESERVED on surfaces that will
never benefit. Also clean up some confusing naming

Change-Id: I674ca64e0464a3282cff79e5ecd350d08f47c014
 2014-10-23 13:59:47 -07:00
John Reck
43a5328c83 Improve documentation 
Bug: 17440886

Change-Id: I3f5c0dab6e08c0097fe60eb269e7fffe7b48b563
 2014-10-23 13:58:34 -07:00
Legler Wu
2b0a2ad3a3 am c11a944a: [DS] Change the copyright 
* commit 'c11a944a572719fa04f467fc5f5761a8abc9630b':
  [DS] Change the copyright
 2014-10-23 20:56:46 +00:00
Alan Viverette
265f8106c3 am 4ad964d9: Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 
* commit '4ad964d98d058d4569925479e1314463b6a8c329':
  Swap names for clock delegates so they are correct
 2014-10-23 20:55:25 +00:00
George Mount
941252d3f0 am 523a129c: Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 
* commit '523a129ced08a41468f3d52cf16ebb237f280e39':
  Use one method to change bounds in ChangeBounds.
 2014-10-23 20:55:15 +00:00
Alan Viverette
4ad964d98d Merge "Swap names for clock delegates so they are correct" into lmp-mr1-dev 2014-10-23 20:52:23 +00:00
George Mount
523a129ced Merge "Use one method to change bounds in ChangeBounds." into lmp-mr1-dev 2014-10-23 20:52:13 +00:00
John Reck
41707d01e9 am ebcfd24b: am 68335df6: Merge "Fix damage bug" into lmp-mr1-dev 
* commit 'ebcfd24b8f1fc8e000a08c0bbce3a4215083ae8a':
  Fix damage bug
 2014-10-23 20:41:07 +00:00
Etan Cohen
926ff714b7 am fad9dd3a: Uniform configurations for all T-Mobile MCC/MNCs: VoLTE & MTU size. 
* commit 'fad9dd3a382642141455a4e92cd10e64f886f9a3':
  Uniform configurations for all T-Mobile MCC/MNCs: VoLTE & MTU size.
 2014-10-23 20:35:47 +00:00