Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,305 Commits 3 Branches 0 Tags
b5ec00fa32a2c81b665bdcde029c9f789632182e
Commit Graph

154305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
b5ec00fa32 am 80bc0c48: am 73a6148e: am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '80bc0c48cdd472b8abd57b7cab143125b6d0f0a5':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-09-02 07:09:51 +00:00
Craig Mautner
596f20ad82 am 503be2cb: am bf22a48e: am 6b792116: Merge "Don\'t use anim background for translucent windows" into lmp-dev 
* commit '503be2cb530d31ccdd950930bd91bc9006b19637':
  Don't use anim background for translucent windows
 2014-09-02 07:09:45 +00:00
Baligh Uddin
b525c6c1a9 Merge "Import translations. DO NOT MERGE" 2014-09-01 21:26:05 +00:00
Baligh Uddin
6319c2727f Merge "Import translations. DO NOT MERGE" 2014-09-01 21:25:53 +00:00
Baligh Uddin
5dcc0e6f35 Merge "Import translations. DO NOT MERGE" 2014-09-01 21:25:53 +00:00
Baligh Uddin
de21d8384a Merge "Import translations. DO NOT MERGE" 2014-09-01 21:25:40 +00:00
Baligh Uddin
1bca358550 Merge "Import translations. DO NOT MERGE" 2014-09-01 21:25:34 +00:00
Christoph Studer
3ccf29ebf0 am 31942966: am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit '31942966028cbf9b669e27a8e720350b0af1268a':
  NoMan: Allow listeners to specify notification trim
 2014-09-01 11:25:43 +00:00
Sailesh Nepal
be7bc2233c am b71c4db7: am 50be1997: am 5f4f3a36: Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 
* commit 'b71c4db73f4e5b90c0dd4664d5178a0602cc0557':
  Make PhoneAccount.Builder constructor public
 2014-09-01 11:25:28 +00:00
George Mount
6ee1c7c5d5 am e5e085e4: am 45af21e8: am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit 'e5e085e4c097fc6546aa39ed3d62f439211a5b1b':
  Add IDs for status and nav-bar backgrounds.
 2014-09-01 11:25:22 +00:00
Adam Lesinski
a5b221254e am 0d7dd79b: am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '0d7dd79b8acb2ad37c004d73de4a8c8455b38427':
  Make UsageStats API comply with API Council
 2014-09-01 11:25:17 +00:00
Adam Lesinski
1e5c761591 am 21813c19: am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit '21813c197f044e7a569bd430d38e710d110c9a8f':
  Clean up test allocations so real memory leaks are more visible
 2014-09-01 11:25:08 +00:00
Adam Lesinski
4c38b8a7e7 am e4dce761: am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit 'e4dce761a149113d6ecfa4cb2cee299926c54eac':
  Revert "Make UsageStats API comply with API Council"
 2014-09-01 11:25:03 +00:00
Baligh Uddin
97d201ef42 Import translations. DO NOT MERGE 
Change-Id: I5255b957d79b591d031623d77ba9fd137f1f4fcd
Auto-generated-cl: translation import
 2014-08-31 16:25:00 -07:00
Baligh Uddin
7bf55b8263 Import translations. DO NOT MERGE 
Change-Id: I104b3d96d10954a6390802324ed0bd9ede42d6e1
Auto-generated-cl: translation import
 2014-08-31 16:20:43 -07:00
Baligh Uddin
219d9bf5a5 Import translations. DO NOT MERGE 
Change-Id: I6783166fd9372026a11fecef3a491f98152b1f74
Auto-generated-cl: translation import
 2014-08-31 16:10:31 -07:00
Baligh Uddin
0e25a5d0d2 Import translations. DO NOT MERGE 
Change-Id: I0bf0b7e0e1d4f7b3c508e08a40755fb5c819bd1b
Auto-generated-cl: translation import
 2014-08-31 15:48:15 -07:00
Baligh Uddin
a1b349dda6 Import translations. DO NOT MERGE 
Change-Id: Iefc5dee5e276d96d2b99216963de6b64f8ea631e
Auto-generated-cl: translation import
 2014-08-31 12:44:08 -07:00
Winson Chung
9cd74d9835 am 73a6148e: am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '73a6148e4be868e8eb4ffef9b5fbc8afd502ebff':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-08-29 23:53:00 +00:00
Craig Mautner
b7389933e3 am bf22a48e: am 6b792116: Merge "Don\'t use anim background for translucent windows" into lmp-dev 
* commit 'bf22a48eba2bc567ccfb8c8a4c364c27151135ca':
  Don't use anim background for translucent windows
 2014-08-29 23:52:55 +00:00
Winson Chung
f4e4a782d9 am 82f0abc4: Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 
* commit '82f0abc42920441dca10be57ba0287a1e7dd3a46':
  Workaround to prevent starting the same task from Recents twice. (Bug 17322903)
 2014-08-29 23:33:43 +00:00
Craig Mautner
55b2670aa5 am 6b792116: Merge "Don\'t use anim background for translucent windows" into lmp-dev 
* commit '6b792116998ff005d3293605a453fee95c4c83a1':
  Don't use anim background for translucent windows
 2014-08-29 23:33:39 +00:00
Winson Chung
68245c074c Merge "Workaround to prevent starting the same task from Recents twice. (Bug 17322903)" into lmp-dev 2014-08-29 21:25:43 +00:00
Winson Chung
02d4927082 Workaround to prevent starting the same task from Recents twice. (Bug 17322903) 2014-08-29 21:14:32 +00:00
Adam Lesinski
5119ea7e35 am 43186e07: am f5e3785e: am 84b95b66: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '43186e0784ff597be49d272d43bd7d3767f9e935':
  Make UsageStats API comply with API Council
 2014-08-29 21:07:20 +00:00
Christoph Studer
50b8fcb1f0 am e63f3434: am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit 'e63f3434de0adc3bc9505e954fc3d58b4f627074':
  NoMan: Allow listeners to specify notification trim
 2014-08-29 21:03:04 +00:00
Christoph Studer
00a868f0ca am 5a657b43: Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 
* commit '5a657b432a1074963484dd7df69c58576f052f07':
  NoMan: Allow listeners to specify notification trim
 2014-08-29 20:51:53 +00:00
Craig Mautner
d627eac286 Merge "Don't use anim background for translucent windows" into lmp-dev 2014-08-29 20:45:08 +00:00
Christoph Studer
78358b1788 Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev 2014-08-29 20:37:50 +00:00
Adam Lesinski
b423a1e22c am 0a18e15b: am 135fba7e: am c169c888: Change platformBuildVersionCode to name in aapt dump badging 
* commit '0a18e15b01cca66bf653082e0308a2565b6f1244':
  Change platformBuildVersionCode to name in aapt dump badging
 2014-08-29 20:33:48 +00:00
Yin-Chia Yeh
4ec4f8f009 am 3c505dae: am b3ff5477: am 4c99af79: Merge "Camera2: Remove spurious warnings" into lmp-dev 
* commit '3c505dae125b34483b9173401cb2fe84c86e2485':
  Camera2: Remove spurious warnings
 2014-08-29 20:33:43 +00:00
Igor Murashkin
c57a88c631 am b99ecc40: am e24c71fd: am 0a843da8: Merge "camera2: Implement TotalCaptureResult#getPartialResults" into lmp-dev 
* commit 'b99ecc40ee77f14ca46e8eaf3484bfc8e3721233':
  camera2: Implement TotalCaptureResult#getPartialResults
 2014-08-29 20:33:38 +00:00
John Reck
f8d104eed8 am 05b4e21e: am 724fff20: am ff6feade: Merge "Listener callbacks ordering fixups" into lmp-dev 
* commit '05b4e21ecda890ca20381384a772b4f7d66157a5':
  Listener callbacks ordering fixups
 2014-08-29 20:33:33 +00:00
Sailesh Nepal
68548e1f66 am 50be1997: am 5f4f3a36: Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 
* commit '50be1997cceb2c0fef05a4034ba137773f5900a4':
  Make PhoneAccount.Builder constructor public
 2014-08-29 20:18:32 +00:00
George Mount
b41572ec69 am 45af21e8: am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit '45af21e8314b877b90ad35248821da869835205a':
  Add IDs for status and nav-bar backgrounds.
 2014-08-29 20:18:27 +00:00
Adam Lesinski
e466091f06 am 81d63ef2: am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '81d63ef2f2249a3be896a6ca792aeb8e2faf50fb':
  Make UsageStats API comply with API Council
 2014-08-29 20:18:22 +00:00
Sailesh Nepal
10dfe10472 am 5f4f3a36: Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 
* commit '5f4f3a36571c05ee13cead7296a0b1c6b5131f91':
  Make PhoneAccount.Builder constructor public
 2014-08-29 20:06:14 +00:00
George Mount
cca19b363b am 6e6a57c8: Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 
* commit '6e6a57c8da95074c5f2c784b8fda38578835025e':
  Add IDs for status and nav-bar backgrounds.
 2014-08-29 20:06:09 +00:00
Adam Lesinski
d0a1a796f5 am 3335c1dc: Merge "Make UsageStats API comply with API Council" into lmp-dev 
* commit '3335c1dcd1bde37dddbe95c45d64866ca2d31cf2':
  Make UsageStats API comply with API Council
 2014-08-29 20:06:04 +00:00
Adam Lesinski
1ff88036da am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit '0f885328bc54e896d0f3cdf2faf25abaab95bece':
  Clean up test allocations so real memory leaks are more visible
 2014-08-29 20:05:19 +00:00
Adam Lesinski
d6fe30be04 am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit 'b616b94b63b91d17140a31ef65fa26cb261a67f4':
  Revert "Make UsageStats API comply with API Council"
 2014-08-29 20:05:14 +00:00
Sailesh Nepal
8fd8124911 Merge "Make PhoneAccount.Builder constructor public" into lmp-dev 2014-08-29 20:01:59 +00:00
George Mount
d2334e669c Merge "Add IDs for status and nav-bar backgrounds." into lmp-dev 2014-08-29 19:59:59 +00:00
Adam Lesinski
e43abf49d2 Merge "Make UsageStats API comply with API Council" into lmp-dev 2014-08-29 19:58:02 +00:00
Adam Lesinski
de99f4a234 am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit 'b9095bacc3083610412757a50a2a1b4cea20f866':
  Clean up test allocations so real memory leaks are more visible
 2014-08-29 19:56:56 +00:00
Adam Lesinski
5e71b3fa90 am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 
* commit '247e8e84ec0cafcac7f5e686b68ff64cebf7272a':
  Revert "Make UsageStats API comply with API Council"
 2014-08-29 19:56:52 +00:00
Adam Lesinski
cc562a811d Make UsageStats API comply with API Council 
- Fix documentation to mention units of time in APIs.
- Return a Map instead of an ArrayMap

Bug:17289531
Change-Id: I0a2cfdc0bc003eeeb65a16e37bb7b991624b2853
 2014-08-29 12:52:41 -07:00
Adam Lesinski
d06cd2b1bd Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 2014-08-29 19:43:30 +00:00
Adam Lesinski
25b09837d1 Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev 2014-08-29 19:42:43 +00:00
Adam Lesinski
df77a40d40 Revert "Make UsageStats API comply with API Council" 
This reverts commit 3811dabe57a60e4729f67b6fdc7fbe91eb8b3e06.

Did not update current.txt

Change-Id: I93faccaf24570b1ce88ade37c00506c4a48a8a1d
 2014-08-29 19:34:09 +00:00