Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
164,750 Commits 3 Branches 0 Tags
d98e7c1df774eb86a67310f5cbc0dbdd91f33c19
Commit Graph

164750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Ricardo Cervera
93f94c2ca5 resolved conflicts for merge of e8f6bd48 to lmp-dev 
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
 2015-01-16 09:54:30 -08:00
Ricardo Cervera
97c4ba9862 docs: Added info on noHistory and onActivityResult(). 
Bug: 13807256

Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83

Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
 2015-01-16 09:24:30 -08:00
Ricardo Cervera
e8f6bd4846 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014 am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-16 17:14:44 +00:00
Kenny Guy
10dd6eeff8 am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 
* commit 'fd846dfbf1d1e51f8366a473d3b6f5722c06d77c':
  Sync file before using JournaledFile commit.
 2015-01-16 11:24:56 +00:00
Kenny Guy
fd846dfbf1 Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev 2015-01-16 11:21:19 +00:00
Jinsuk Kim
6821efc66f am 2ab6d9ff: CEC: Do not send <Active Source> when TV wakes up by one touch play 
* commit '2ab6d9fff36836c71bc0ee4afa25c11b48a9bd99':
  CEC: Do not send <Active Source> when TV wakes up by one touch play
 2015-01-16 08:23:05 +00:00
Jinsuk Kim
2ab6d9fff3 CEC: Do not send <Active Source> when TV wakes up by one touch play 
TV should respect the device that wakes up TV by one touch play
to keep its active source status by not sending <Active Source>.

Bug: 19039773

Change-Id: I0b27e95dcf986df90b25cc2a1891acd82940f13e
 2015-01-16 17:18:36 +09:00
Jinsuk Kim
2bf3b2c49c am 964c00dd: CEC: Buffer Cec messages while allocating logical address 
* commit '964c00dd7b270dcf80aea3450bbfc23502965cce':
  CEC: Buffer Cec messages while allocating logical address
 2015-01-16 08:17:07 +00:00
Jinsuk Kim
964c00dd7b CEC: Buffer Cec messages while allocating logical address 
CEC messages arriving before logical address allocation was being
discarded. Handles them by introducing a message buffer class
to keep them till the address allocation is finished.

Also updated per-device message buffer to use copied version of
messages list for iterating to avoid the possible concurrent
modification exception.

Bug: 18896770
Change-Id: Ifb74fd265510de6dde322e0b3bc5b504fecb4daa
 2015-01-16 16:18:32 +09:00
Christopher Tate
cf96260118 Don't write widget metadata to backup unless it's new/changed 
Redundant backup traffic is bad.  Don't commit the widget metadata payload
(or the deletion operation for it) unless the widget state of the app has
actually changed since the last backup.

Bug 19003911

Change-Id: I93819173c0e2357b030d9e2b3d2ee57f2410bb57
 2015-01-15 17:37:06 -08:00
Rich Slogar
b43a7eefb7 am 3212c3aa: Merge "docs: studio support library revisions update" into lmp-docs 
* commit '3212c3aa226f8cc7cf54e72772a001906fd4d7c3':
  docs: studio support library revisions update
 2015-01-16 00:58:57 +00:00
Dirk Dougherty
7b7f074f28 am d1ff8605: Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 
* commit 'd1ff86058a06874d6d607dea951b34370e053654':
  Doc change: Add new analytics information to Distribute.
 2015-01-16 00:58:53 +00:00
Rich Slogar
3505303a3a am 3b7dbd66: Merge "docs: build link update" into lmp-docs 
* commit '3b7dbd66d8d8df89bb4700bfdfaf86f264ff7ea4':
  docs: build link update
 2015-01-16 00:50:15 +00:00
Rich Slogar
f1feda36fb am 485b9566: Merge "docs: Plugin reference update" into lmp-docs 
* commit '485b9566a9fc98be8b4dee40ddca43690de1a465':
  docs: Plugin reference update
 2015-01-16 00:50:12 +00:00
Rich Slogar
f38122dae0 am 48fc1d7b: Merge "docs: studio sample procedure update" into lmp-docs 
* commit '48fc1d7ba7e3e2c0efd71b3b7ed29997d3454857':
  docs: studio sample procedure update
 2015-01-16 00:50:08 +00:00
Rich Slogar
3212c3aa22 Merge "docs: studio support library revisions update" into lmp-docs 2015-01-16 00:43:57 +00:00
Dirk Dougherty
d1ff86058a Merge "Doc change: Add new analytics information to Distribute." into lmp-docs 2015-01-16 00:41:56 +00:00
Dirk Dougherty
27ab5a079b Doc change: Add new analytics information to Distribute. 
Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84
 2015-01-15 16:28:13 -08:00
Rich Slogar
3b7dbd66d8 Merge "docs: build link update" into lmp-docs 2015-01-16 00:27:50 +00:00
Rich Slogar
485b9566a9 Merge "docs: Plugin reference update" into lmp-docs 2015-01-16 00:27:05 +00:00
Rich Slogar
48fc1d7ba7 Merge "docs: studio sample procedure update" into lmp-docs 2015-01-16 00:26:39 +00:00
Rich Slogar
d7beb6d3eb docs: studio support library revisions update 
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
 2015-01-15 16:20:44 -08:00
Geoff Mendal
d3403e45d6 am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'faf92d725649337a29312603dc8c10a3f0ee103a':
  Import translations. DO NOT MERGE
 2015-01-15 23:45:54 +00:00
Geoff Mendal
faf92d7256 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2015-01-15 23:39:49 +00:00
Deepanshu Gupta
b6864ac6cd Resource resolution fixes. 
1. Some dynamic ids weren't created and resulted in ResourceNotFound
exceptions.
2. Prevent NPE if a style attribute (eg. style="?attr/foo"), which
cannot be resolved, is resolved. This effectively, also results in
making it harder to catch misconfigured themes. However, support
library does it, and we don't want to throw errors when the library is
working as intended.

Change-Id: I731d8fb9209eb72b464d235d1072d416e132970b
 2015-01-15 15:25:49 -08:00
Craig Mautner
41d5423738 am 92cf3608: Merge "Debug for bug 18201239." into lmp-mr1-dev 
* commit '92cf3608b8f171f84f74ab1f7193a6a816063d14':
  Debug for bug 18201239.
 2015-01-15 23:24:40 +00:00
Craig Mautner
92cf3608b8 Merge "Debug for bug 18201239." into lmp-mr1-dev 2015-01-15 23:18:40 +00:00
Geoff Mendal
116f90c895 Import translations. DO NOT MERGE 
Change-Id: I4580b358133cd261985459a26a1c4bc36a14d630
Auto-generated-cl: translation import
 2015-01-15 15:14:15 -08:00
Chris Craik
0de2eca5fc am 112e35b4: Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 
* commit '112e35b4641a1a8cad3616c8209ab47f03f9ab67':
  Update generationId on bitmaps when decoded into by BitmapRegionDecoder
 2015-01-15 23:08:11 +00:00
Chris Craik
112e35b464 Merge "Update generationId on bitmaps when decoded into by BitmapRegionDecoder" into lmp-mr1-dev 2015-01-15 23:04:15 +00:00
Craig Mautner
9776ad41b9 Debug for bug 18201239. 
Change-Id: I06281bd76b8c1d887324d3efa39b6cb11c9e71ae
 2015-01-15 14:38:39 -08:00
Alan Viverette
dbe5453349 am 77e1f7a2: Merge "Ensure scroll assets are drawn with correct opacity" into lmp-mr1-dev 
* commit '77e1f7a27bfdd040b00d7ec97440d3cb1e5b79a1':
  Ensure scroll assets are drawn with correct opacity
 2015-01-15 22:32:27 +00:00