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

159674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
7651dcb921 Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev 2015-01-20 21:24:00 +00:00
Wale Ogunwale
92dd1abef4 Update restored task uid to match the package uid on current device. 
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.

Bug: 19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
 2015-01-20 12:52:07 -08:00
Ricardo Cervera
7c002d75b6 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 
automerge: 47e274c

* commit '47e274c56a0662e3e2aef24f2a458cc078e70fd8':
 2015-01-20 18:32:22 +00:00
Ricardo Cervera
47e274c56a am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 
automerge: 458f432

* commit '458f4326bdff638cefe175b179a487872cf678c1':
 2015-01-20 18:10:49 +00:00
Ricardo Cervera
458f4326bd am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':
 2015-01-20 18:03:50 +00:00
Ricardo Cervera
eada048add am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-20 17:57:45 +00:00
Geoff Mendal
2bc2a99406 Import translations. DO NOT MERGE 
Change-Id: If4c684beabdf14e6dad7c9584ac9b9cb0fb048d0
Auto-generated-cl: translation import
 2015-01-19 06:49:11 -08:00
Jinsuk Kim
5b8cb00b8a CEC: Process new options for CEC/MHL HAL 
1) Inform MHL HAL of OPTION_MHL_SERVICE_CONTROL at system
ready/standby event.

2) Call OPTION_CEC_SET_LANGUAGE with current system language info
for HAL to be able to respond to <Get Menu Language> while in standby
mode.

Bug: 19054079
Change-Id: I92c9f392a94f70e11157d20a33163ef2d8bc832f
 2015-01-19 02:22:05 +00:00
Jinsuk Kim
bbfec56dfc Merge "CEC: Make TV try to allocate logical address 0 first" into lmp-mr1-dev 2015-01-19 02:20:18 +00:00
Jinsuk Kim
d47abefc82 CEC: Make TV try to allocate logical address 0 first 
HDMI Spec says TV shall try to allocate TV() logical address, unlike
other kinds of devices that are recommended to use the previously
allocated one.

Also included are small changes:

- reply with 'can not provide source' if TV has no source to provide
- return the present device info if we have one at the given path

Bug: 19045081
Change-Id: Icf17cb581f0ef2274e252ec5665f80bb1c08b494
 2015-01-19 10:44:38 +09:00
Sanket Padawe
d2dd69ae8d Merge "Modify getDeviceId() to get device id independent of Subscription." into lmp-mr1-dev 2015-01-17 22:15:56 +00:00
Scott Rowe
c68ab86a8c am ae15e779: am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'ae15e779c0a0a9005292efb0f39729454429fa7f':
  docs: removing code captions
 2015-01-17 05:20:28 +00:00
Scott Rowe
278f5e2a63 am 49caa638: am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '49caa6386c1423ad9ced3e3ad983dd233a76e2e4':
  docs: Add screenshot
 2015-01-17 05:20:23 +00:00
Scott Rowe
ae15e779c0 am 224624e8: am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit '224624e8e68bd1debd0f76d1b614ae3bdc637cb2':
  docs: removing code captions
 2015-01-17 03:06:38 +00:00
Scott Rowe
49caa6386c am 78001f93: am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit '78001f9338b72876e95b7d25053b706804a21070':
  docs: Add screenshot
 2015-01-17 03:06:35 +00:00
Scott Rowe
224624e8e6 am c987ca05: Merge "docs: removing code captions" into lmp-docs 
* commit 'c987ca05010a8cc06572d5b04c93fb6404f8bf45':
  docs: removing code captions
 2015-01-17 02:28:51 +00:00
Scott Rowe
78001f9338 am ab18d6c8: Merge "docs: Add screenshot" into lmp-docs 
* commit 'ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
  docs: Add screenshot
 2015-01-17 02:28:47 +00:00
Scott Rowe
c987ca0501 Merge "docs: removing code captions" into lmp-docs 2015-01-17 01:31:53 +00:00
Scott Rowe
ab18d6c82e Merge "docs: Add screenshot" into lmp-docs 2015-01-17 01:31:15 +00:00
David Friedman
91678a69b2 am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:43:30 +00:00
David Friedman
ae71c8ea52 am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'e255cb0f9e0ecd5f0aa2c963f1a6d4c7029c85af':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:36:27 +00:00
David Friedman
e255cb0f9e am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 
* commit 'fa66fdd57a494bed0a92d9fb0aadf332395f371f':
  Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
 2015-01-17 00:30:18 +00:00
David Friedman
fa66fdd57a Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs 2015-01-17 00:23:30 +00:00
David Friedman
d28a49fb73 Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw 
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
 2015-01-16 15:42:26 -08:00
RoboErik
d5ff63ba0c Merge "Notify the system of all remote volume changes" into lmp-mr1-dev 2015-01-16 22:56:54 +00:00
Quddus Chong
2f63207d87 am a6491229: am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit 'a649122977a6f1c267329b9b67a692cabd839e98':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:35:03 +00:00
Joe Fernandez
35aecbe927 am cd500663: am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit 'cd50066386887148f99dce9b449bed588a354bb3':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:29:48 +00:00
Ricardo Cervera
7a2e85c83e am 9273b33f: am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '9273b33f6ecfa20ff524ae6fcb88f2586c79b6da':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:29:43 +00:00
Quddus Chong
a649122977 am 930ac01f: am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit '930ac01fd728067a79335e2983b870528c13a872':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:28:24 +00:00
Joe Fernandez
cd50066386 am 90d2aca7: am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '90d2aca7f05b2e2acf8a7bc37d8007074fdbdea5':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:23:22 +00:00
Ricardo Cervera
9273b33f6e am 73f36d47: am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit '73f36d47465da113f39270f4f9cf5d601aa0b585':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:23:19 +00:00
Quddus Chong
930ac01fd7 am de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 
* commit 'de0a87007b987a76af2ddd526dd473ad83fbb74b':
  docs: Fixed typos in Game Controller training code snippets. bug: 17959906
 2015-01-16 22:21:34 +00:00
Joe Fernandez
90d2aca7f0 am 217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 
* commit '217d145d49940d28a3c5914d94ce2e56f243301b':
  docs: adding studio-sample-in-editor.png file
 2015-01-16 22:15:25 +00:00
Ricardo Cervera
73f36d4746 am e229751d: docs: Add browseable Wearable Support Lib Javadoc 
* commit 'e229751d11692ede7fed3b56472f2d020767b412':
  docs: Add browseable Wearable Support Lib Javadoc
 2015-01-16 22:15:21 +00:00
Svet Ganov
830f39ad3c Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev 2015-01-16 22:12:56 +00:00
Quddus Chong
de0a87007b Merge "docs: Fixed typos in Game Controller training code snippets. bug: 17959906" into lmp-docs 2015-01-16 22:03:33 +00:00
Joe Fernandez
217d145d49 Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs 2015-01-16 21:58:37 +00:00
Craig Mautner
ac70b2d172 Merge "More debugging for bug 18201239." into lmp-mr1-dev 2015-01-16 20:56:58 +00:00
Craig Mautner
66c4a824b9 More debugging for bug 18201239. 
Fixes bug 19045133.

Change-Id: I2ef2b8600278ed91df59db4acf4740dac970ee3a
 2015-01-16 12:52:54 -08:00
Geoff Mendal
2c8e6daab7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-16 20:40:18 +00:00
Geoff Mendal
f1270cfb84 Import translations. DO NOT MERGE 
Change-Id: Ib02415ea924e876ae776b34ed271dcae2b9afbb1
Auto-generated-cl: translation import
 2015-01-16 12:37:30 -08:00
Rich Slogar
8f93abeb60 docs: adding studio-sample-in-editor.png file 
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
 2015-01-16 12:26:20 -08:00
Winson Chung
166cf980af Merge "DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 2015-01-16 20:09:40 +00:00
Joe Fernandez
fadcbc705f am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'b7ac4dff3d97865cde5d6876d30dde0a77848f25':
  docs: studio disk space requirements typo
 2015-01-16 19:55:52 +00:00
Joe Fernandez
478d4e86ff am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '0b596de9a4cc9b8d0694838f4b699c722d448bac':
  docs: link to sdk manager
 2015-01-16 19:51:08 +00:00
Ricardo Cervera
ddcc21610f am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit 'c12a3e35a4330d5b60ac652597a6875868d96e55':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 19:51:04 +00:00
Joe Fernandez
b7ac4dff3d am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'aafd29beb8d455fd825e2f0f0f8792b1ca6dc6ca':
  docs: studio disk space requirements typo
 2015-01-16 19:49:08 +00:00
Quddus Chong
03c15cf4c9 docs: Fixed typos in Game Controller training code snippets. 
bug: 17959906

Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
 2015-01-16 11:36:18 -08:00
Ricardo Cervera
e229751d11 docs: Add browseable Wearable Support Lib Javadoc 
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
 2015-01-16 11:18:10 -08:00
Joe Fernandez
0b596de9a4 am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit 'c6f70adf2439978954fefe00a9ff24135654ed52':
  docs: link to sdk manager
 2015-01-16 18:57:42 +00:00