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

165532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
2777d4b713 am 043c4b35: am 51ec33bb: am 2298938c: Merge "More test cases from UX team for AVD." into lmp-mr1-dev 
* commit '043c4b35026a733058d01e159fa3c9259a16e766':
  More test cases from UX team for AVD.
 2014-10-02 12:52:16 +00:00
Andreas Gampe
5a76866317 am 5e77475b: am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '5e77475b5d1de1fecbaf5b3e27988a255a3c399e':
  Frameworks/base: Fix more aapt issues
 2014-10-02 12:38:28 +00:00
ztenghui
043c4b3502 am 51ec33bb: am 2298938c: Merge "More test cases from UX team for AVD." into lmp-mr1-dev 
* commit '51ec33bbdf6aa533ae4c1e5f0407e8a10e3d212f':
  More test cases from UX team for AVD.
 2014-10-02 12:37:51 +00:00
Andreas Gampe
5e77475b5d am 152d9aae: am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '152d9aae631381ea28f5701168d372a1486a7502':
  Frameworks/base: Fix more aapt issues
 2014-10-02 12:31:16 +00:00
Andreas Gampe
152d9aae63 am 31629651: Merge "Frameworks/base: Fix more aapt issues" 
* commit '316296511bf12c4e14dfb6f54731d1a515114abf':
  Frameworks/base: Fix more aapt issues
 2014-10-02 07:01:55 +00:00
Andreas Gampe
316296511b Merge "Frameworks/base: Fix more aapt issues" 2014-10-02 06:58:39 +00:00
Andreas Gampe
054262cbca am 87332a71: resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp 
* commit '87332a7109610d02ac7f5db6af99d3a11813d5c1':
  Frameworks/base: Fix AAPT warnings
 2014-10-02 06:33:22 +00:00
Andreas Gampe
87332a7109 resolved conflicts for merge of 1dcc75b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f7cbd971beae3ab134195e612d705860665142f
 2014-10-01 23:26:06 -07:00
Andreas Gampe
b8dc7bc582 Frameworks/base: Fix more aapt issues 
Change-Id: I6da7dc674e9f9e3b0886a3cfd1e3194d6b5ac948
 2014-10-01 20:42:00 -07:00
Craig Mautner
ce324a2da7 am bee6dfe0: am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit 'bee6dfe09d4381f9ddf666fd04012c662f31e7fd':
  Don't clear visible-behind activity if it is top
 2014-10-02 02:00:41 +00:00
Selim Cinek
e87d01ab23 am 6ebab792: am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '6ebab792d29d4a9d25a703c57b861e41dc8ee8df':
  Adapting translation length for a string in a dialog
 2014-10-02 02:00:37 +00:00
Baligh Uddin
65d0198208 am 8c95b359: (-s ours) am 940d3dd0: (-s ours) am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '8c95b359da9a5d231c8dd8750f75b1d75d122aae':
  Import translations. DO NOT MERGE
 2014-10-02 02:00:33 +00:00
John Spurlock
514be317c5 am b3a90ee2: am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit 'b3a90ee245a2a25d0be8fce5549c84f848b5a8e1':
  Zen: Fix new event category check.
 2014-10-02 02:00:27 +00:00
Baligh Uddin
1b0e8eba62 am 5729f6c0: (-s ours) am 861978f7: (-s ours) am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5729f6c0ded4a37a4cbe72309e99fec0cf05ba2e':
  Import translations. DO NOT MERGE
 2014-10-02 02:00:22 +00:00
Craig Mautner
bee6dfe09d am 8a33674b: am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '8a33674bed6791c63eee9d798693e25bc07b7cba':
  Don't clear visible-behind activity if it is top
 2014-10-02 00:58:50 +00:00
Selim Cinek
6ebab792d2 am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '1e5e35ef626d2a73cf823e75fcbb67af3398b1ff':
  Adapting translation length for a string in a dialog
 2014-10-02 00:58:46 +00:00
Baligh Uddin
8c95b359da am 940d3dd0: (-s ours) am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '940d3dd05554db4627f0704be4f73fb1a27ce479':
  Import translations. DO NOT MERGE
 2014-10-02 00:58:42 +00:00
John Spurlock
b3a90ee245 am 7e67011f: am 394f29e7: am cd98a559: am c909e1b2: Zen: Fix new event category check. 
* commit '7e67011f15dd3c7df3200358d950cf4e4429db2c':
  Zen: Fix new event category check.
 2014-10-02 00:58:36 +00:00
Baligh Uddin
5729f6c0de am 861978f7: (-s ours) am b8cbdcb6: (-s ours) am 4aa820ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '861978f7de8b95010fecfb76b15f1d81f4f5c3a8':
  Import translations. DO NOT MERGE
 2014-10-02 00:58:32 +00:00
Andreas Gampe
1dcc75b2db am 0ce259c2: Merge "Frameworks/base: Fix AAPT warnings" 
* commit '0ce259c2f69cefd09342a95fbbd4c1a63a0af484':
  Frameworks/base: Fix AAPT warnings
 2014-10-01 23:38:25 +00:00
Andreas Gampe
0ce259c2f6 Merge "Frameworks/base: Fix AAPT warnings" 2014-10-01 23:34:31 +00:00
Andreas Gampe
2412f84064 Frameworks/base: Fix AAPT warnings 
Turn on -Wall -Werror. Fix warnings.

Change-Id: I287fb3c1e851c654479bcf9ea8c73bd354a6b2a1
 2014-10-01 16:18:06 -07:00
Baligh Uddin
629cf7282e am 3f8c8b25: (-s ours) am 5dcb2211: (-s ours) am e575c819: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '3f8c8b250ed03b631b5e4883bdd88881c455c5d8':
  Import translations. DO NOT MERGE
 2014-10-01 22:13:32 +00:00
Narayan Kamath
89f3665dac am 17044459: am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '170444599ce44b3b427267a190bed79d9afb709d':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:13:28 +00:00
Baligh Uddin
17be0ea518 am f9c28899: (-s ours) am eb68a1f0: (-s ours) am 576e8450: (-s ours) am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f9c288995d22117ff023b7e7e9417c04cc2563e2':
  Import translations. DO NOT MERGE
 2014-10-01 22:13:24 +00:00
Brian Carlstrom
42b611ed53 am 37fdb6e9: am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit '37fdb6e981d7dabf461458042bf837a6da2f0007':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:13:20 +00:00
Ricardo Cervera
fa471e94bf am 5720328d: am f2bf62c1: am d7b45dd7: am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '5720328d41a936cc05697d28cfa3648c28093e3c':
  docs: ADT beginner text fix
 2014-10-01 22:13:16 +00:00
Jeff Brown
716a6e9339 am 7ee1f53d: am 5a3f98aa: am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '7ee1f53d3d90f219fe59615e4e9b2551fdac10c7':
  Reduce latency from doze to screen on.
 2014-10-01 22:13:12 +00:00
Sungsoo Lim
92932a45ef am 52ecadbf: am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit '52ecadbf8c50838c31807a1581faaf8ae5b10fd3':
  Update java doc for content rating systems
 2014-10-01 22:13:06 +00:00
Jerome Poichet
4df8a1e369 am c2ece422: am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit 'c2ece4228d64a5621bdadc042d3182af89141f8c':
  Make sure cancel is called on tear down.
 2014-10-01 22:13:02 +00:00
Dianne Hackborn
655adb8ad4 am 923b627a: am c8d5d614: am d0ab6d6d: am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit '923b627a6c69dfa99061c4c2669570ffe3a248b8':
 2014-10-01 22:12:58 +00:00
Baligh Uddin
3f8c8b250e am 5dcb2211: (-s ours) am e575c819: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '5dcb221100a9f95724b43ab0657fceb64fcf337b':
  Import translations. DO NOT MERGE
 2014-10-01 22:02:48 +00:00
Narayan Kamath
170444599c am 870c3553: am 13705ca9: am d480147f: am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '870c3553f15d9d085bb30b063563143c2fd09322':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:02:44 +00:00
Baligh Uddin
f9c288995d am eb68a1f0: (-s ours) am 576e8450: (-s ours) am eb1618cf: (-s ours) am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'eb68a1f0266403c48215e9aa72bddfac8afd8a87':
  Import translations. DO NOT MERGE
 2014-10-01 22:02:40 +00:00
Brian Carlstrom
37fdb6e981 am b3ab7b95: am c9e46543: am ae214fac: am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit 'b3ab7b95a687e4de13d06822fb295ee726b4b42f':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:02:36 +00:00
Ricardo Cervera
5720328d41 am f2bf62c1: am d7b45dd7: am 3cf53caf: am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'f2bf62c1c2d9d65944d2e3e26e6f7b35fa797ae4':
  docs: ADT beginner text fix
 2014-10-01 22:02:28 +00:00
Jeff Brown
7ee1f53d3d am 5a3f98aa: am f0245cb2: am 69073040: am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '5a3f98aa8aafc16f6a8c3a4e5a813f7459a7cd92':
  Reduce latency from doze to screen on.
 2014-10-01 22:02:24 +00:00
Sungsoo Lim
52ecadbf8c am a381976b: am d5504e04: am e4495131: am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'a381976b7b6185782e4e1ea5472130266bee028d':
  Update java doc for content rating systems
 2014-10-01 22:02:20 +00:00
Jerome Poichet
c2ece4228d am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '87ed04832c7562260c3a87506286d63b137daee1':
  Make sure cancel is called on tear down.
 2014-10-01 22:02:16 +00:00
Dianne Hackborn
923b627a6c am c8d5d614: am d0ab6d6d: am 88998f79: am 62321ab1: Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 
* commit 'c8d5d614fbb1d36dc7d2da07564cdca77f8158f9':
 2014-10-01 22:02:15 +00:00
Wink Saville
65141ae879 am 5bfbb334: Merge "Merge commit \'62321ab1\' into fix-merge-conflict" into lmp-mr1-dev-plus-aosp 
* commit '5bfbb334ae50cc6b41d4620d6cb2c48700588bbd':
  Maybe fix issue #17700474: manta: high occurrence of device booted...
 2014-10-01 21:38:51 +00:00
Wink Saville
5bfbb334ae Merge "Merge commit '62321ab1' into fix-merge-conflict" into lmp-mr1-dev-plus-aosp 2014-10-01 21:35:28 +00:00
ztenghui
51ec33bbdf am 2298938c: Merge "More test cases from UX team for AVD." into lmp-mr1-dev 
* commit '2298938cef8d5aa2211ef08e27553354918e5554':
  More test cases from UX team for AVD.
 2014-10-01 21:14:52 +00:00
Wink Saville
ed49288a00 Merge commit '62321ab1' into fix-merge-conflict 
* commit '62321ab1':
  Maybe fix issue #17700474: manta: high occurrence of device booted...

Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: Ica4d544d11c1f81be793bdb4dea610396b32e946
 2014-10-01 14:14:10 -07:00
ztenghui
2298938cef Merge "More test cases from UX team for AVD." into lmp-mr1-dev 2014-10-01 21:10:57 +00:00
Dan Albert
6f5b091d09 am 47c23a22: resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp 
* commit '47c23a228deb2fa2e7158c58fc42441e8517ea38':
  Use std::sort instead of qsort_r wrapper.
 2014-10-01 20:58:10 +00:00
Dan Albert
47c23a228d resolved conflicts for merge of fe50cfd5 to lmp-mr1-dev-plus-aosp 
Change-Id: Id09c2786db18fa7e747cd1652ea95f575c3f5c46
 2014-10-01 13:52:49 -07:00
Dan Albert
fe50cfd533 am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper." 
* commit 'c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
  Use std::sort instead of qsort_r wrapper.
 2014-10-01 20:34:15 +00:00
Dan Albert
c46dbe8ac4 Merge "Use std::sort instead of qsort_r wrapper." 2014-10-01 20:30:52 +00:00
Craig Mautner
8a33674bed am 3867e4d0: am 9ab8fbbc: am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '3867e4d0c08ad74ee16dfde70e81c77f09e0e0ff':
  Don't clear visible-behind activity if it is top
 2014-10-01 18:57:26 +00:00