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

140886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
fa8e81135a am d2b869d0: revisions to the app structure design guide 
* commit 'd2b869d052e65958545f2dc49c3eef8ff0066280':
  revisions to the app structure design guide
 2014-06-28 02:32:24 +00:00
Robert Ly
49ba77b441 am 4c42ab4b: (-s ours) Merge "Revert "Add api 20 to list used by reference docs."" into klp-modular-dev 
* commit '4c42ab4ba59d75eca4883ece2944c30ca36b760f':
  Revert "Add api 20 to list used by reference docs."
 2014-06-28 02:32:19 +00:00
Robert Ly
684abbb448 am e774eb93: (-s ours) Merge "Add api 20 to list used by reference docs." into klp-modular-dev 
* commit 'e774eb939875c02135c7ce9af8e81322a7c0ab59':
  Add api 20 to list used by reference docs.
 2014-06-28 02:26:16 +00:00
smain@google.com
d2b869d052 revisions to the app structure design guide 
Change-Id: I15e68e454180b848db81791350ba7985817c0930
 2014-06-27 18:43:50 -07:00
Jim Miller
f41fc9664f Add fingerprint detection support to Keyguard. 
Tested:
- power-on with fingerprint sensor
- dismiss bouncer with fingerprint
- fingerprint to enter trusted state

Change-Id: I6aab7591d370412a143fe219a1575b2719a4de96
 2014-06-28 01:11:20 +00:00
Ying Wang
079d13e246 Add target to build System API docs. 
Also generate system_api.txt.

Change-Id: I413f7b3e455643450f959088dfabbc47296e0189
 2014-06-27 17:12:31 -07:00
Baligh Uddin
5aac7f2429 am ab073359: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit 'ab07335962f2b4d34e66bc49d1868b776ecd15ac':
  Import translations. DO NOT MERGE
 2014-06-28 00:00:24 +00:00
smain@google.com
323d0c56aa am 67421351: Merge "fix links to wear downloads" into klp-modular-dev 
* commit '67421351cc6fd99aef741bb3bc2599bcb1288d1d':
  fix links to wear downloads
 2014-06-27 22:57:57 +00:00
John Spurlock
eb8d1be6ac Add a BIND_DREAM_SERVICE signature-level permission. 
Starting in api 21, will be required to bind to a
declared dream or doze service.

Also added to aapt dump badging output.

Bug:15862654
Change-Id: Ifa0a594eeecf21e6146176c7810a847e1d08fe3b
 2014-06-27 18:33:42 -04:00
Robert Ly
00a05a902f am 6ebcfb87: docs: notif image 
* commit '6ebcfb87b8111ee7110aeade6fba35e1862528da':
  docs: notif image
 2014-06-27 18:17:19 +00:00
Robert Ly
6ebcfb87b8 docs: notif image 
Change-Id: I2ee3e1da39297f74c8142875c3e71fb0953f5a46
 2014-06-27 11:12:04 -07:00
Robert Ly
b76f6afeca am 137d9da3: Merge "docs: fix images for notifications" into klp-modular-dev 
* commit '137d9da3aab652dccc82f4b5741d1c48b8b6cfe9':
  docs: fix images for notifications
 2014-06-27 18:03:41 +00:00
Robert Ly
a1180f7b72 am 5627b521: Merge "fix build" into klp-modular-dev 
* commit '5627b521e058058b2496a076256b727e0635ea88':
  fix build
 2014-06-27 17:21:18 +00:00
Robert Ly
672b1d13c9 am ba102925: Merge "more doc fixes for notifcations and wear" into klp-modular-dev 
* commit 'ba1029257999fbfc6c7741d05cee10b8f2036f2f':
  more doc fixes for notifcations and wear
 2014-06-27 17:13:40 +00:00
Scott Main
7b5abd15ab Merge "docs: fix L Preview G+ links (permanently)" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Joe Fernandez
f50f51cfbd docs: fix L Preview G+ links (permanently) 
Change-Id: I699ae07a977495a23c3cb0f440f90c856bc17a3e
 2014-06-27 17:00:59 -07:00
Baligh Uddin
65caf07805 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-27 16:52:20 +00:00
Robert Ly
5627b521e0 Merge "fix build" into klp-modular-dev 2014-06-27 16:52:20 +00:00
Robert Ly
af0ce935c3 fix build 
Change-Id: I66278269f8f02358c6d2529ef8839eb1ea42fdc4
 2014-06-27 10:13:58 -07:00
Robert Ly
939765f842 more doc fixes for notifcations and wear 
Change-Id: I9f0d168a8ebafb778924919766910b79504ebf68
 2014-06-27 10:07:03 -07:00
Dirk Dougherty
7ecb89fc1e Merge "Change card title for admob." into klp-modular-dev 2014-06-27 15:56:14 +00:00
Dirk Dougherty
8da8820a70 Change card title for admob. 
Change-Id: Ia4b4eaf7bbd54e9c546f740a5095431081d1ebd9
 2014-06-27 15:59:15 -07:00
Dirk Dougherty
14ec9adefa Merge "Doc change: API diff 20." into klp-modular-dev 2014-06-27 15:56:14 +00:00
Dirk Dougherty
1663876b5a Doc change: API diff 20. 
Change-Id: I1d3e00c1e62568c04abe6531819e75873df235c0
 2014-06-27 16:44:11 -07:00
Robert Ly
e774eb9398 Merge "Add api 20 to list used by reference docs." into klp-modular-dev 2014-06-27 15:56:14 +00:00
Dirk Dougherty
99296a12c0 Add api 20 to list used by reference docs. 
Change-Id: Icdf0e9238846f943db527becde92d38f362a9f32
 2014-06-27 15:44:19 -07:00
Baligh Uddin
850bf628a4 Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 2014-06-27 15:56:14 +00:00
Robert Ly
034bd9cd58 am af19c795: Merge "fix gmscore preview isntructions" into klp-modular-dev 
* commit 'af19c795e275b1e7d16fad351b3a14f74ef29088':
  fix gmscore preview isntructions
 2014-06-27 14:35:28 +00:00
smain@google.com
f106d5279f am 3822bf89: change the G+ community link 
* commit '3822bf8935310f8f94a534b986a2af935336d7e8':
  change the G+ community link
 2014-06-27 01:19:21 +00:00
smain@google.com
3822bf8935 change the G+ community link 
Change-Id: I68d453062232b739c3fdaee193eb9a20cd03d8f8
 2014-06-26 18:12:51 -07:00
Ricardo Cervera
eb63c4cd6e am cf54f881: docs: Replaced image in L Preview material docs 
* commit 'cf54f881aced94aec5df3b956cfc6b380cbc6b87':
  docs: Replaced image in L Preview material docs
 2014-06-27 01:03:39 +00:00
Ricardo Cervera
cf54f881ac docs: Replaced image in L Preview material docs 
Change-Id: I7db905f0fc8ae2bf9826d74bc7030d5a41cd2859
 2014-06-26 17:53:12 -07:00
Robert Ly
63234bf7ab Merge "Revert "add API reference docs filtering for level 20"" into klp-modular-dev 2014-06-26 23:50:27 +00:00
Robert Ly
7b7d2ac12d Revert "add API reference docs filtering for level 20" 
This reverts commit 7d7d4d6b86bdbfc54c63830351cf8d2f3830b68a.

Change-Id: I41e89bf297cb11db62601b3df0e6c655d7579007
 2014-06-29 23:49:46 +00:00
Robert Ly
7d7d4d6b86 add API reference docs filtering for level 20 
Change-Id: Iaab9d0965511d0394e7be29adb0fbcfd2904b857
 2014-06-29 16:39:06 -07:00
Robert Ly
6fff230d64 Merge "docs : fix broken links" into klp-modular-dev 2014-06-26 23:50:27 +00:00
Robert Ly
cfe7582a11 docs : fix broken links 
Change-Id: I75d8cbe8abe904bba44cc64d5557c8e14060cb8a
 2014-06-29 16:38:21 -07:00
Robert Ly
4d329a8f12 Merge "add API reference docs filtering for level 20" into klp-modular-dev 2014-06-26 23:40:51 +00:00
Chris Craik
155854f598 Merge "Remove isRecording() method from renderers" 2014-06-26 23:40:51 +00:00
Chris Craik
f23b25abfb Remove isRecording() method from renderers 
DisplayListRenderer is all that's accessed from java, and is entirely
separate from OpenGLRenderer now.

Change-Id: Ie733be71520c13fdb55dfe3522bb445ae2b50ac1
 2014-06-27 17:49:52 -07:00
smain@google.com
d4e3cdde83 am 323d0c56: am 67421351: Merge "fix links to wear downloads" into klp-modular-dev 
* commit '323d0c56aad7f65fd9c466ae58ae1a464525e98e':
  fix links to wear downloads
 2014-06-27 23:06:40 +00:00
Craig Mautner
97f82fda0b Merge "Add logging to TaskPersister restore." 2014-06-27 15:56:14 +00:00
Craig Mautner
77b04267c6 Add logging to TaskPersister restore. 
Solve tasks not being restored.

Fixes bug 15935752.

Change-Id: Ia3dd50072ac8255bcc37812a0639545b60f5d06f
 2014-06-27 15:28:01 -07:00
Nancy Chen
44c76c97bc Merge "Change the framework api for a constant in CallLog.Calls" 2014-06-26 23:50:27 +00:00
Nancy Chen
284660104f Change the framework api for a constant in CallLog.Calls 
For SUBSCRIPTION_COMPONENT_NAME from "component_name" to
"subscription_component_name"

Bug: 15473965
Change-Id: Ic56f623a048d2f4a59a631b02e61db46678df440
 2014-06-27 17:02:15 -07:00
Nancy Chen
5ffbfccea0 Add Subscription field to Call-related framework objects 
Getter and setter methods for framework objects that will need to pass
subscription information between activities.

Bug: 15473965

Change-Id: If1e33fd1fe13262954572558580cdcda73795dc0
 2014-06-27 16:17:21 -07:00
Jessica Hummel
a55fc99201 Merge "Provide api to set the managed profile name." 2014-06-26 21:33:38 +00:00
Jessica Hummel
1333ea1ed7 Provide api to set the managed profile name. 
Instead of sending the profile name in the provisioning intent
the mdm should set the profile name after provisioning has completed.
This allows us to simplify the provisioning flow and the mdm can
change the name of the profile later on if required.

Change-Id: I821ef2300eae74e89872152ae1c89ac3ecbb82e7
 2014-06-30 12:40:37 +01:00
Sander Alewijnse
420b9f4037 Merge "Add public constants for Device Owner Provisioning." 2014-06-26 21:23:48 +00:00
Sander Alewijnse
1cc4ecc3e2 Add public constants for Device Owner Provisioning. 
Change-Id: I46dca4e31ab256273eb810f57083f31541815735
 2014-06-30 11:36:42 +01:00