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

128103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
97dda08ec4 am 1f2966ea: am 8e6992fb: am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '1f2966ea2bd001adde9ee4773d97d1bb6007aa53':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:42:59 +00:00
Elliott Hughes
1f2966ea2b am 8e6992fb: am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '8e6992fb3ac986d3bbb93cd2d55d3e18eb03b3b5':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:40:39 +00:00
Elliott Hughes
8e6992fb3a am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '1ea1857de9c98199015f0188678a12a82a6248d4':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:37:18 +00:00
Elliott Hughes
1ea1857de9 am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '8cd319b84635454746803b0eed7e2626d7945a09':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:33:15 +00:00
Elliott Hughes
8cd319b846 Merge "Add additional languages to be accepted by the NumberPicker input filter" 2014-04-11 17:30:09 +00:00
Elliott Hughes
38caaf8824 am 988b38bc: am 5b7dccc4: am 90e2301e: am d2a11d97: Merge "Add explicit close of Scanner input" 
* commit '988b38bc812b12871ac7452a40d9d73273d126bc':
  Add explicit close of Scanner input
 2014-04-11 17:27:40 +00:00
Elliott Hughes
988b38bc81 am 5b7dccc4: am 90e2301e: am d2a11d97: Merge "Add explicit close of Scanner input" 
* commit '5b7dccc4f9cc1d07650cd7d1f499c3c11ba3ede2':
  Add explicit close of Scanner input
 2014-04-11 17:25:08 +00:00
Elliott Hughes
5b7dccc4f9 am 90e2301e: am d2a11d97: Merge "Add explicit close of Scanner input" 
* commit '90e2301e23532c92dd4c24394b7407e243389e9f':
  Add explicit close of Scanner input
 2014-04-11 17:21:20 +00:00
Elliott Hughes
90e2301e23 am d2a11d97: Merge "Add explicit close of Scanner input" 
* commit 'd2a11d97a94bed18629bded429f118f57f4f7821':
  Add explicit close of Scanner input
 2014-04-11 17:18:14 +00:00
Elliott Hughes
d2a11d97a9 Merge "Add explicit close of Scanner input" 2014-04-11 17:14:39 +00:00
Ricardo Cervera
b462bfe1a7 am dec50073: am 8490cc15: am 3d9a3b58: am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit 'dec50073c93dff71d6d6fb3a2f14969690f02b9d':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:24:18 +00:00
Ricardo Cervera
91aefa53a7 am 0504d2fa: am 80790fe0: am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit '0504d2fa94cfe757683b8a5b13a864adc33273c6':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:24:14 +00:00
Ricardo Cervera
dec50073c9 am 8490cc15: am 3d9a3b58: am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit '8490cc15e5b948162feafd808e3c94a3d13bac57':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:21:28 +00:00
Ricardo Cervera
0504d2fa94 am 80790fe0: am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit '80790fe0e71d6fb4b34a311062244d16d0d9c07a':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:21:22 +00:00
Ricardo Cervera
8490cc15e5 am 3d9a3b58: am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit '3d9a3b589af661f980a7c03f208915b54521639f':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:19:09 +00:00
Ricardo Cervera
80790fe0e7 am 7186228a: am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit '7186228ae8505c3222be81680811d00de9bbdb6d':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:19:06 +00:00
Ricardo Cervera
3d9a3b589a am 7abc67f4: am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit '7abc67f43fff9d2dc84d1bddfb3e5b3a04fbc30a':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:14:23 +00:00
Ricardo Cervera
7186228ae8 am d1f51fda: am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit 'd1f51fda68ee23aaa83db62b32ad2b65d7fb4320':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:14:17 +00:00
Ricardo Cervera
7abc67f43f am 2abf55ca: Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 
* commit '2abf55ca9b8a796ffb246538d319798dabedbec6':
  docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147
 2014-04-11 16:11:59 +00:00
Ricardo Cervera
d1f51fda68 am a765e782: Merge "docs: Added a document on debugging in Android Studio" into klp-docs 
* commit 'a765e78241970f212991056b09027ef4df818d95':
  docs: Added a document on debugging in Android Studio
 2014-04-11 16:11:56 +00:00
Ricardo Cervera
2abf55ca9b Merge "docs: Updated SDK installation instructions for Ubuntu. Bug: 13476147" into klp-docs 2014-04-11 16:07:48 +00:00
Ricardo Cervera
a765e78241 Merge "docs: Added a document on debugging in Android Studio" into klp-docs 2014-04-11 16:06:23 +00:00
Alexandra Gherghina
e6f35637e5 am 23d2dd3d: Merge "Add new call to DevicePolicyManager to enable a profile." 
* commit '23d2dd3da15b4312cc55c4d7b0bcf70719655e65':
  Add new call to DevicePolicyManager to enable a profile.
 2014-04-11 15:56:44 +00:00
Alexandra Gherghina
23d2dd3da1 Merge "Add new call to DevicePolicyManager to enable a profile." 2014-04-11 15:53:16 +00:00
Alexandra Gherghina
512675b07d Add new call to DevicePolicyManager to enable a profile. 
Bug: 13755091
Change-Id: Idb6975431f842ededf78966c578b0533e6f186af
 2014-04-11 16:51:49 +01:00
Jorim Jaggi
646a430468 Merge "Clean up log which made it accidentially into the build." into master-lockscreen-dev 2014-04-11 15:13:52 +00:00
Jorim Jaggi
84d2230f10 Clean up log which made it accidentially into the build. 
Change-Id: I404b3b3e2020c466cbdbacd8335895cd9693281a
 2014-04-11 15:13:39 +00:00
Brian Williammee
6352d3a1c7 am 7217f380: Correct some comments (LTE->CDMA) 
* commit '7217f3805819b6feca7ec1cc378a9ca56cf2d275':
  Correct some comments (LTE->CDMA)
 2014-04-11 14:26:43 +00:00
Brian Williammee
7217f38058 Correct some comments (LTE->CDMA) 
Change references to LTE in CellSignalStrengthCdma to CDMA.

Change-Id: I2c003746dcef84949af69e2fbd4e5db4906e1125
 2014-04-11 14:23:38 +00:00
Jorim Jaggi
b95f3b3907 Merge "Fix ugly black background when expanding/collapsing notifications." into master-lockscreen-dev 2014-04-11 14:09:32 +00:00
Jorim Jaggi
d274c46432 Fix ugly black background when expanding/collapsing notifications. 
Bug: 13635952
Change-Id: I7a0f434172db4583f904e6817d94ca12d3b117bc
 2014-04-11 16:07:44 +02:00
Przemyslaw Szczepaniak
99368f9481 am 39c82a3b: Merge "Remove "final" from TextToSpeechClient class." 
* commit '39c82a3b19788b100f52f24732560ef325c13133':
  Remove "final" from TextToSpeechClient class.
 2014-04-11 12:09:11 +00:00
Przemyslaw Szczepaniak
39c82a3b19 Merge "Remove "final" from TextToSpeechClient class." 2014-04-11 12:06:43 +00:00
Narayan Kamath
7caa77e3ab am 79d88d13: am 73e78c75: am af42a91c: Fix another build breakage. 
* commit '79d88d138c07835d349f7c74f380eaeb7cac8d0b':
  Fix another build breakage.
 2014-04-11 11:41:42 +00:00
Narayan Kamath
79d88d138c am 73e78c75: am af42a91c: Fix another build breakage. 
* commit '73e78c75b770b3af0d48acac9c8565f7b4d035ff':
  Fix another build breakage.
 2014-04-11 11:37:40 +00:00
Narayan Kamath
73e78c75b7 am af42a91c: Fix another build breakage. 
* commit 'af42a91c118941d463b474574bf34bf05822350d':
  Fix another build breakage.
 2014-04-11 11:35:19 +00:00
Narayan Kamath
af42a91c11 Fix another build breakage. 
Caused by 037c33eae74bee2774897d969d48947f9abe254f, which
was submitted without a checkbuild.

Change-Id: I0d48f6b941cc98a30904cdfbd7bcb56ed509734e
 2014-04-11 11:31:07 +00:00
Narayan Kamath
70ef7810a4 am 629f7668: am 80edaa67: am 24c089a8: Fix build. 
* commit '629f76682729a63c0e3d29f836c3c69c6fdb4c77':
  Fix build.
 2014-04-11 10:59:57 +00:00
Narayan Kamath
629f766827 am 80edaa67: am 24c089a8: Fix build. 
* commit '80edaa676bd59409f8a82e12c035bee96e653004':
  Fix build.
 2014-04-11 10:57:28 +00:00
Narayan Kamath
80edaa676b am 24c089a8: Fix build. 
* commit '24c089a8b5871b331441d0858aa164364b7737cb':
  Fix build.
 2014-04-11 10:54:20 +00:00
Narayan Kamath
24c089a8b5 Fix build. 
isScreenOn was changed to isInteractive.

Change-Id: I381d0b0ca745b61e64ac6309c2a6307696f52be0
 2014-04-11 10:50:43 +00:00
Narayan Kamath
785f44a4dc am 26ad3af7: am c3255ae0: am de442781: am 909a6a0e: Merge "Dual zygote cleanup." 
* commit '26ad3af74d4b8a6f960de7a4370684a987551f6d':
  Dual zygote cleanup.
 2014-04-11 10:06:29 +00:00
Narayan Kamath
26ad3af74d am c3255ae0: am de442781: am 909a6a0e: Merge "Dual zygote cleanup." 
* commit 'c3255ae04c8bec36f6701b92bf645323558e23c1':
  Dual zygote cleanup.
 2014-04-11 10:02:17 +00:00
Narayan Kamath
c3255ae04c am de442781: am 909a6a0e: Merge "Dual zygote cleanup." 
* commit 'de442781cd4f7404e8aaa3f7ca5d1d3fc28cccc6':
  Dual zygote cleanup.
 2014-04-11 09:57:27 +00:00
Jinsuk Kim
aa77b11bdb am 4bdcd299: am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit '4bdcd299da48f9abe5f9c67abed0dbe79080445d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:47:11 +00:00
Jinsuk Kim
4bdcd299da am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit '55dab4dd3b5b56ade91c012d688b581b6cbdebdf':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:43:37 +00:00
Jinsuk Kim
55dab4dd3b am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit 'b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:40:46 +00:00
Mikhail Naganov
a0c7d3545d am b429088c: Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat." 
* commit 'b429088cbb12a226fd217f04870d16bbd833ed06':
  Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat.
 2014-04-11 09:39:54 +00:00
Jinsuk Kim
b11f250e09 Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 2014-04-11 09:38:23 +00:00
Mikhail Naganov
b429088cbb Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat." 2014-04-11 09:36:39 +00:00