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

173346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
3891ce7320 am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '2c8e6daab7158ee2a5fd3eff0cd5f5d61961fa27':
  Import translations. DO NOT MERGE
 2015-01-16 20:46:48 +00: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
57653fc4a4 am 898290af: am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '898290afd55733b09a98eb15f6c71d6aaad75072':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:22:44 +00:00
Winson Chung
898290afd5 am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '166cf980afafb83add7479cfeb3a8e0283cfee81':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:15:30 +00:00
Joe Fernandez
8871470ced am 5444e342: am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit '5444e342c23e65d5efa3e9ef2b25cf0c7bfad468':
  docs: studio disk space requirements typo
 2015-01-16 20:12:31 +00: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
5444e342c2 am fadcbc70: am b7ac4dff: am aafd29be: am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit 'fadcbc705f8669ce5276089da466bd08f8bb11e1':
  docs: studio disk space requirements typo
 2015-01-16 20:05:37 +00:00
Joe Fernandez
b5e3d2b043 am 5d320493: am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '5d320493cb7605dcc579e9a9e3ee2bb5537413c4':
  docs: link to sdk manager
 2015-01-16 20:02:51 +00:00
Ricardo Cervera
a7bd93363f am de89f449: am ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit 'de89f449a7159370b674f1c7cadf5558af0ef9e2':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 20:02:45 +00:00
Joe Fernandez
5d320493cb am 478d4e86: am 0b596de9: am c6f70adf: am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit '478d4e86ffc98c4d4a83efebe651d2e06e6af6d2':
  docs: link to sdk manager
 2015-01-16 19:57:35 +00:00
Ricardo Cervera
de89f449a7 am ddcc2161: am c12a3e35: am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit 'ddcc21610ffb756a610b29aa9bfcbbb4cb5c94ca':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 19:57:31 +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
Ricardo Cervera
c12a3e35a4 am 85bfcbd3: am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit '85bfcbd3e2367768c1d026cbba6fe0fa9a6b2dae':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 18:57:39 +00:00
Joe Fernandez
aafd29beb8 am 8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs 
* commit '8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4':
  docs: studio disk space requirements typo
 2015-01-16 18:56:25 +00:00
Joe Fernandez
c6f70adf24 am c84021ba: Merge "docs: link to sdk manager" into lmp-docs 
* commit 'c84021ba99d9326b016120a1d7aab4ee551bcce9':
  docs: link to sdk manager
 2015-01-16 18:52:12 +00:00
Ricardo Cervera
85bfcbd3e2 am 97c4ba98: docs: Added info on noHistory and onActivityResult(). 
* commit '97c4ba9862006e2c9f4cea07f55dc7120d305e5a':
  docs: Added info on noHistory and onActivityResult().
 2015-01-16 18:52:08 +00:00
Joe Fernandez
8304b8b9ce Merge "docs: studio disk space requirements typo" into lmp-docs 2015-01-16 18:49:28 +00:00
Joe Fernandez
c84021ba99 Merge "docs: link to sdk manager" into lmp-docs 2015-01-16 18:47:54 +00:00
Ricardo Cervera
1e59b338e6 am 08314642: am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '083146428420dd3daa887d6e9c019e747a604cb5':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:47:08 +00:00
Ricardo Cervera
0831464284 am 90312d80: am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '90312d808f4a5181b5cb99c78e64b7e5d1465895':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:41:59 +00:00
Ricardo Cervera
90312d808f am 22878790: am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '2287879039556ad3c8fce58974e2396b4a2dab45':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:36:45 +00:00
Ricardo Cervera
2287879039 am 93f94c2c: resolved conflicts for merge of e8f6bd48 to lmp-dev 
* commit '93f94c2ca5bf23533fc5a9bd70a4795584d20618':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 18:29:25 +00:00
Rich Slogar
39389af4f1 am f5af4a1e: am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit 'f5af4a1e34811730b1670ce686948e8dc182936b':
  docs: studio support library revisions update
 2015-01-16 18:17:57 +00:00
Dirk Dougherty
05eb205503 am 8559b145: am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit '8559b145e69f0abd3fa1ae3dd23d253c69032a86':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:17:51 +00:00
Rich Slogar
cbe297d4d0 am e1a7b400: am a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit 'e1a7b400ad0c3da1ff2c544f3ee7245ab62649dd':
  docs: build link update
 2015-01-16 18:17:45 +00:00
Rich Slogar
7d8a43f233 am cd0bdc35: am ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'cd0bdc35eb0dc04f615ae94626dd9b01e7ab2890':
  docs: Plugin reference update
 2015-01-16 18:17:40 +00:00
Rich Slogar
20e7ab8667 am d6ed0384: am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'd6ed0384bf75f23f4184eb92297a4ff8b7f5c090':
  docs: studio sample procedure update
 2015-01-16 18:17:33 +00:00
Svet Ganov
893d6fe48d Fixing a memory leak: activities are leaked. 
TextLine was not fully cleared before recycling it which leads to
activity leaks if the activity happens: to register a text watcher.

bug:19045507

Change-Id: Ife0f7ce29865bd30ca2dfe8795023f51f275d659
 2015-01-16 18:14:36 +00:00
Rich Slogar
f5af4a1e34 am 8a7f20f5: am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit '8a7f20f5a4d83580470133a9a325a66edbb7363e':
  docs: studio support library revisions update
 2015-01-16 18:11:01 +00:00
Dirk Dougherty
8559b145e6 am f83ae5cd: am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit 'f83ae5cd59ed36dd2cd26b88f29582be08c1a134':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:10:56 +00:00
Rich Slogar
e1a7b400ad am a84faf0f: am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit 'a84faf0f154bb1097c3206df5710da739dcd03f7':
  docs: build link update
 2015-01-16 18:10:50 +00:00
Rich Slogar
cd0bdc35eb am ab8a5a0e: am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'ab8a5a0ea8f9334b997e11c80cba71d024fb8803':
  docs: Plugin reference update
 2015-01-16 18:10:45 +00:00
Rich Slogar
d6ed0384bf am d15015d2: am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'd15015d206cc3feb3c5a8f6327f71d16432ceca0':
  docs: studio sample procedure update
 2015-01-16 18:10:40 +00:00
Chris Craik
a2e1630b1e am 996d3974: am ed35f5c7: Merge "Fast loadInverse() implementation for the common case" 
* commit '996d39743a73cc37fb888779d52323743f50c666':
  Fast loadInverse() implementation for the common case
 2015-01-16 18:07:23 +00:00
Rich Slogar
8a7f20f5a4 am b43a7eef: am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit 'b43a7eefb75b2a6397d738055389567e1faa21d9':
  docs: studio support library revisions update
 2015-01-16 18:03:41 +00:00
Dirk Dougherty
f83ae5cd59 am 7b7f074f: am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit '7b7f074f282e551439b0b3c40a4ccb44d2981006':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 18:03:36 +00:00
Rich Slogar
a84faf0f15 am 3505303a: am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit '3505303a3aa113058bca58a1cdf3c84449b6712e':
  docs: build link update
 2015-01-16 18:03:32 +00:00
Rich Slogar
ab8a5a0ea8 am f1feda36: am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit 'f1feda36fbaebf22bf3e06d05ae186ada39a3e1e':
  docs: Plugin reference update
 2015-01-16 18:03:28 +00:00
Rich Slogar
d15015d206 am f38122da: am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit 'f38122dae0a344bc8abe3eaed7322ea3675b05f5':
  docs: studio sample procedure update
 2015-01-16 18:03:23 +00:00
Chris Craik
996d39743a am ed35f5c7: Merge "Fast loadInverse() implementation for the common case" 
* commit 'ed35f5c788d263c0b4754908b6d5cbb2f5a48caa':
  Fast loadInverse() implementation for the common case
 2015-01-16 18:01:39 +00:00
RoboErik
9c5b7cb048 Notify the system of all remote volume changes 
If a volume change occurred because it was sent through the MediaController directly
it wasn't showing the system's volume UI. This fixes things so the volume slider gets
shown for all volume requests with the SHOW_UI flag set.

bug:19036130
Change-Id: I1f7cb2e03386e2f3f7bc448cb4c38a71573775ff
 2015-01-16 17:57:33 +00:00
Chris Craik
ed35f5c788 Merge "Fast loadInverse() implementation for the common case" 2015-01-16 17:55:40 +00:00