Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,605 Commits 3 Branches 0 Tags
38b5d057f08a1a05df44f94de1053f74739c6677
Commit Graph

177605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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 eacdf2ce04)
 2014-12-10 00:44:28 +00:00
Amith Yamasani
f1ffc75c9e Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev automerge: dad85a6 
automerge: 7acd880

* commit '7acd8802d7c14323dfc2a5e68b1d2a82f9d3f5c0':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:35:52 +00:00
Amith Yamasani
7acd8802d7 Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 
automerge: dad85a6

* commit 'dad85a6c4bf51c126978d584703a5320be7f396c':
  Allow user shutdown broadcasts to be delivered
 2014-12-10 00:33:24 +00:00
Amith Yamasani
dad85a6c4b Merge "Allow user shutdown broadcasts to be delivered" into lmp-mr1-dev 2014-12-10 00:30:31 +00:00
Wale Ogunwale
c73923bcf9 Merge "Always take an activity screenshot when pausing." 2014-12-10 00:09:15 +00:00
Michael Wright
584674c39d am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev 
automerge: 422db53

* commit '422db53f8cf2fc69cdf892cb42f33021f510f207':
  Don't try to scale the bitmaps for null MediaMetadata.
 2014-12-10 00:01:23 +00:00
Jeff Sharkey
236dc2c81d am 1102e712: Merge "Throw IOException when missing default ringtone." into lmp-mr1-dev 
automerge: 8650c35

* commit '8650c358fb44b943dd74751742333bf1cebf7b8e':
  Throw IOException when missing default ringtone.
 2014-12-09 23:59:58 +00:00
Joe Fernandez
41a635e083 am a82fc60c: am 6d481852: am b35a509d: Merge ":docs studio tips and tricks headings updates" into lmp-docs automerge: d36d2aa 
automerge: 509815b

* commit '509815b8a7059fbe67bd44c0b071a1e96977ce60':
  :docs studio tips and tricks headings updates
 2014-12-09 23:58:36 +00:00
Derek Sollenberger
8386aee175 am 1f78b336: am 497499b1: am 04c2bf4f: Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev 
* commit '1f78b3364f0e39db912d898187bed0195d9319cd':
  Remove unnecessary/erroneous reference counting
 2014-12-09 23:49:27 +00:00
John Reck
af878b91f9 am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '389baa395125d5ae5aac3b9d2f98457dde09da26':
  Fix issue with RNA destruction mid-animation
 2014-12-09 23:49:22 +00:00
Jason Monk
dc6b35f54e am 3c8e51ab: am 7940f55c: am 6f6bc554: Merge "Push inet condition to new MobileSignalControllers" into lmp-mr1-dev 
* commit '3c8e51ab8dd0b9fb58c3c64768576841dbce4c3e':
  Push inet condition to new MobileSignalControllers
 2014-12-09 23:49:09 +00:00
Pavel Zhamaitsiak
fd3090aefb am 8bd0b516: am bf7b4d94: am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev 
* commit '8bd0b516751df764b9c47fa64e31d7125e0942f0':
  Added configuration to determine whether VoLTE requires provisioning.
 2014-12-09 23:49:05 +00:00
Pavel Zhamaitsiak
1263d0cd39 am 6549e9be: am 1e989df5: am 49b00a9c: Merge "IMS: change getMasterValue to getProvisionedValue." into lmp-mr1-dev 
* commit '6549e9be44d2370b624079c0a8ead95c9588afb7':
  IMS: change getMasterValue to getProvisionedValue.
 2014-12-09 23:49:00 +00:00
Pavel Zhamaitsiak
4ef46266d3 am 863fb4dd: am d2762ca9: am 14370741: Merge "IMS: add ImsConfig api to get volte provisioned value." into lmp-mr1-dev 
* commit '863fb4ddcac01849b66025e202302b8e1431d7e9':
  IMS: add ImsConfig api to get volte provisioned value.
 2014-12-09 23:48:55 +00:00
Selim Cinek
558eb39f0f am 90c4a299: am e2389908: am 24232396: Merge "Fixed accessibility for the pin input view on keyguard." into lmp-mr1-dev 
* commit '90c4a299a879c7f996b4b882d48b8be61263417f':
  Fixed accessibility for the pin input view on keyguard.
 2014-12-09 23:48:35 +00:00
Adrian Roos
c3c22399bc am 4816e1c5: am a7065ea3: am c3642ef5: Merge "Revert "Add overscan insets to surface frame dimensions in WallpaperService."" into lmp-mr1-dev 
* commit '4816e1c51922b10a2fea9087c858aff4a117d89b':
  Revert "Add overscan insets to surface frame dimensions in WallpaperService."
 2014-12-09 23:48:26 +00:00
Adrian Roos
0b85b9d267 am 9c69c319: am 87427ce5: am 456e6674: Merge "Revert "Fix calculation of overscan insets in WindowState."" into lmp-mr1-dev 
* commit '9c69c3199637d33d2db754f53a3f3161b7df7153':
  Revert "Fix calculation of overscan insets in WindowState."
 2014-12-09 23:48:16 +00:00
Alan Viverette
f1d6706fb4 am c5d71c67: am 60abe259: am 6ef76c60: Merge "Fix default value of AnimationDrawable\'s one shot property" into lmp-mr1-dev 
* commit 'c5d71c67dfbcd0d80ee1fa453e027ea642542fc3':
  Fix default value of AnimationDrawable's one shot property
 2014-12-09 23:47:27 +00:00
Wink Saville
189c180857 am 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-dev 
* commit '7a4df2b7d8fc162881dd482fb13fe85c780d0351':
  Add subId as parameter for get/setDataEnabled.
 2014-12-09 23:47:19 +00:00
Jeff Sharkey
1ca0ea6b7c am b97633c1: am 5d662a82: am 2f4ced30: Merge "Consistent result when signatures don\'t match." into lmp-mr1-dev 
* commit 'b97633c14da555d89dac7eadbf6e351d82281614':
  Consistent result when signatures don't match.
 2014-12-09 23:46:59 +00:00
Craig Mautner
0360f2a158 am 40c5c0ef: am 74a66013: am f71f5e89: Merge "[ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked." 
* commit '40c5c0ef16462668fb13717f59254f8696eac127':
  [ActivityManager] fix NPE in ActivityStack.resetTargetTaskIfNeededLocked.
 2014-12-09 23:46:49 +00:00
Elliott Hughes
de472a53ac am d50a5e74: am afc5b22c: am da30b545: Merge "Fix typo." 
* commit 'd50a5e7486432f7554f5135ac0609531d0fa8663':
  Fix typo.
 2014-12-09 23:46:44 +00:00