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

177537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
132004f869 am 195a0da4: am 229f8a3c: am e0245cb5: am 1f5b2510: am 2cfdbf5f: Merge "fix migrate guide and other studio edits cherryick from Ic223d8fa3cd1e66ddd37b8f896fef12869be4268" into lmp-docs 
* commit '195a0da45777b8a2549f93f3494abc5d59d2467b':
  fix migrate guide and other studio edits cherryick from  Ic223d8fa3cd1e66ddd37b8f896fef12869be4268
 2014-12-08 19:41:52 +00:00
smain@google.com
dbb636fc53 am befef081: am 2b4bd09c: am d9c08bac: am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app. 
* commit 'befef081a84f1d1911906811c9afd07b8c393c1f':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.
 2014-12-08 19:41:42 +00:00
Joe Fernandez
66189de6f8 am d816a983: am c4bac980: am 44e7bcf4: am b6be2bff: am 40c4ccf4: Merge "doc: SDK install page fix and link fixes" into lmp-docs 
* commit 'd816a983927e382d2f6814053f339e4b59bdf871':
  doc: SDK install page fix and link fixes
 2014-12-08 19:41:36 +00:00
smain@google.com
6310c32386 am 42b65c6e: am 4ec024e9: am 71319f28: am 160e7607: am dee9e37e: Merge "add studio 1.0 files and reorder features list" into lmp-docs 
* commit '42b65c6e89203bfbbc3175b4f4ff1be938aeca47':
  add studio 1.0 files and reorder features list
 2014-12-08 19:41:30 +00:00
Joe Fernandez
dda0cb9fc5 am 5c09d4b8: am d7f9f30e: am dc842637: am ac3152ee: am 7b9ae53b: doc: fix for SDK installing page 
* commit '5c09d4b8d8121514c63bd0cf72035a03d9ae8776':
  doc: fix for SDK installing page
 2014-12-08 19:41:24 +00:00
smain@google.com
7e5fbc1dc0 am 8804b2a6: am 4e0575be: am c10acd71: am 9a041f18: am d3c9f2b9: update studio hero image and add section about code editor [CP] 
* commit '8804b2a6e08b46112dcf3a5993b1254bba63131d':
  update studio hero image and add section about code editor [CP]
 2014-12-08 19:40:58 +00:00
Rich Slogar
85f69e0b96 am 6a0e1906: am 8fa02c18: am 08ba05b9: am 6cc5e87d: am 4083327e: docs:build system updates [CP] 
* commit '6a0e190646a6c518a017007afbfb0d918d95df37':
  docs:build system updates [CP]
 2014-12-08 19:40:52 +00:00
smain@google.com
485901732e am 8e29e218: am acd40aa9: am 67fa34e9: am 2d0cf342: am d0c79c4e: fix migrate guide and other studio edits [CP] 
* commit '8e29e218a811237175f69b4260308fc653b77ff0':
  fix migrate guide and other studio edits [CP]
 2014-12-08 19:40:46 +00:00
smain@google.com
ae3a1d70e5 am 8dac5b5e: am fedf3943: am c493dd3f: am e9f63a0f: am 5797e272: docs:sdk installing file update [CP] 
* commit '8dac5b5e8710b9d2ff8acbee3e2de349a9518f44':
  docs:sdk installing file update [CP]
 2014-12-08 19:40:22 +00:00
smain@google.com
283a2046d2 am c5d38e73: am baa56314: am f0eee644: am 521d7277: am 29e13c5a: new Android Studio download page [CP] 
* commit 'c5d38e7345e4185231197c2976fe2218a0547eeb':
  new Android Studio download page [CP]
 2014-12-08 19:40:16 +00:00
Rich Slogar
b2b89de607 am d0a96b67: am cd13e657: am ca61ce33: am e1136835: am 5d9d7610: docs: publishing with studio [CP] 
* commit 'd0a96b6742e03213b8d8d28f13a069029514f6f9':
  docs: publishing with studio [CP]
 2014-12-08 19:40:09 +00:00
smain@google.com
2153969c19 am d1ffd1e3: am 139c7def: am 53513e9e: am 5962474c: am fc64b70a: docs: new Eclipse menu [CP] 
* commit 'd1ffd1e3de1590ff7330706b8c1221992f3634ec':
  docs: new Eclipse menu [CP]
 2014-12-08 19:40:03 +00:00
Rich Slogar
3d368a16d8 am 2e3daaa6: am 6bbb5ed1: am 43304cfc: am 9e6ad10b: am e3fe9382: docs: studio basics v2 [CP] 
* commit '2e3daaa6ea3ca883b3d7c79761517dce35319d53':
  docs: studio basics v2 [CP]
 2014-12-08 19:39:55 +00:00
Rich Slogar
a51552768b am e20c9496: am 0b52c5b3: am 88546c85: am 47a19d5d: am fdeb27f9: docs:download updates for studio [CP] 
* commit 'e20c9496f63db7e6980e263ad884953d565ee54c':
  docs:download updates for studio [CP]
 2014-12-08 19:39:48 +00:00
Rich Slogar
da5184e2dc am 7593c6ce: am bcb57c70: am 05d1ba69: am 84f7d62b: am 153c8287: docs:revision updates 
* commit '7593c6ce88550ee124e86ea2b2dc1caaa680ed51':
  docs:revision updates
 2014-12-08 19:39:42 +00:00
Wonsik Kim
a565716a2a am 14965d0e: am 2abd2dd1: Merge "TIF: TvInputHardwareManager to listen to volume changes" into lmp-mr1-dev 
* commit '14965d0ebb884106cdbe425b6e2b82d45238331b':
  TIF: TvInputHardwareManager to listen to volume changes
 2014-12-08 19:39:31 +00:00
Jean-Michel Trivi
83d0c86b86 am d14f98fd: am 8638877f: Merge "Support collaborative audio focus handling" into lmp-mr1-dev 
* commit 'd14f98fdcec65daae9f4db04f827036e5317b55c':
  Support collaborative audio focus handling
 2014-12-08 19:39:10 +00:00
Rich Slogar
458a3b8afd am 1ce435cb: am 13a69707: am 1e51b3ae: am 14864414: am f7f20a45: docs:building your first app [CP] 
* commit '1ce435cb232772d6f6e633f3d388bae6d9a13710':
  docs:building your first app [CP]
 2014-12-08 19:39:00 +00:00
smain@google.com
6eef2c3a44 am 6d3b6ff4: am fe3aabda: am bb642586: am 9fd7804b: am 377604af: docs: project updates [CP] 
* commit '6d3b6ff46e0550fd2c593931998cf54a5feaa231':
  docs: project updates [CP]
 2014-12-08 19:38:54 +00:00
smain@google.com
7e6713fc08 am 13b29519: am 382040d4: am 5b2cac58: am f5fa25ec: am 9dd6a07f: docs: setup-virtual-device [CP] 
* commit '13b2951910178e8e7fc4fae1e3f700038621be98':
  docs: setup-virtual-device [CP]
 2014-12-08 19:38:48 +00:00
Rich Slogar
b5c81893e7 am bc683297: am 70d5341c: am 5b440be7: am d4c89098: am f592a587: docs support library updates [CP] 
* commit 'bc683297e36a188a45c7c54558d8c27dd6feda48':
  docs support library updates [CP]
 2014-12-08 19:38:42 +00:00
Rich Slogar
cdad9919ce am 2bba0c94: am 892577b0: am 86db5b43: am ff88ac5e: am 7a69c2de: docs: debugging studio [CP] 
* commit '2bba0c94f3e7726cc58d470094acd116db4ab36b':
  docs: debugging studio [CP]
 2014-12-08 19:38:36 +00:00
Rich Slogar
059b6ef35c am 46150b5f: am 51ffc634: am bf96a239: am 5aac6042: am cc4d08b4: docs:setting up hardware devices [CP] 
* commit '46150b5f20098d3902495dde1c9f978f0d69ca0e':
  docs:setting up hardware devices [CP]
 2014-12-08 19:38:30 +00:00
Rich Slogar
44176d92e0 am 5da1430e: am a402fa5f: am f26726b1: am 63d5c3e1: am d16db79e: docs: workflow index [CP] 
* commit '5da1430e7e838e7a36482d605ee3fad121afe0f6':
  docs: workflow index [CP]
 2014-12-08 19:38:25 +00:00
Rich Slogar
0622234bcc am 359e5597: am d5b6d08e: am 8fbb3f6e: am cf516099: am 5e8d9a02: docs: tools help update [CP] 
* commit '359e5597a9f890002f4bd2a66caa52100fa0defb':
  docs: tools help update [CP]
 2014-12-08 19:38:17 +00:00
Scott Rowe
46f7dcf1e4 am 43883b11: am 044a7802: am 4bc2c3bd: am 1efca60b: am e829d8fc: docs: Training refactor for Android Studio [CP] 
* commit '43883b11dec935aa545ee0cbb3660d0b84c36a53':
  docs: Training refactor for Android Studio [CP]
 2014-12-08 19:37:50 +00:00
Jinsuk Kim
62bb43dbec am 122e704a: am 4da55388: Merge "CEC: Avoid setting op in disabled mode" into lmp-mr1-dev 
* commit '122e704a017b51ffd3da0721059d04f00c726ce8':
  CEC: Avoid setting op in disabled mode
 2014-12-08 19:37:44 +00:00
David Friedman
587d349eff am cac94aa0: am 06e922fc: am cf528ec7: am d56f55de: am caacc895: Fixes (updates) download links for NDK r10d. 
* commit 'cac94aa0791b04fd328b18c56da3d4815f142fe7':
  Fixes (updates) download links for NDK r10d.
 2014-12-08 19:37:37 +00:00
Jeff Davidson
5550a408c4 am 5b8c5dd4: am 699faa1d: Merge "Show "Connected via Wi-Fi assistant" for ephemeral networks." into lmp-mr1-dev 
* commit '5b8c5dd41e386e696d7e8705f84982a91d1596ae':
  Show "Connected via Wi-Fi assistant" for ephemeral networks.
 2014-12-08 19:36:46 +00:00
Jeff Davidson
0efd29fc57 am 386effc7: am f779e6b8: Merge "Fix flipped captive portal bit in network conditions bcast." into lmp-mr1-dev 
* commit '386effc7a160e330420f7746f41d46c12f64579d':
  Fix flipped captive portal bit in network conditions bcast.
 2014-12-08 19:36:39 +00:00
Jeff Davidson
820ba1f96f am 401ef259: am a4144563: Merge "add disable Ephemeral Network API Bug:18525241" into lmp-mr1-dev 
* commit '401ef259f3b2c8c87b02c9939c0599d6ad0f6f39':
  add disable Ephemeral Network API Bug:18525241
 2014-12-08 19:36:33 +00:00
Jeremy Joslin
d4753450f3 am c4b2ec1a: am 1edc73aa: Merge "Don\'t send the same PendingIntent more than once." into lmp-mr1-dev 
* commit 'c4b2ec1a3a808c2dae0894e5f0cfd43d6ec1d5a2':
  Don't send the same PendingIntent more than once.
 2014-12-08 19:36:27 +00:00
Evan Charlton
1b001caed3 am 068a0786: am 59dac0e1: Merge "Associate a UserHandle with each PhoneAccountHandle" into lmp-mr1-dev 
* commit '068a078645b5f146c09a986398eda9df24d1ef3e':
  Associate a UserHandle with each PhoneAccountHandle
 2014-12-08 19:36:21 +00:00
John Spurlock
2f47eaff9b Merge "Volume: Only play the new vibrate hint once per volume-down." into lmp-mr1-dev 2014-12-08 19:36:14 +00:00
Paul Jensen
446a59bc26 am a4afe13a: am 891dd574: Merge "Reap unvalidated networks that have no chance of becoming highest scoring." into lmp-mr1-dev 
* commit 'a4afe13af38c03ae6abb76d2cf36ae0672328fd8':
  Reap unvalidated networks that have no chance of becoming highest scoring.
 2014-12-08 19:36:08 +00:00
Jeff Tinker
f062d8d7df am b15a57d6: am 82cc1c5a: Merge "Unhide secure stop APIs" into lmp-mr1-dev 
* commit 'b15a57d64d39315a9c1331d74a1ff5821f8b14d1':
  Unhide secure stop APIs
 2014-12-08 19:35:59 +00:00
Jinsong Mu
5a181a2436 am 6fac0351: am b3898fbe: Merge "Talk-back doesn\'t notify user to enter unlock PIN when device is locked with PIN lock. b/18568003" into lmp-mr1-dev 
* commit '6fac0351cebf84cf9505246e1fec5d74a1fa49c0':
  Talk-back doesn't notify user to enter unlock PIN when device is locked with PIN lock. b/18568003
 2014-12-08 19:35:31 +00:00
Ihab Awad
657f25e964 am 2b455544: am 6a1c8256: Merge "Add Text-to-Speech annotations for phone number displays (1/3)" into lmp-mr1-dev 
* commit '2b45554454b6b9db3e2626fe3ca3cd5f42f960ca':
  Add Text-to-Speech annotations for phone number displays (1/3)
 2014-12-08 19:35:17 +00:00
David Friedman
ad9e0d5ed5 am 7823e6ee: am 968ef51c: am c305e6eb: am 860bdc7d: am b357f74e: Merge "Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117" into lmp-docs 
* commit '7823e6ee900547e32436d3c76f1709c926d08284':
  Updates GMSCore docs to reflect ability to selectively include APIs Bug 16679117
 2014-12-08 19:34:38 +00:00
RoboErik
b22eea724b am 2d7a1b09: am d386d0f3: Merge "Route mute key events through MediaSessionService" into lmp-mr1-dev 
* commit '2d7a1b09e93aec3baeb16f46fb203ae14555d4a7':
  Route mute key events through MediaSessionService
 2014-12-08 19:34:32 +00:00
Quddus Chong
0d9d5d0a83 am e6000f47: am 52fec470: am f7b51977: am 87644a43: am 2b32a042: Merge "docs: Added API highlights for Google Play service v6.5 (Nacho) release." into lmp-docs 
* commit 'e6000f475346624587caa09cec37c85c3ab61ee8':
  docs: Added API highlights for Google Play service v6.5 (Nacho) release.
 2014-12-08 19:34:16 +00:00
Quddus Chong
a40c6b0479 am f428952e: am 9deffecc: am 15c3ce77: am 0dfcfdcb: am 23056929: Merge "docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release." into lmp-docs 
* commit 'f428952e093239bce7c11eccc547a5094066c73f':
  docs: Updated Google Play services Javadocs to reflect v6.5 (Nacho) release.
 2014-12-08 19:34:08 +00:00
Wale Ogunwale
30b74ccf69 am 80d11912: am b503e3f2: Merge "Don\'t destroy surfaces of activities launched behind early." into lmp-mr1-dev 
* commit '80d119121f62bf995ff856f6865a977eb8c03239':
  Don't destroy surfaces of activities launched behind early.
 2014-12-08 19:34:01 +00:00
Filip Gruszczynski
73f0e9a3fe am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev 
* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
  Fix calculation of overscan insets in WindowState.
 2014-12-08 19:33:55 +00:00
Dianne Hackborn
0cfdd810de am e52a2ea0: am 0029f0ac: Merge "Fix issue #17323751: Additional items in aggregated battery stats" into lmp-mr1-dev 
* commit 'e52a2ea03bd7b8ed2f3680c5198e00fb7ad5c34c':
  Fix issue #17323751: Additional items in aggregated battery stats
 2014-12-08 19:33:49 +00:00
ztenghui
4cb33e7657 am 55034822: am 62517a6e: Merge "Fine tune the light radius from 800dp to 600dp" into lmp-mr1-dev 
* commit '550348220e959ff3c98b88c191a849ea2ee6062a':
  Fine tune the light radius from 800dp to 600dp
 2014-12-08 19:18:13 +00:00
Sanket Padawe
17c2719d03 am 49aeee2e: am 0c1a5bea: Merge "Doing provisioning check for wifi tethering from SystemUI" into lmp-mr1-dev 
* commit '49aeee2e791ec85a1c2f202d29e7113dc9d9cae0':
  Doing provisioning check for wifi tethering from SystemUI
 2014-12-08 19:17:45 +00:00
Eino-Ville Talvala
b71d983a7f am 4b905ad4: am 2ff214b6: Merge "Camera2: Add HDR scene mode for backwards compatibility." into lmp-mr1-dev 
* commit '4b905ad4368b9499238e975b670dd464586d6dd4':
  Camera2: Add HDR scene mode for backwards compatibility.
 2014-12-08 19:17:38 +00:00
Eino-Ville Talvala
cfdc0762e2 am 3e3ae5b7: am 0aaf843c: Merge "Fix docs build" into lmp-mr1-dev 
* commit '3e3ae5b71590ce4272afaa5db1a1ff1fb26f4f6b':
  Fix docs build
 2014-12-08 19:17:31 +00:00
Stuart Scott
6b0025ea7c am eb29c733: am d2028d90: Merge "Add mapping between RAT and Network Mode" into lmp-mr1-dev 
* commit 'eb29c7332c40aacfae3dfb77588b262a043c94ee':
  Add mapping between RAT and Network Mode
 2014-12-08 19:17:22 +00:00