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

156333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Libin.Tang@motorola.com
0499bb5de4 IMS:change enhanced 4g setting to store in setting db. 
Change-Id: I2ec37478e2bef5b15b157e490f75d5dda5f97117
 2014-10-15 16:12:39 -07:00
Dirk Dougherty
8ca0f84ea3 Merge "Doc change: Add diffs for l-preview -> API level 21." into lmp-dev 2014-10-15 22:40:19 +00:00
Geoff Mendal
7b5d78f890 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-15 22:38:39 +00:00
Marco Nelissen
c1fda12823 Also consider secondary storage when verifying paths 
Bug: 17673184
Bug: 17982103
Change-Id: Ief14c7776b02983191c46774fa7e4c76380de58d
 2014-10-15 15:36:50 -07:00
Geoff Mendal
90a1bd0769 Import translations. DO NOT MERGE 
Change-Id: I77f88b9cd7716f3dc5e432f943d015860018858a
Auto-generated-cl: translation import
 2014-10-15 15:19:49 -07:00
Geoff Mendal
ae3010b5ca Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-15 22:16:36 +00:00
Geoff Mendal
61dd94f71c am 512c2330: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '512c2330c652c56996bf3ef63ddad242752cebcd':
  Import translations. DO NOT MERGE
 2014-10-15 22:10:15 +00:00
Geoff Mendal
95d6d8c585 Import translations. DO NOT MERGE 
Change-Id: Ia14afe9895bf88d66edcadaed7885994c3a2a846
Auto-generated-cl: translation import
 2014-10-15 15:09:43 -07:00
Dirk Dougherty
6034230b29 Doc change: Add diffs for API level 21. 
Change-Id: I6efad4bb407dbfc7684a5651788e116d624e778e
 2014-10-15 15:06:50 -07:00
Geoff Mendal
512c2330c6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-15 22:02:00 +00:00
Dirk Dougherty
963dca1a5d Doc change: Add diffs for l-preview -> API level 21. 
Change-Id: Ie60fbe9ed5891dd87fd9ca53f126c4617e09d3bd
 2014-10-15 14:59:15 -07:00
Geoff Mendal
718ba70f6e Import translations. DO NOT MERGE 
Change-Id: I5026d19ec972e3853cbb858a56b4b80cd3ca82c5
Auto-generated-cl: translation import
 2014-10-15 14:59:09 -07:00
Geoff Mendal
e2a1f1cd88 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-15 21:52:24 +00:00
Craig Mautner
5d460b8871 Merge "Remove unnecessary logging." into lmp-dev 2014-10-15 21:48:52 +00:00
Geoff Mendal
89b5580b81 Import translations. DO NOT MERGE 
Change-Id: I5fc63b0e1cf68a8b5f17b46308abebaba76ce81c
Auto-generated-cl: translation import
 2014-10-15 14:37:19 -07:00
Eric Rowe
1b4a728ac6 Merge "Add CHANGE_NETWORK_STATE permission to bt tests" into lmp-dev 2014-10-15 21:35:32 +00:00
Craig Mautner
3d7485c172 Remove unnecessary logging. 
Change-Id: Ia5b5325707f2f02f2c585130938565065e974938
 2014-10-15 14:30:02 -07:00
Alan Viverette
274d24f18d am b70cfb91: Merge "Avoid saveLayer in RippleDrawable if the background won\'t draw" into lmp-mr1-dev 
* commit 'b70cfb9103b02e90409ba1f1bc334210f139774f':
  Avoid saveLayer in RippleDrawable if the background won't draw
 2014-10-15 21:21:59 +00:00
Alan Viverette
b70cfb9103 Merge "Avoid saveLayer in RippleDrawable if the background won't draw" into lmp-mr1-dev 2014-10-15 21:18:00 +00:00
Alan Viverette
ef71947fd3 Set content description on CalendarView day labels 
BUG: 17985867
Change-Id: I64fa9c757504fe7aebd8d5b7576ebe57e3a3e3fd
 2014-10-15 14:16:41 -07:00
Craig Mautner
e52791055c Merge "Move desired task to top if not already there." into lmp-dev 2014-10-15 21:13:58 +00:00
Craig Mautner
737fae2b2e Move desired task to top if not already there. 
Under certain circumstances when launching a new activity, the
topmost stack activity is moved to the front even though the
activity is being created in a different task.

This checks if the topmost stack task matches the desired
task and if not, moves the desired task to the top.

Also make activity dump ordering consistent.

Fixes bug 17721767.

Change-Id: I59397f31b629a208f3863887c57d6f6fb1f6e1f3
 2014-10-15 14:11:23 -07:00
Eric Rowe
500f7583ed Add CHANGE_NETWORK_STATE permission to bt tests 
Change-Id: Ie0a579de3b7d1163a8fe245eb377f21eeed048a3
 2014-10-15 14:06:30 -07:00
John Spurlock
b2344c81bc Merge "Leave zen when apps set ringer-mode = non-silent (normal/vibrate)." into lmp-dev 2014-10-15 21:04:33 +00:00
Jay Shrauner
60841fcb7b am 9e18d7ab: Merge "Remove unused onConferenceWith method" into lmp-mr1-dev 
* commit '9e18d7ab70eb581200afe0abbd1bb6e32f9e135d':
  Remove unused onConferenceWith method
 2014-10-15 20:52:52 +00:00
Andrew Lee
2cd596c6a2 am 4ef72f85: Merge "Add helper method for checking phone capabilities." into lmp-mr1-dev 
* commit '4ef72f85e0b5a8b9efac301577106afa4a8fd17a':
  Add helper method for checking phone capabilities.
 2014-10-15 20:52:44 +00:00
Evan Charlton
843e234318 Add WindowManager.aidl to AIDL list 
WindowManager.aidl has an inner class (WindowManager.LayoutParams)
which needs to be included, but slipped past the api/current.txt grep.

This affects the SDK only

Change-Id: I71bea4e602428ab588d17c5e57cbe08a1d6e9493
 2014-10-15 13:26:32 -07:00
Quddus Chong
ccd80045a3 docs: Added L API overview. 
Change-Id: Idd042b41a99f61faa6b011c2900210ed38b017b9
 2014-10-15 13:25:55 -07:00
Jay Shrauner
9e18d7ab70 Merge "Remove unused onConferenceWith method" into lmp-mr1-dev 2014-10-15 19:59:19 +00:00
RoboErik
c7be69f1d6 Merge "Don't call size on a null metadata" into lmp-dev 2014-10-15 19:48:50 +00:00
Andrew Lee
4ef72f85e0 Merge "Add helper method for checking phone capabilities." into lmp-mr1-dev 2014-10-15 19:29:57 +00:00
Adam Powell
9cefbda11e View measurement optimization 
If a view hasn't explicitly requested layout and it's asked to measure
with MeasureSpec.EXACTLY in both dimensions and sizes that match its
current measured size, the measure operation is a no-op.

This helps out a number of ViewGroups that perform initial speculative
measurements with AT_MOST or UNSPECIFIED followed by looping over
child views and measuring EXACTLY to lock in the final measurement
with perhaps some extra leftover space distributed. In practice this
happens a fair bit, especially for views high up in the view
hierarchy. This optimization allows ViewGroup measurement code to be a
little cleaner in not having to keep track of this on its own.

Change-Id: I88ff46a7d37aeda7a4cd16204b68cab0d051b341
 2014-10-15 12:20:36 -07:00
Tom Taylor
6d4f457546 Merge "Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager" into lmp-dev 2014-10-15 19:20:36 +00:00
RoboErik
421c9df7ff Don't call size on a null metadata 
bug:18002951
Change-Id: I3a2d2c781e7b235efbd8518d60eee7f44bbacd75
 2014-10-15 12:17:43 -07:00
Prashant Malani
c64522fb2e am 645e017c: (-s ours) Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev 
* commit '645e017ca54e654c34b131235e90589a7d92ce0c':
  DO NOT MERGE Add empty ArrayList check.
 2014-10-15 19:12:33 +00:00
Ricardo Cervera
7e50d9706c am dc1f3080: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs 
* commit 'dc1f308048a732572fae3cf92ddfe5cd943c0059':
  docs: Fixing notify link. Bug: 17571861
 2014-10-15 19:12:26 +00:00
Luan Nguyen
bff5c1932c am c07a288a: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs 
* commit 'c07a288a889ac88282118d4089e969f20c1aabe3':
  docs: Android Wear Design fixes
 2014-10-15 19:12:18 +00:00
smain@google.com
b3994c2e58 am e43bb6a9: am 075531ae: add the butterbar for L announce to Preview landing page 
* commit 'e43bb6a9ec8cd0841926e7df8cc738d5357814c1':
  add the butterbar for L announce to Preview landing page
 2014-10-15 19:12:05 +00:00
smain@google.com
2912627e00 am 6fbe299f: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 
* commit '6fbe299fa5bcc084cd69899afdc3c77767b7c1f5':
  update analytics event tracking calls to use new script bug: 16331906
 2014-10-15 19:11:43 +00:00
Nancy Chen
68a4192126 am 00bc5cf8: am 9faf13b4: Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 
* commit '00bc5cf896814f55db4dd27be72fe26bc48a0d0b':
  Add API method to extract subscription ID from phone account (1/3)
 2014-10-15 18:55:06 +00:00
Nancy Chen
00bc5cf896 am 9faf13b4: Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 
* commit '9faf13b47467916897cf5c019a3a74df871b8f65':
  Add API method to extract subscription ID from phone account (1/3)
 2014-10-15 18:50:38 +00:00
Jay Shrauner
2ec53ebbc6 Remove unused onConferenceWith method 
Never part of public API

Bug:17860628
Change-Id: Ib7c4f4c402bd29d82cc0b9e1f496496ea86efce1
 2014-10-15 11:48:04 -07:00
Nancy Chen
9faf13b474 Merge "Add API method to extract subscription ID from phone account (1/3)" into lmp-sprout-dev 2014-10-15 18:47:03 +00:00
Jim Miller
1a02efb124 am ce711c6d: am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit 'ce711c6d57732c3582da0828c0361f55381f4223':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:37:06 +00:00
Jim Miller
ce711c6d57 am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:31:32 +00:00
Jim Miller
09ba0da87f am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev 
* commit 'e7c325559d961f13c6df96803bca4747f41b27a4':
  Add a checkbox option to 'require password to decrypt'
 2014-10-15 18:26:59 +00:00
Jim Miller
e7c325559d Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev 2014-10-15 18:21:52 +00:00
Amith Yamasani
ecb7b899b0 am 5c8cafa6: am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '5c8cafa6143858f725dd1bb73da7ac9f8d8f8f5f':
  Fix admin policies in managed profiles
 2014-10-15 18:07:49 +00:00
Amith Yamasani
5c8cafa614 am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '01ddc75fc1e9ea28212512299132e9bdace60e05':
  Fix admin policies in managed profiles
 2014-10-15 17:54:34 +00:00
Amith Yamasani
01ddc75fc1 am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev 
* commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24':
  Fix admin policies in managed profiles
 2014-10-15 17:49:19 +00:00