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

176666 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
c21a05fbe3 fix migrate guide and other studio edits 
Change-Id: Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-05 20:29:42 -08:00
smain@google.com
74056511b6 Merge "docs:sdk installing file update" 2014-12-06 04:10:46 +00:00
smain@google.com
cc3b229be6 docs:sdk installing file update 
Change-Id: Iea016bb42df95d19058f261f581482ecc4b8b3b4
 2014-12-05 20:07:57 -08:00
Joe Fernandez
36b8e73042 Merge "docs:building your first app" 2014-12-06 03:58:33 +00:00
smain@google.com
9213e2a796 update studio hero image and add section about code editor 
Change-Id: Ifd9c5b22139b3ded42c3dab31e9946c40c4f0b38
 2014-12-05 19:41:05 -08:00
Rich Slogar
0215606d8d docs:building your first app 
Change-Id: I3d810d0043be59a1eecfac7c02631542e9408f01
 2014-12-05 19:39:09 -08:00
smain@google.com
2a336f4a70 docs: project updates 
Change-Id: If85a51cf2f46a8619798804e880e02f99d1e4ee3
 2014-12-05 18:37:49 -08:00
smain@google.com
f895942dbf Merge "docs: setup-virtual-device" 2014-12-05 23:00:21 +00:00
smain@google.com
c56cd34dca docs: setup-virtual-device 
Change-Id: I7c49f97c6ebbf64fb642dc24698e172361e5694f
 2014-12-05 14:58:42 -08:00
Joe Fernandez
690047f5cc Merge "docs: publishing with studio" 2014-12-05 22:50:25 +00:00
Alan Viverette
b2accbb6d2 am 23d86231: am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev 
* commit '23d86231e9af2f4ba43cbc8a8cbbfc9757a98ddc':
  Update locally cached drawables when constant state changes
 2014-12-05 21:49:36 +00:00
Wale Ogunwale
ea3c7df59a am af3361bb: am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev 
* commit 'af3361bb264d9d037f0bd10532a752bbaeaec39c':
  Add support from restoring recent's backup.
 2014-12-05 21:49:31 +00:00
Craig Mautner
83242b59fb am c67d8958: am 3f11bba5: am afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev 
* commit 'c67d89588c17fc94b7b9088eb60f311b5dbf31ac':
  bug fix possible NPE while startProcessLocked()
 2014-12-05 21:49:11 +00:00
Craig Mautner
0a44001f44 am 637e4cb4: am b97b19f6: am 9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev 
* commit '637e4cb4b3946e4fc4c15734fbf18c380867e5bc':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-05 21:49:07 +00:00
Craig Mautner
5ae3b9d68e am a6e99486: am f6d03f39: am 799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev 
* commit 'a6e99486b1ceddb0873cdc46e8baf9ce55f972a7':
  [ActivityManager] Fix race condition in pss collection
 2014-12-05 21:49:02 +00:00
Craig Mautner
f63a851c7d am f128225f: am a32933fd: am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 
* commit 'f128225f93acb9479451d2806fe4d2e981fe34fd':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-12-05 21:48:58 +00:00
Craig Mautner
0571135e58 am 7978f60b: am 95cce9d5: am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 
* commit '7978f60b9e950053caad4823dbc4258192480905':
  Avoid system server crash due to package removed
 2014-12-05 21:48:54 +00:00
Craig Mautner
1fa394980b am 655dd3eb: am 435496e1: am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 
* commit '655dd3eb171d7b42678529a9c5a2075ab89a1698':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-05 21:48:50 +00:00
Craig Mautner
e51d9008bd am 00454026: am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 
* commit '004540260c02222fe2c611823c428e02b4a8a135':
  [ActivityManager] Fix NPE when start activity
 2014-12-05 21:48:45 +00:00
Alan Viverette
23d86231e9 am ae656af7: am bab2b594: Merge "Update locally cached drawables when constant state changes" into lmp-mr1-dev 
* commit 'ae656af727966df132d5ec7a462bc8bd98e41b71':
  Update locally cached drawables when constant state changes
 2014-12-05 21:41:10 +00:00
Wale Ogunwale
af3361bb26 am 9a3f6ac6: am 6b54d38a: Merge "Add support from restoring recent\'s backup." into lmp-mr1-dev 
* commit '9a3f6ac63c9c11008b6dbb99d5213b3d3f51fca0':
  Add support from restoring recent's backup.
 2014-12-05 21:41:03 +00:00
Craig Mautner
c67d89588c am 3f11bba5: am afca4dba: Merge "bug fix possible NPE while startProcessLocked()" into lmp-mr1-dev 
* commit '3f11bba5b90b9b0098f23f08a97e3dfc1421db33':
  bug fix possible NPE while startProcessLocked()
 2014-12-05 21:40:55 +00:00
Craig Mautner
637e4cb4b3 am b97b19f6: am 9052862e: Merge "[ActivityManager] Invalidate last screenshot when activity relaunched" into lmp-mr1-dev 
* commit 'b97b19f6a46fe3388373f2215446363e64e799c1':
  [ActivityManager] Invalidate last screenshot when activity relaunched
 2014-12-05 21:40:49 +00:00
Craig Mautner
a6e99486b1 am f6d03f39: am 799cb730: Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev 
* commit 'f6d03f398098bdff74bcc7442fbc1912536a33e2':
  [ActivityManager] Fix race condition in pss collection
 2014-12-05 21:40:43 +00:00
Craig Mautner
f128225f93 am a32933fd: am e0dc40c0: Merge "ANR caused by incorrect cleanup in BroadcastQueue." into lmp-mr1-dev 
* commit 'a32933fdfe5909de63b938b65ec0d74297d0800d':
  ANR caused by incorrect cleanup in BroadcastQueue.
 2014-12-05 21:40:37 +00:00
Craig Mautner
7978f60b9e am 95cce9d5: am 93d47b4c: Merge "Avoid system server crash due to package removed" into lmp-mr1-dev 
* commit '95cce9d57e627a86f612bf402b3338a6a1a1eae3':
  Avoid system server crash due to package removed
 2014-12-05 21:40:32 +00:00
Craig Mautner
655dd3eb17 am 435496e1: am c2cae50b: Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev 
* commit '435496e1ac4d3e9d1381619ae54f6812c6a8ed0d':
  Reset killedByAm flag at attachApplicationLocked
 2014-12-05 21:40:26 +00:00
Craig Mautner
004540260c am 1d8b27bc: am 1289a3b2: Merge "[ActivityManager] Fix NPE when start activity" into lmp-mr1-dev 
* commit '1d8b27bceddcd2ff26bc0f2b8d7a5f7a54604b06':
  [ActivityManager] Fix NPE when start activity
 2014-12-05 21:40:21 +00:00
Rich Slogar
4223d0228d docs: publishing with studio 
Change-Id: I56ecbd655747c6a9def323eade7b21bb0d46aeb2
 2014-12-05 13:24:03 -08:00
David Friedman
1d0ff728ce am 278fd97a: am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs 
* commit '278fd97a001b9c0334a05b13663dcec55e383c21':
  Change notes for NDK r10d, to publish to DAC
 2014-12-05 21:20:37 +00:00
Geoff Mendal
b82939b0c2 am cf6821a9: (-s ours) am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'cf6821a94227d665ba8dfd62ee7caad5bd07beaa':
  Import translations. DO NOT MERGE
 2014-12-05 21:20:33 +00:00
David Friedman
bcb71a9842 am b69f1f0b: am 29b04001: am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs 
* commit 'b69f1f0b6ceb69c2af873309c1f1bcf1c0dc8ed5':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-05 21:20:29 +00:00
Svetoslav
130521b91f am 323c02d4: am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev 
* commit '323c02d4e0860c925aa0c4db14be8acaf231c69b':
  Notify accessibility for window changes after an app animation end.
 2014-12-05 21:20:22 +00:00
Justin Harrison
372bba4da5 am ff4f2486: am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit 'ff4f24866cb87c1110fb26bade3b6017d51805f4':
  Revert "Revert "Improve fling physics for recents""
 2014-12-05 21:20:07 +00:00
Craig Mautner
67713f64fa am e1d4b9fa: am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 
* commit 'e1d4b9fab1cc89eab8ca85bfea000a3c6bbd4dd1':
  Prevent ANR when broadcast receiver is killed
 2014-12-05 21:20:02 +00:00
Paul Jensen
5baa08fbf6 am 704c8c0c: am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit '704c8c0c3b2753c8d91aef23d39a9f6255389fd3':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2014-12-05 21:19:57 +00:00
Prerepa Viswanadham
fd5e847cb6 am 12120998: am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
* commit '12120998f8b34c809d8f29790a8f74e624b26e38':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
 2014-12-05 21:19:53 +00:00
David Friedman
278fd97a00 am 753f4fc9: am 9c28ba76: am 47eddc7c: am bf6a4bfb: am 6e043e0c: Merge "Change notes for NDK r10d, to publish to DAC" into lmp-docs 
* commit '753f4fc95135a396ac9d7f6f4e3f9eacb662bb1d':
  Change notes for NDK r10d, to publish to DAC
 2014-12-05 20:19:43 +00:00
Geoff Mendal
cf6821a942 am 135a5761: (-s ours) am 597a7531: (-s ours) am 9ece2e96: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '135a5761857f9dbd31ab51abe6466e26ddb379cd':
  Import translations. DO NOT MERGE
 2014-12-05 20:19:37 +00:00
David Friedman
b69f1f0b6c am 29b04001: am 17904f8b: am 2d2e7bf3: am ed839a76: am 795db65e: Merge "Fixes a typo, in which the word "give" is repeated. Bug 18553334" into lmp-docs 
* commit '29b040019226d7d02a57fe76a471465d16109f0b':
  Fixes a typo, in which the word "give" is repeated. Bug 18553334
 2014-12-05 20:19:30 +00:00
Svetoslav
323c02d4e0 am 8d9a06fe: am 6e7bf935: Merge "Notify accessibility for window changes after an app animation end." into lmp-mr1-dev 
* commit '8d9a06feee0d5311e40adbccb0d2205a531def85':
  Notify accessibility for window changes after an app animation end.
 2014-12-05 20:19:24 +00:00
Justin Harrison
ff4f24866c am 2b236ab3: am 70941f20: Merge "Revert "Revert "Improve fling physics for recents""" into lmp-mr1-dev 
* commit '2b236ab30e479d22c0619670a97c90993307a190':
  Revert "Revert "Improve fling physics for recents""
 2014-12-05 20:19:10 +00:00
Craig Mautner
e1d4b9fab1 am 8432cee0: am 224904e0: Merge "Prevent ANR when broadcast receiver is killed" into lmp-mr1-dev 
* commit '8432cee04f2ec4bf77a3ba84524148b78db7ea57':
  Prevent ANR when broadcast receiver is killed
 2014-12-05 20:18:58 +00:00
Paul Jensen
704c8c0c3b am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev 
* commit '461e73677d208e4e97356cbc781ce490b90e2027':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.
 2014-12-05 20:18:45 +00:00
Prerepa Viswanadham
12120998f8 am e21aafab: am ff5e5db3: Fix BT crash due to unset value for BluetoothGattDescriptor from API user 
* commit 'e21aafab0d735935155860bd16dcc3ece81ce546':
  Fix BT crash due to unset value for BluetoothGattDescriptor from API user
 2014-12-05 20:18:38 +00:00
Adam Powell
5cd6f61f7d am 19623538: am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit '19623538735fac497325e2082a0ba56c199fc6b1':
  Fix NullPointerException in ListView
 2014-12-05 19:48:05 +00:00
Adam Powell
1962353873 am b3b4f837: am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit 'b3b4f83702ca878854529acfdc389d15db5ca6f3':
  Fix NullPointerException in ListView
 2014-12-05 19:39:25 +00:00
Adam Powell
b3b4f83702 am 8c9283f4: Merge "Fix NullPointerException in ListView" 
* commit '8c9283f41083a20a82ae37eac44b79de6eb3158e':
  Fix NullPointerException in ListView
 2014-12-05 19:32:13 +00:00
Adam Powell
8c9283f410 Merge "Fix NullPointerException in ListView" 2014-12-05 19:26:18 +00:00
Adam Lesinski
7e74da3172 am e97908d3: Merge commit \'0953ab27\' into manualmerge 
* commit 'e97908d32ee8ea80138d085260a0eac93841c722':
  AAPT: Move private attrs to new type for framework
 2014-12-05 19:16:27 +00:00