Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
168,999 Commits 3 Branches 0 Tags
f532871ec4cecd63e760706fbb8871bc1c65583b
Commit Graph

168999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yigit Boyar
f532871ec4 am 1bbaeaa4: am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit '1bbaeaa4b5bab1a1eebb1e901292799c58fc5fe2':
  Improve GridLayout's weight calculations
 2014-11-21 21:00:04 +00:00
Yigit Boyar
1bbaeaa4b5 am ace33655: Merge "Improve GridLayout\'s weight calculations" into lmp-mr1-dev 
* commit 'ace33655bff514698b322253c211f0af5a3edd37':
  Improve GridLayout's weight calculations
 2014-11-21 20:55:19 +00:00
Alan Viverette
d7c5acdf1c am e606a788: am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit 'e606a7884dff4acc926cb82bf6492e83e9a1d3af':
  Fix error overwriting when restoring error
 2014-11-21 20:49:11 +00:00
Alan Viverette
47379f3050 am e442e904: am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit 'e442e904ae19f0b59ebfd4a7c735648b64bc955e':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:49:04 +00:00
Yigit Boyar
ace33655bf Merge "Improve GridLayout's weight calculations" into lmp-mr1-dev 2014-11-21 20:48:45 +00:00
Alan Viverette
e606a7884d am 0218970a: Merge "Fix error overwriting when restoring error" 
* commit '0218970afaeefcabf7ed4b476cb93f28d61847b8':
  Fix error overwriting when restoring error
 2014-11-21 20:45:15 +00:00
Alan Viverette
e442e904ae am 47172f53: Merge "Use parseColor instead of getHTMLColor" 
* commit '47172f53659e4e98988dab99a4155653b638b1e5':
  Use parseColor instead of getHTMLColor
 2014-11-21 20:45:09 +00:00
Alan Viverette
0218970afa Merge "Fix error overwriting when restoring error" 2014-11-21 20:40:30 +00:00
Alan Viverette
47172f5365 Merge "Use parseColor instead of getHTMLColor" 2014-11-21 20:40:08 +00:00
Bryce Lee
296ea91742 am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'deee5566417af229a142cf8c1964e98a356513e4':
  Make default windows features configurable.
 2014-11-21 19:27:55 +00:00
Bryce Lee
deee556641 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.
 2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00
Jim Miller
879a4ee8b0 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev automerge: 0284e5e 
automerge: eab3240

* commit 'eab3240c78423e791a7f36864f55f94c25a5aba5':
  Add multi-sim support to keyguard
 2014-11-21 18:55:36 +00:00
Jim Miller
eab3240c78 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 
automerge: 0284e5e

* commit '0284e5e49864a6e039d77210bbea0a013b0e23ec':
  Add multi-sim support to keyguard
 2014-11-21 18:53:10 +00:00
Jim Miller
0284e5e498 Merge "Add multi-sim support to keyguard" into lmp-mr1-dev 2014-11-21 18:38:03 +00:00
Andreas Gampe
7d13d9db1e resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp 
Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
 2014-11-21 10:36:14 -08:00
Andreas Gampe
3fc5e3cabf am 2c596a53: Merge "Frameworks/base: Consistency in core/jni" 
* commit '2c596a533488320444e28bbe37b7032589a0c5dd':
  Frameworks/base: Consistency in core/jni
 2014-11-21 18:22:36 +00:00
Andreas Gampe
2c596a5334 Merge "Frameworks/base: Consistency in core/jni" 2014-11-21 18:18:36 +00:00
Andreas Gampe
ed6b9dff56 Frameworks/base: Consistency in core/jni 
Make consistent use of core_jni_helpers for registration.

Translate some #ifdefs into const bools.

Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
 2014-11-21 10:15:08 -08:00
Andreas Gampe
935fd8d0b1 Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 2014-11-21 18:08:12 +00:00
Adrian Roos
034b9092fb am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
automerge: 0108d98

* commit '0108d9836971d9f40bf7856d1858ecc4b153e511':
  Explicitly specify user for public mode
 2014-11-21 18:04:23 +00:00
Adrian Roos
0108d98369 am 26750711: Merge "Explicitly specify user for public mode" into lmp-mr1-dev 
* commit '26750711e12900aca6c7c35556b4548038cfb505':
  Explicitly specify user for public mode
 2014-11-21 18:02:26 +00:00
Rubin Xu
83f2f47950 am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit '55a05e4d35c0886733586db0d5aa1af5030d35a7':
  String literals for CL ag/586597
 2014-11-21 17:59:49 +00:00
Andreas Gampe
307218c7f2 resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp 
Change-Id: I4b47723a9314bf9bef08e68ce269038d0d50c5d9
 2014-11-21 09:57:52 -08:00
Adrian Roos
26750711e1 Merge "Explicitly specify user for public mode" into lmp-mr1-dev 2014-11-21 17:57:01 +00:00
Ruben Brunk
2847eb7324 am a345b367: am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit 'a345b3671a8e2d1a91ccb594f219303d3e1f135f':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:55:19 +00:00
Rubin Xu
55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597
 2014-11-21 17:54:26 +00:00
Rubin Xu
b90a2f9d1a Merge "String literals for CL ag/586597" into lmp-mr1-dev 2014-11-21 17:50:23 +00:00
Ruben Brunk
a345b3671a am 5d3d53aa: Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 
* commit '5d3d53aa1361c094f05aa70129e49a04875ab5a6':
  Camera2: Doc updates for aeExposureCompensation.
 2014-11-21 17:49:34 +00:00
Andreas Gampe
55dbf00fd8 am 0da1cbaa: am e042791e: Merge "Frameworks/base: Remove unused header" 
* commit '0da1cbaaabbe85e140dabf3fa2b289431c9d3910':
  Frameworks/base: Remove unused header
 2014-11-21 17:47:57 +00:00
Ruben Brunk
5d3d53aa13 Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev 2014-11-21 17:42:44 +00:00
Andreas Gampe
09910723c5 am ed368be7: Merge "Frameworks/base: Wall Werror in media/tests" 
* commit 'ed368be79248d8e0a71c383b2ed6eb93b451810e':
  Frameworks/base: Wall Werror in media/tests
 2014-11-21 17:41:31 +00:00
Andreas Gampe
0da1cbaaab am e042791e: Merge "Frameworks/base: Remove unused header" 
* commit 'e042791e753d35d7fd60f0a9a2b5764dc8d9afac':
  Frameworks/base: Remove unused header
 2014-11-21 17:41:25 +00:00
Andreas Gampe
ed368be792 Merge "Frameworks/base: Wall Werror in media/tests" 2014-11-21 17:39:33 +00:00
Andreas Gampe
e042791e75 Merge "Frameworks/base: Remove unused header" 2014-11-21 17:38:07 +00:00
Rubin Xu
7f9e014b00 String literals for CL ag/586597 
Mini-CL to get the strings in for translations.

Bug: 17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
 2014-11-21 17:04:11 +00:00
Zoltan Szatmary-Ban
5c374a582c am b3d0580f: am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit 'b3d0580f0fa126c258c54e8007ea8d51ed12810f':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:28:20 +00:00
Zoltan Szatmary-Ban
99d983b086 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
automerge: b3e8ff0

* commit 'b3e8ff00c85f37686a45597636d546a5e2a32c26':
  Adding method to query backup manager service activity status
 2014-11-21 15:26:51 +00:00
Zoltan Szatmary-Ban
b3d0580f0f am 08229e81: Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 
* commit '08229e817ecb67b0c7ebbd6b5b9ce4aef1b38cc2':
  Shutdown backup manager service when device owner is set
 2014-11-21 15:24:39 +00:00
Zoltan Szatmary-Ban
b3e8ff00c8 am 07334334: Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 
* commit '07334334aab3863408325653ceccee47f9e1788d':
  Adding method to query backup manager service activity status
 2014-11-21 15:24:33 +00:00
Zoltan Szatmary-Ban
08229e817e Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev 2014-11-21 15:21:07 +00:00
Zoltan Szatmary-Ban
07334334aa Merge "Adding method to query backup manager service activity status" into lmp-mr1-dev 2014-11-21 15:20:47 +00:00
Adrian Roos
31b844ba0c Explicitly specify user for public mode 
Bug: 18417850
Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
 2014-11-21 13:55:09 +01:00
Paul Jensen
416a0b1cc9 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
automerge: 934b73f

* commit '934b73fb50afd4280a1b6a509376ca86424fa7b2':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:50:35 +00:00
Paul Jensen
934b73fb50 am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev 
* commit '0653f508b58eab994089ae2da783852a5c1b4a8a':
  Don't allow an uncreated Network to satsify requests.
 2014-11-21 12:47:23 +00:00
Paul Jensen
0653f508b5 Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev 2014-11-21 12:42:34 +00:00
Geoffrey Borggaard
e400f811f2 am 8a2ac41d: am e548c3a3: am c3f5d718: Merge "Fix null handling in proxies." into lmp-dev automerge: 90ed95f 
* commit '8a2ac41dcfa0ec10c09a7599d9345798c21cd47d':
  Fix null handling in proxies.
 2014-11-21 10:31:03 +00:00
Ricardo Cervera
0b3963e358 am d9e6f658: am 462b3201: am e9b5dfc0: am 25bf00bc: docs: Fixes to the Data Layer Wear class. automerge: 8837ce2 
* commit 'd9e6f658a5bf3e5356a433f275bf2a60921b5a6c':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:26:43 +00:00
Ricardo Cervera
bc250401fe am d4ea7b3c: am 9aede602: am c8543b4f: Merge "docs: Fixes to the Data Layer Wear class." into lmp-dev automerge: 161dce4 
* commit 'd4ea7b3cb626dbd807fed9477c50726fb7dd38a2':
  docs: Fixes to the Data Layer Wear class.
 2014-11-21 10:26:37 +00:00