Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
129,900 Commits 3 Branches 0 Tags
a710bdf2e7dcdcfcbfed5adbb70ad9a977c277d1
Commit Graph

38034 Commits

Author SHA1 Message Date
Jaewan Kim
a710bdf2e7 am ce245e1c: Merge "Refactor IpConfiguration from WifiConfiguration" 
* commit 'ce245e1c6546ef05a8645d2d54bfa3e2e4178046':
  Refactor IpConfiguration from WifiConfiguration
 2014-04-07 05:58:23 +00:00
Jaewan Kim
ce245e1c65 Merge "Refactor IpConfiguration from WifiConfiguration" 2014-04-07 04:40:45 +00:00
Jaewan Kim
1284767ceb Refactor IpConfiguration from WifiConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530
 2014-04-07 11:35:35 +09:00
Etienne Le Grand
4f49f593c1 am fa1d2417: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
* commit 'fa1d2417d296e28a48a8c4a5cfb932172edbdd65':
  Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"
 2014-04-05 06:28:37 +00:00
Etienne Le Grand
fa1d2417d2 Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" 
This reverts commit fd53d8352a.

Change-Id: I1c6322d1d992147bb5ef201238374966128c1a61
(cherry picked from commit 819239e5be)
 2014-04-05 06:14:24 +00:00
Etienne Le Grand
b39f93ca69 am ded26473: am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'ded264733036bb566c54da5b771d63f57213c84e':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 04:01:33 +00:00
Etienne Le Grand
ded2647330 am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'bdfe384106de364ea2effac6ab80108556d11649':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 03:53:49 +00:00
Etienne Le Grand
bdfe384106 am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
* commit 'fd53d8352a4617941b0a0449390aa562a01ea1d3':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
 2014-04-05 01:52:27 +00:00
Nick Kralevich
8e2a4b5395 am 4ed27328: am dc97144b: Merge "Always call super.onCreate(). Always." 
* commit '4ed27328b5e20d32b1e6ac5b39684dad3e737ca7':
  Always call super.onCreate().  Always.
 2014-04-04 23:31:44 +00:00
Etienne Le Grand
fd53d8352a Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor 
Change-Id: I16e5da68f860494e24cca64075be76fad02617bc
 2014-04-04 16:31:08 -07:00
Christopher Tate
5eab368c4d Always call super.onCreate(). Always. 
Bug 12991134

(cherrypick of commit 9d6376a1d8)

Change-Id: Ife16ef93408253e3318a06dc0206ab4b88c7f367
 2014-04-04 23:06:13 +00:00
Ruchi Kandoi
a1e9cd515b am f20a5eb2: PowerManager: add powerHint method 
* commit 'f20a5eb279035d462e1f5d9895f4eb66cc152215':
  PowerManager: add powerHint method
 2014-04-04 20:30:53 +00:00
Ruchi Kandoi
f20a5eb279 PowerManager: add powerHint method 
Add powerHint method to IPowerManager for passing power hints from other
processes.

Change-Id: Ic596ace2ed1796a6da4cddb2163dcc4536115e55
 2014-04-04 20:24:16 +00:00
John Spurlock
d190cbb3e9 am 0a0454fd: am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '0a0454fdcc7aeac6e57f9466da8f39bcf5f3f6ec':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:42:36 +00:00
Adam Powell
4790615faf am dd79334f: Merge "Fix ActionBar attribute parsing" 
* commit 'dd79334f7ecb39135058c2049cd933b4b930a3d1':
  Fix ActionBar attribute parsing
 2014-04-04 19:34:45 +00:00
John Spurlock
0a0454fdcc am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '642421aa7f284817cc1a972a7f9c7a64696a0116':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:34:11 +00:00
Adam Powell
dd79334f7e Merge "Fix ActionBar attribute parsing" 2014-04-04 19:28:46 +00:00
John Spurlock
642421aa7f am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 
* commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e':
  Introduce new UI_MODE_TYPE_WATCH and qualifier.
 2014-04-04 19:28:09 +00:00
John Spurlock
5c31e487c4 Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev 2014-04-04 19:24:09 +00:00
Adam Powell
b226bea108 Fix ActionBar attribute parsing 
Lost in some prior refactoring. Also fixes doc builds for the removed
styleable.

Change-Id: Ice27a978cd5c22c6ad1fc0b45557c6cac77b5985
 2014-04-04 12:23:42 -07:00
John Spurlock
6c191299a7 Introduce new UI_MODE_TYPE_WATCH and qualifier. 
Default ui mode to watch if we have FEATURE_WATCH.

Bug:13395758
Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
 2014-04-04 15:21:53 -04:00
Ricardo Cervera
9a7a7d49d4 am 1e9b3f64: am 8f81d295: am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '1e9b3f645e72d28073ef1c5dffde33aeec9f0c4b':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:59:57 +00:00
Ricardo Cervera
1e9b3f645e am 8f81d295: am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '8f81d29558bb0c97187d5ae3a7ee696ec13b264a':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:55:45 +00:00
Adam Powell
6ec380fd20 am 33d0dad1: Merge "android.widget.Toolbar" 
* commit '33d0dad1bce329b5794091c31c50543666b3a251':
  android.widget.Toolbar
 2014-04-04 17:53:49 +00:00
Adam Powell
8e7286094f am 2efec597: Merge "Deprecate ActionBar navigation modes" 
* commit '2efec597b7ac0a0ab256bfeec8f83076cb22d4d7':
  Deprecate ActionBar navigation modes
 2014-04-04 17:53:46 +00:00
Ricardo Cervera
8f81d29558 am d10b6543: am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit 'd10b65431547d66b41e4e282e9261453bb0658ff':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:48:51 +00:00
Ricardo Cervera
d10b654315 am 5df82523: am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs 
* commit '5df825237afd016c48dd3577d839825e5161d3e7':
  docs: Added permissions note for Context.getFilesDir. Bug: 13716053
 2014-04-04 17:42:44 +00:00
Ricardo Cervera
90a5f9851a docs: Added permissions note for Context.getFilesDir. Bug: 13716053 
Change-Id: I02e17c358630ab298bb99731723405cdeae701fc
 2014-04-04 10:26:05 -07:00
Adam Powell
e43340c80d android.widget.Toolbar 
Add the new Toolbar widget for use in app layouts.

ActionBar can now be used as a point of control for either a
traditional window decor action bar or for a Toolbar that appears
inline in an Activity's layout.

ToolbarActionBar is currently WIP.

Change-Id: I0da093e5645840f4fd032aa34efa0ae5f1825ff2
 2014-04-04 10:08:17 -07:00
Adam Powell
fc35dfd513 Deprecate ActionBar navigation modes 
Navigation modes were a great shortcut for patterns that are no longer
recommended or that don't integrate as nicely with application
content. Apps have done a great job both inventing new navigation
patterns that work well in their own contexts or following patterns
that can be implemented inline with an app's content. Navigation modes
as a prescriptive construct are no longer needed.

Be free, apps!

Change-Id: I9ae1c2efc830c7dcb6664061bba68b1748928ae3
 2014-04-04 10:08:17 -07:00
Adam Connors
da79b8e82d am d423986e: Merge "Add android.software.managedprofiles feature flag." 
* commit 'd423986e68d76958441c3bec1584a86f7f390988':
  Add android.software.managedprofiles feature flag.
 2014-04-04 15:00:30 +00:00
Adam Connors
d423986e68 Merge "Add android.software.managedprofiles feature flag." 2014-04-04 14:40:20 +00:00
Paul Lawrence
33ae1476a0 am f17f0e0e: Merge "Save OwnerInfo so CryptKeeper can display at boot time" 
* commit 'f17f0e0eb0eef424401caa122e51a648f5ef3801':
  Save OwnerInfo so CryptKeeper can display at boot time
 2014-04-04 14:13:40 +00:00
Paul Lawrence
f17f0e0eb0 Merge "Save OwnerInfo so CryptKeeper can display at boot time" 2014-04-04 14:05:56 +00:00
Craig Mautner
a211d2c4e6 am 4c4b1d65: Merge "Fix build due to bad javadoc link." 
* commit '4c4b1d65ff65ec2a6b45047ff24284989dbeb8b7':
  Fix build due to bad javadoc link.
 2014-04-04 02:03:23 +00:00
Craig Mautner
4c4b1d65ff Merge "Fix build due to bad javadoc link." 2014-04-04 01:57:47 +00:00
Craig Mautner
529a43f719 Fix build due to bad javadoc link. 
Change-Id: I83ca32611fb72b79be271dc3a5bd848934e9174f
 2014-04-03 18:54:52 -07:00
Craig Mautner
4722c9daaa am eb6387c1: Merge "Add the persistable attribute for Activities" 
* commit 'eb6387c16149e4d84dcb15427bb7ca8d0495554d':
  Add the persistable attribute for Activities
 2014-04-03 20:56:55 +00:00
Dianne Hackborn
5601df6e03 am 5d5902d1: Merge "Don\'t allow -1 uids for wake locks." 
* commit '5d5902d140040936fa6aa7e443220140af0e9843':
  Don't allow -1 uids for wake locks.
 2014-04-03 20:56:52 +00:00
Craig Mautner
eb6387c161 Merge "Add the persistable attribute for Activities" 2014-04-03 20:51:22 +00:00
Dianne Hackborn
5d5902d140 Merge "Don't allow -1 uids for wake locks." 2014-04-03 20:49:57 +00:00
Craig Mautner
fab55569c6 am 35fc6a02: Merge "Implement setActivityLabelAndIcon()." 
* commit '35fc6a02aeded9578375af5828e14043164028d5':
  Implement setActivityLabelAndIcon().
 2014-04-03 20:46:22 +00:00
Craig Mautner
35fc6a02ae Merge "Implement setActivityLabelAndIcon()." 2014-04-03 20:37:29 +00:00
Dianne Hackborn
ef640cdfb2 Don't allow -1 uids for wake locks. 
Change-Id: Ia1b412a166f69247be3b047138349e7b4031bd7d
 2014-04-03 11:20:15 -07:00
Craig Mautner
4cfa8dc77a Add the persistable attribute for Activities 
This is used for documents to allow them to be persisted across
reboots.

Fixes bug 13735406.

Change-Id: I5655ac99589d58ed5716429cf7a1ffeee677aee1
 2014-04-03 10:40:43 -07:00
Chris Craik
5b29309b9a am ef4c0c9f: Merge "Move most TransformationInfo properties to RenderNode" 
* commit 'ef4c0c9fd5db395b2eea0a246b93bce9cc9e859a':
  Move most TransformationInfo properties to RenderNode
 2014-04-03 17:20:38 +00:00
Raph Levien
dcc2fa8028 am 537be409: am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit '537be409f281d4a872cbcebb6ac3a4d767ded4da':
  Marquee text RTL improvements
 2014-04-03 17:16:22 +00:00
Chris Craik
ef4c0c9fd5 Merge "Move most TransformationInfo properties to RenderNode" 2014-04-03 17:14:53 +00:00
Raph Levien
537be409f2 am c333381b: am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit 'c333381b4c1b46f13f75388099cafb740844c497':
  Marquee text RTL improvements
 2014-04-03 17:09:26 +00:00
Raph Levien
c333381b4c am 24a2f20f: am c420ce34: Merge "Marquee text RTL improvements" 
* commit '24a2f20fe64e893e28dc70b288e12567ff71019f':
  Marquee text RTL improvements
 2014-04-03 16:02:39 +00:00