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

177631 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
55338ad207 am 9c6e82e7: am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs automerge: 739d0a8c 
* commit '9c6e82e70e9ac2aecd369ee00fadb162b29d5456':
  docs: Add links to wearable support zip for ADT
 2014-12-10 21:57:53 +00:00
Quddus Chong
36e228070a am d7100111: am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs automerge: 20baf9e 
* commit 'd7100111514560a73fe5032f23e59c9e12b49aa1':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 21:57:45 +00:00
Andre Eisenbach
1ee272b064 am f60f29d0: am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev automerge: e832393 
* commit 'f60f29d060a538bd59b79ab8bd69ca6a31d26c29':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 21:57:40 +00:00
Eric Laurent
7a27bc3a76 am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 21:57:35 +00:00
Craig Mautner
38b5d057f0 am 93c5cf6a: am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '93c5cf6a6fc928dbfd4426b7bd0c7731bfac0ed2':
  Only one task within the stack should moveToBack
 2014-12-10 21:57:22 +00:00
Wale Ogunwale
cf3e91f5c2 am dc101a11: Always take an activity screenshot when pausing. automerge: 37f2718 automerge: bfa6059 
* commit 'dc101a11df864a36c4d8867b1e7bc4b4d39a90a0':
  Always take an activity screenshot when pausing.
 2014-12-10 21:33:04 +00:00
Amith Yamasani
e289aafae9 am f1ffc75c: Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 automerge: 7acd880 
* commit 'f1ffc75c9ec093ff780954f86c72a8a7069ca6cf':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 21:32:57 +00:00
Michael Wright
18a635c2a1 am 584674c3: am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev automerge: 422db53 
* commit '584674c39dad11be182ea3763df557d35554157b':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-10 21:32:45 +00:00
Jeff Sharkey
f16df1f34d am 236dc2c8: am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev automerge: 8650c35 
* commit '236dc2c81d9bb2a38b29dd1a4c7e23be25290ef2':
  Throw IOException when missing default ringtone.
 2014-12-10 21:32:39 +00:00
Joe Fernandez
fcc3a8ca1a am 41a635e0: (-s ours) am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs automerge: d36d2aa automerge: 509815b 
* commit '41a635e083c2b8e5fe9f5226645857dd83e400b2':
  :docs studio tips and tricks headings updates
 2014-12-10 21:32:35 +00:00
Geoff Mendal
7f29f2ed5a Merge "Import translations. DO NOT MERGE" 2014-12-10 20:41:31 +00:00
Geoff Mendal
1372d45f62 Import translations. DO NOT MERGE 
Change-Id: I76f2d3cafc025d0c1c34e0b3fbfc30c73ac3adba
Auto-generated-cl: translation import
 2014-12-10 11:35:51 -08:00
Nick Kralevich
7668e78601 resolved conflicts for merge of 3bae94d7 to master 
Change-Id: I381539b1494447d62290c492f2550840fe0b559c
 2014-12-10 11:03:40 -08:00
Ricardo Cervera
9c6e82e70e am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
automerge: 739d0a8c

* commit '739d0a8c6b08abcdc56d592e05f3ad7c01e5b5d2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 18:52:44 +00:00
Quddus Chong
d710011151 am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
automerge: 20baf9e

* commit '20baf9e47e8e89ff595a843de54867fb56a5580d':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 18:51:16 +00:00
Andre Eisenbach
f60f29d060 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
automerge: e832393

* commit 'e8323934c7dd01228b6550ac5dcad08999371a61':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 18:49:41 +00:00
Eric Laurent
093789755e resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
 2014-12-10 10:42:08 -08:00
Craig Mautner
93c5cf6a6f am 7438b57c: am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '7438b57c8d1e1649c51c570fe71aef861854730d':
  Only one task within the stack should moveToBack
 2014-12-10 18:04:52 +00:00
Mike Reed
d64d68d9c1 Merge "drawBitmapMatrix is deprecated, code work-around" 2014-12-10 18:02:12 +00:00
Craig Mautner
7438b57c8d am 2de55513: Merge "Only one task within the stack should moveToBack" 
* commit '2de55513f81b238ea42b2b36cbf61e8c1a475c45':
  Only one task within the stack should moveToBack
 2014-12-10 17:57:34 +00:00
Craig Mautner
2de55513f8 Merge "Only one task within the stack should moveToBack" 2014-12-10 17:51:32 +00:00
Ruben Brunk
fe6a5ae924 am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265 
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-10 17:44:36 +00:00
Ricardo Cervera
3ccdac411c am 0318a228: am 614889aa: am 4a6bafcb: am 12a24dc9: am 47fa6355: am 5155840b: Merge "docs: Adding links to material design videos" into lmp-docs 
* commit '0318a2281d08e7988cd66ad6c1ef7cd5385c2a15':
  docs: Adding links to material design videos
 2014-12-10 17:44:31 +00:00
Elliott Hughes
2e360a4485 am 2931058b: am a04cd35d: am 0aac16bb: am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docs 
* commit '2931058b77dea89d0d16f62106c44fae59a71562':
  Fix typo.
 2014-12-10 17:42:59 +00:00
smain@google.com
848b1c2201 am b1d41255: am 92b6011d: am 9ecc18e2: am 4267450e: am 780a2231: am 2023bec7: revise ADT migration message b/18668828 and fix broken link 
* commit 'b1d41255540256136b058726e0e3efb0439e713f':
  revise ADT migration message b/18668828 and fix broken link
 2014-12-10 17:42:54 +00:00
smain@google.com
b953e28e89 resolved conflicts for merge of cf8a8019 to master 
Change-Id: I7de213adcad766d113c47ae88d8494445c3036f7
 2014-12-10 09:40:09 -08:00
Rich Slogar
f988310cd5 am 05672d36: am 6b07b40d: am 00d635c0: am fbbab546: am d3d4fe4d: am 01ab09c2: docs:studio basics images updates 
* commit '05672d36fe040cc3e01eaf5914b878f03c059e7b':
  docs:studio basics images updates
 2014-12-10 17:35:06 +00:00
Joe Fernandez
349d5f028e am 4ddf70db: am 55677d8a: am 33a0828e: am 2a83bc2b: am 4c3b3324: am f4814b87: docs: Change Eclipse deprecation language on sdk/index.html page 
* commit '4ddf70db557cceaf8b19140026844ca9bdd9de00':
  docs: Change Eclipse deprecation language on sdk/index.html page
 2014-12-10 17:35:01 +00:00
Nick Kralevich
d5180176cb resolved conflicts for merge of ef7708f8 to master 
Change-Id: I9cc71d672141c23c0c2ed0a73d3e80aac10f3eb6
 2014-12-10 08:36:37 -08:00
Geoff Mendal
f549da5e33 Merge "Import translations. DO NOT MERGE" 2014-12-10 15:08:22 +00:00
Geoff Mendal
981a7e5a94 Import translations. DO NOT MERGE 
Change-Id: Ief67a9aee9b6caa15b87ae475088b69d19deddaf
Auto-generated-cl: translation import
 2014-12-10 07:05:35 -08:00
Geoff Mendal
e14d3cedaf Import translations. DO NOT MERGE 
Change-Id: I1b5385d1c459753eaea6ab4f305686ffb58592e9
Auto-generated-cl: translation import
 2014-12-10 06:35:44 -08:00
Ricardo Cervera
739d0a8c6b am 45ea5690: am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit '45ea56904a4c3698be6823ae278108056f3caae4':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:59:05 +00:00
Quddus Chong
20baf9e47e am 15e0f7fd: am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
* commit '15e0f7fdb3ffab4adad87bee0a3d987e892cf0bc':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:58:59 +00:00
Ricardo Cervera
45ea56904a am 5edaf136: am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit '5edaf136c8c3b45dded99e69fad2b5f2fb3a57f2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:53:14 +00:00
Quddus Chong
15e0f7fdb3 am bdb327ad: am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
* commit 'bdb327adb3faf3604becfe0174ef90ca6ff458c2':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:53:08 +00:00
Ricardo Cervera
5edaf136c8 am be80b984: am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit 'be80b984690ca3a6c54a8bab1d0bd8f15386c5a2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:37:58 +00:00
Quddus Chong
bdb327adb3 am c24c5797: am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
* commit 'c24c579770d9663174204e4e9413060bcb8e4a58':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:37:53 +00:00
Ricardo Cervera
be80b98469 am 0d8f1417: Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 
* commit '0d8f1417209ba0a38a97ae8e31b4ae87e0f1e7c2':
  docs: Add links to wearable support zip for ADT
 2014-12-10 03:22:59 +00:00
Quddus Chong
c24c579770 am 09e72628: Merge "docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient." into lmp-docs 
* commit '09e72628fc9e58659c18b1bbbb1a0ec8a5878221':
  docs: Updated GMS highlights for v6.5 (Nacho) to reflect removal of LocationClient, PlusClient, and ActivityRecognitionClient.
 2014-12-10 03:22:54 +00:00
Andre Eisenbach
e8323934c7 am c9149984: Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 
* commit 'c91499842fed63c55326e7e2a71b491f7c9315c1':
  Prevent NullPointerException in getStringValue if no value is set
 2014-12-10 02:36:10 +00:00
Andre Eisenbach
c91499842f Merge "Prevent NullPointerException in getStringValue if no value is set" into lmp-mr1-dev 2014-12-10 02:31:33 +00:00
smain@google.com
b2ea94146c followup conflict fix to Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3 
remove ADT from Help section of nav

Change-Id: Id55e043c205b3eae4012e284cd2802daded4df68
 2014-12-09 17:39:55 -08:00
Eric Laurent
5196dd04a0 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev 
automerge: 65bc112

* commit '65bc1125b4bdb0e982b37e76ab8a9a66adefd2e0':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 01:34:33 +00:00
Eric Laurent
65bc1125b4 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev 2014-12-10 01:33:09 +00:00
Dmitriy Ivanov
33f6c9f45d resolved conflicts for merge of bd5098e6 to master 
Change-Id: I5959958476c3edc16f9a13a06517f70be7ec32e3
 2014-12-09 17:22:31 -08:00
Wale Ogunwale
dc101a11df Always take an activity screenshot when pausing. automerge: 37f2718 
automerge: bfa6059

* commit 'bfa6059b78dfe0a40e71df055c60e431478a3e9d':
  Always take an activity screenshot when pausing.
 2014-12-10 01:00:52 +00:00
Wale Ogunwale
bfa6059b78 Always take an activity screenshot when pausing. 
automerge: 37f2718

* commit '37f271869ed9c9e9f0e7de7339017e0bb6719780':
  Always take an activity screenshot when pausing.
 2014-12-10 00:57:51 +00:00
Ricardo Cervera
0d8f141720 Merge "docs: Add links to wearable support zip for ADT" into lmp-docs 2014-12-10 00:56:15 +00:00
Wale Ogunwale
37f271869e Always take an activity screenshot when pausing. 
http://ag/261732 introduced an optimization where we only take
the activity screenshot if is is not the activity we took a
screenshot for last. This causes us to display a stale screenshot
for activities that change their display content (using fragments)
without going through the pause/resume cycle. It should be safe
to always take a screenshot when we are pausing since the code
path is only called once per pause/resume cycle.

Bug: 18682160
Change-Id: Ie5c43cfd806286808af4233c5917ae7071908ebb
(cherry picked from commit eacdf2ce04899b0a3abef55e4e7e1fe9c1649932)
 2014-12-10 00:44:28 +00:00