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

38061 Commits

Author SHA1 Message Date
Deepanshu Gupta
538f44e7e7 am e9abc279: Merge "Fix theme/style resolution in Layoutlib" 
* commit 'e9abc279fd0e1cd3a7c0bfb878c9b5ae22840b9b':
  Fix theme/style resolution in Layoutlib
 2014-04-07 22:32:23 +00:00
Deepanshu Gupta
e9abc279fd Merge "Fix theme/style resolution in Layoutlib" 2014-04-07 22:27:01 +00:00
Christoph Studer
15559ec190 am d624a443: Merge "Write eventlog entries for notification panel visibility" 
* commit 'd624a443ec5662d2bf812b6992e783bea225d36d':
  Write eventlog entries for notification panel visibility
 2014-04-07 19:20:27 +00:00
Christoph Studer
760ea554d0 Write eventlog entries for notification panel visibility 
Change-Id: Ie7e15ed15739cb5f057c900e1cadf90824b2b4ef
 2014-04-07 14:52:17 -04:00
Alan Viverette
d4dcd47a12 am 012785d8: Merge "Don\'t auto scroll empty lists" 
* commit '012785d8cbaadb4041707af350e122ad29d22151':
  Don't auto scroll empty lists
 2014-04-07 16:38:40 +00:00
Alan Viverette
012785d8cb Merge "Don't auto scroll empty lists" 2014-04-07 16:31:55 +00:00
Alan Viverette
a111328412 Don't auto scroll empty lists 
BUG: 12930741
Change-Id: I22bcebace0d5e0d519d38b34d6312ffff5b62f9b
 2014-04-07 09:30:13 -07:00
George Mount
a9364665d6 am 6fd0ef7f: Merge "Add Transitions useful for Activity transitions." 
* commit '6fd0ef7f7367ce6e2272e9c517793d502fe7f8da':
  Add Transitions useful for Activity transitions.
 2014-04-07 16:22:45 +00:00
George Mount
65c87ff167 am dde10d07: Merge "Implement "Back" for Activity Transitions." 
* commit 'dde10d073f819e78c0b26d7f37ed10f01b45125c':
  Implement "Back" for Activity Transitions.
 2014-04-07 16:22:41 +00:00
George Mount
6fd0ef7f73 Merge "Add Transitions useful for Activity transitions." 2014-04-07 16:17:40 +00:00
George Mount
dde10d073f Merge "Implement "Back" for Activity Transitions." 2014-04-07 16:17:32 +00:00
George Mount
d6107a3170 Add Transitions useful for Activity transitions. 
Slide: transition in and out of the edge of the scene.
Explode: transition to the scene borders

Moved capability from Fade to Visibility.

Change-Id: Ibeb0d8f751c990edc467570d9665fbe251af2703
 2014-04-07 09:14:09 -07:00
George Mount
cb4b7d999e Implement "Back" for Activity Transitions. 
Change-Id: Iceaf888f57f2c7598f9291687ac9ad76d55bd82c
 2014-04-07 09:00:13 -07:00
Raph Levien
9e2121a7a2 am 77b1286f: Merge "Fix extra text appearing after ellipsis" 
* commit '77b1286f7f949ef6ec8a254648380e211ee8b8eb':
  Fix extra text appearing after ellipsis
 2014-04-07 15:31:50 +00:00
Raph Levien
77b1286f7f Merge "Fix extra text appearing after ellipsis" 2014-04-07 15:27:12 +00:00
Alexandra Gherghina
2ea79b063d am 45849beb: Merge "Introduces intents for adding and removing a managed profile." 
* commit '45849beb3bd0d9f4494bdcce919dcf995bcb881b':
  Introduces intents for adding and removing a managed profile.
 2014-04-07 12:36:25 +00:00
Alexandra Gherghina
45849beb3b Merge "Introduces intents for adding and removing a managed profile." 2014-04-07 12:26:56 +00:00
Alexandra Gherghina
c17d7e0d64 Introduces intents for adding and removing a managed profile. 
Change-Id: I6b8b7a314ea52bfd0c750da94066156e73a0f2f5
 2014-04-07 12:38:24 +01:00
Jaewan Kim
acdfa2a65d am baa00cc3: Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 
* commit 'baa00cc350572c34718d770a31ebe2f76ffc9607':
  Revert "Refactor IpConfiguration from WifiConfiguration"
 2014-04-07 09:10:11 +00:00
Jaewan Kim
fce727b5c7 am e277433e: Revert "Hide IpConfiguration" 
* commit 'e277433ed718be7651ab893f85d87f1ab4da896c':
  Revert "Hide IpConfiguration"
 2014-04-07 09:10:08 +00:00
Jaewan Kim
baa00cc350 Merge "Revert "Refactor IpConfiguration from WifiConfiguration"" 2014-04-07 09:01:43 +00:00
Jaewan Kim
6789797485 Revert "Refactor IpConfiguration from WifiConfiguration" 
This reverts commit 1284767ceb.

Change-Id: Ibccea84e5dc44c1b8954779660e0721b27f762d4
 2014-04-07 09:01:24 +00:00
Jaewan Kim
e277433ed7 Revert "Hide IpConfiguration" 
This reverts commit d07372e2e9.

Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
 2014-04-07 08:54:45 +00:00
Jaewan Kim
62a9daccac am d07372e2: Hide IpConfiguration 
* commit 'd07372e2e96ed6d2012db8518e05018c9710cafb':
  Hide IpConfiguration
 2014-04-07 08:43:19 +00:00
Jaewan Kim
d07372e2e9 Hide IpConfiguration 
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
 2014-04-07 17:11:39 +09:00
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
Deepanshu Gupta
bfec73c2db Fix theme/style resolution in Layoutlib 
Change-Id: Icfb91e566666408802dadc0e2070991151b16b9d
 2014-04-04 13:44:22 -07: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