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

83035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
172aa0c924 am 6963f2c3: am 60b645f6: Merge "Fix padding in global actions list item" into jb-mr1-dev 
* commit '6963f2c38c3d1f458e69a5b4390661e03936e267':
  Fix padding in global actions list item
 2012-08-07 17:47:06 -07:00
Adam Powell
6963f2c38c am 60b645f6: Merge "Fix padding in global actions list item" into jb-mr1-dev 
* commit '60b645f6739bd7d744ceab87ea50fe72d52cec8a':
  Fix padding in global actions list item
 2012-08-07 17:45:22 -07:00
Adam Powell
60b645f673 Merge "Fix padding in global actions list item" into jb-mr1-dev 2012-08-07 17:42:41 -07:00
Adam Powell
6571c7896d Fix padding in global actions list item 
Re-align the icon edges with the expected amount of padding in the
long-press power dialog.

Change-Id: I0d2f86447e635d5c339b07c261716e12670dc06d
 2012-08-07 17:39:56 -07:00
Jason Simmons
015009af89 am 54925058: am 336b31c2: Merge "Add an empty stub status bar service implementation" into jb-mr1-dev 
* commit '5492505847a7d2e0a57d06b927f8029aa72fa4aa':
  Add an empty stub status bar service implementation
 2012-08-07 16:24:37 -07:00
Jason Simmons
5492505847 am 336b31c2: Merge "Add an empty stub status bar service implementation" into jb-mr1-dev 
* commit '336b31c28ab282595fbf649eaf053f0811034dd9':
  Add an empty stub status bar service implementation
 2012-08-07 16:18:02 -07:00
Jason Simmons
336b31c28a Merge "Add an empty stub status bar service implementation" into jb-mr1-dev 2012-08-07 16:14:50 -07:00
Mike Lockwood
a3a7114daf am c8bcceb2: am 08fe2687: Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev 
* commit 'c8bcceb29eb6832b2f8306a8b5da41e9cda75801':
  MediaFile: Fix case sensitive file extension matching for computing MTP format code
 2012-08-07 15:38:32 -07:00
Mike Lockwood
c8bcceb29e am 08fe2687: Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev 
* commit '08fe2687aae986b7aca5192c60605edebaa18ab8':
  MediaFile: Fix case sensitive file extension matching for computing MTP format code
 2012-08-07 15:36:53 -07:00
Mike Lockwood
08fe2687aa Merge "MediaFile: Fix case sensitive file extension matching for computing MTP format code" into jb-mr1-dev 2012-08-07 15:34:49 -07:00
The Android Open Source Project
23b9037f8b am 5783b5de: (-s ours) am c452e025: am 02c99918: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '5783b5dea4b527a1def47445327745d674dee99b':
 2012-08-07 15:23:04 -07:00
Romain Guy
2e30fd3ec9 am 310ba5dd: am b260f353: Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339" into jb-mr1-dev 
* commit '310ba5dd9fba6430a9fb7735dd9394c393ff5096':
  Catch padding changes in ViewGroup to properly clip children Bug #6886339
 2012-08-07 15:22:41 -07:00
Stephen Hines
5a6e401cc9 am 37f3a38f: am b0e0c1c0: Merge "Add case for NEON min to RSTest" into jb-mr1-dev 
* commit '37f3a38fbd02f05775a618221d2cce31458cc4e4':
  Add case for NEON min to RSTest
 2012-08-07 15:22:31 -07:00
The Android Open Source Project
5783b5dea4 am c452e025: am 02c99918: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'c452e025be67787eee7ed656e765fed47ed6ae0e':
 2012-08-07 15:18:46 -07:00
The Android Open Source Project
c452e025be am 02c99918: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '02c9991834eecb161a90475b2a2076e44628c9f9':
 2012-08-07 15:14:21 -07:00
Katie McCormick
0cb9cf3c31 resolved conflicts for merge of eaf84a3f to master 
Change-Id: I6282f109116d6ffc63c8fe1d6ea18f8e25ae35f3
 2012-08-07 15:08:04 -07:00
The Android Open Source Project
02c9991834 Reconcile with jb-mr0-release - do not merge 
Change-Id: I79a1cf96dc3fb5ead2ace604370cbaed2d1bc534
 2012-08-07 14:59:03 -07:00
Romain Guy
310ba5dd9f am b260f353: Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339" into jb-mr1-dev 
* commit 'b260f3531b03e09b59e0a14e4cc44749c0bf9c9e':
  Catch padding changes in ViewGroup to properly clip children Bug #6886339
 2012-08-07 14:54:14 -07:00
Romain Guy
b260f3531b Merge "Catch padding changes in ViewGroup to properly clip children Bug #6886339" into jb-mr1-dev 2012-08-07 14:52:35 -07:00
Mike Lockwood
2d286f4984 MediaFile: Fix case sensitive file extension matching for computing MTP format code 
Bug: 6939136

Change-Id: Iefd4083aefbd4b175a2f8c860a9e13c99ded9c82
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-08-07 14:43:59 -07:00
Romain Guy
2440e670de Catch padding changes in ViewGroup to properly clip children 
Bug #6886339

RTL support introduced a new way to handle padding which broke
existing behavior in ViewGroup.setPadding(). The new code path
was not notifying ViewGroup which would prevent it from setting
a flag used to clip children.

Change-Id: I584143714cb81fd664b4ecd9fb51d56bae04ba05
 2012-08-07 14:43:43 -07:00
Stephen Hines
37f3a38fbd am b0e0c1c0: Merge "Add case for NEON min to RSTest" into jb-mr1-dev 
* commit 'b0e0c1c02a55d5e6221a79e4142dd191f4c0b9ec':
  Add case for NEON min to RSTest
 2012-08-07 14:35:16 -07:00
Stephen Hines
b0e0c1c02a Merge "Add case for NEON min to RSTest" into jb-mr1-dev 2012-08-07 14:32:30 -07:00
Rajeev Sharma
6e1b917759 Add case for NEON min to RSTest 
Regression test for bug 6841495.

Change-Id: If98380f402a711592dcddba5438e3cce5b008131
 2012-08-07 14:30:50 -07:00
Katie McCormick
eaf84a3faf am e4fcedff: Merge "cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9" into jb-mr1-dev 
* commit 'e4fcedff53bd42229ed6b520c32535649e218dee':
  cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9
 2012-08-07 14:24:48 -07:00
Katie McCormick
e4fcedff53 Merge "cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9" into jb-mr1-dev 2012-08-07 14:22:17 -07:00
Scott Main
8a7947f85b am 4ef34ea3: am a335b06c: am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit '4ef34ea30ab60208a9fbf32aef4d5bb66aaf3ac4':
  docs: fix hdef variable
 2012-08-07 14:09:57 -07:00
Scott Main
e6ec886a4b am 5fef67cb: am b53e9b42: am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file 
* commit '5fef67cbc8c234c5028cc91ef836fd2fb3f183af':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:09:53 -07:00
Scott Main
4ef34ea30a am a335b06c: am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit 'a335b06c673553fec4f5cfac0a667ec1de0972cc':
  docs: fix hdef variable
 2012-08-07 14:07:56 -07:00
Scott Main
5fef67cbc8 am b53e9b42: am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file 
* commit 'b53e9b42c302a5c5ccd837aece6bfffdf0cb5bf2':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:07:52 -07:00
Scott Main
a335b06c67 am 9e28fa45: am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit '9e28fa459bac0322a5608a4f6c682e0ff9051bed':
  docs: fix hdef variable
 2012-08-07 14:05:32 -07:00
Scott Main
b53e9b42c3 am a8583c29: am 40eee61e: docs: fix broken links and update sitemap text file 
* commit 'a8583c2934836572632bb82d1fe7607392d4ca72':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:05:28 -07:00
Scott Main
9e28fa459b am 0d3a1277: Merge "docs: fix hdef variable" into jb-dev 
* commit '0d3a127742b56a9aae9c9c018b7042f49902db8a':
  docs: fix hdef variable
 2012-08-07 14:04:09 -07:00
Scott Main
a8583c2934 am 40eee61e: docs: fix broken links and update sitemap text file 
* commit '40eee61e25fb887f5267686f8a0a7c5bd9f95769':
  docs: fix broken links and update sitemap text file
 2012-08-07 14:04:04 -07:00
Scott Main
0d3a127742 Merge "docs: fix hdef variable" into jb-dev 2012-08-07 14:01:34 -07:00
Scott Main
b111b5785e docs: fix hdef variable 
Change-Id: I737258d454f426506e529e3d48fefb1397b9e8d3
 2012-08-07 13:59:12 -07:00
Adam Powell
77a572a8d3 am 60add06f: am 4224790f: Merge "Animate the action bar\'s Up chevron as it shows and hides." into jb-mr1-dev 
* commit '60add06f3910d9f06f24b78ac69c89ad6c8deaa5':
  Animate the action bar's Up chevron as it shows and hides.
 2012-08-07 13:52:48 -07:00
Adam Powell
60add06f39 am 4224790f: Merge "Animate the action bar\'s Up chevron as it shows and hides." into jb-mr1-dev 
* commit '4224790ffac80b7777ebeeed7474c3111a7add49':
  Animate the action bar's Up chevron as it shows and hides.
 2012-08-07 13:50:47 -07:00
Adam Powell
4224790ffa Merge "Animate the action bar's Up chevron as it shows and hides." into jb-mr1-dev 2012-08-07 13:48:04 -07:00
Adam Powell
fd75eef161 Animate the action bar's Up chevron as it shows and hides. 
Change-Id: I2cf0283cc644a62ad83cb5641b8f56cc8229b86f
 2012-08-07 13:47:11 -07:00
Elliott Hughes
1d94cb45ea am fb5dfb70: am b14c215e: am 4b4b4438: am 33c5670b: Merge "Fewer warnings in aidl generated code." 
* commit 'fb5dfb70cb18a9053e5fe62866009ccac3b4b6da':
  Fewer warnings in aidl generated code.
 2012-08-07 13:24:33 -07:00
Elliott Hughes
fb5dfb70cb am b14c215e: am 4b4b4438: am 33c5670b: Merge "Fewer warnings in aidl generated code." 
* commit 'b14c215eb2dd617214d867d38449eb1d1214d41c':
  Fewer warnings in aidl generated code.
 2012-08-07 13:22:30 -07:00
Elliott Hughes
b14c215eb2 am 4b4b4438: am 33c5670b: Merge "Fewer warnings in aidl generated code." 
* commit '4b4b44381b133e9ab7418806c046774b7fd31393':
  Fewer warnings in aidl generated code.
 2012-08-07 13:20:50 -07:00
Elliott Hughes
4b4b44381b am 33c5670b: Merge "Fewer warnings in aidl generated code." 
* commit '33c5670b315810f1f3dc66fe8cd38f7b3e05f3ac':
  Fewer warnings in aidl generated code.
 2012-08-07 13:18:53 -07:00
The Android Automerger
9ec5855611 merge in jb-mr0-release history after reset to jb-dev 2012-08-07 13:01:14 -07:00
Katie McCormick
e5cefd1d52 cherrypick from jb-dev docs: GCM changes Change-Id: Id5454e70455bae14ab4605021a6c1bcab0292ae9 
Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Conflicts:

	docs/html/guide/google/gcm/gcm.jd

Change-Id: I584ba81e923d4150d2b4aed940d790c8298bae7c
 2012-08-07 13:00:10 -07:00
Baligh Uddin
3c5b5a53e0 am 23734230: (-s ours) am 53bec9af: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '237342307dcbfa0f07ff7cf162ba0fe347447e83':
  Import translations. DO NOT MERGE
 2012-08-07 12:44:32 -07:00
Baligh Uddin
237342307d am 53bec9af: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '53bec9af8b415af87cc51c065c8bec02e26759a6':
  Import translations. DO NOT MERGE
 2012-08-07 12:42:31 -07:00
Baligh Uddin
53bec9af8b Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-07 12:40:12 -07:00
Baligh Uddin
2cfa7d8943 Import translations. DO NOT MERGE 
Change-Id: Ia88ed38a8472e03ac23c36dc8fe86643af9bb2d6
Auto-generated-cl: translation import
 2012-08-07 12:24:57 -07:00