Deepanshu Gupta
e9abc279fd
Merge "Fix theme/style resolution in Layoutlib"
2014-04-07 22:27:01 +00:00
Alan Viverette
365fdc5c5b
Merge "Revert action bar theme attribute"
2014-04-07 20:22:16 +00:00
Alan Viverette
bbc6f3e631
Revert action bar theme attribute
...
BUG: 13878093
Change-Id: I7cc4e270854f66d604a6e22eafbeef37c968fdae
2014-04-07 13:21:38 -07:00
Alan Viverette
054ff085f6
Merge "Fix dialog width"
2014-04-07 19:52:17 +00:00
Alan Viverette
34f2ccb5ab
Fix dialog width
...
Also breaks dialog button alignment, but we'll fix that later.
Change-Id: I5def9ff3dc9dfcbce34e514ae546c47e5d3863e1
2014-04-07 12:41:56 -07:00
Christoph Studer
d624a443ec
Merge "Write eventlog entries for notification panel visibility"
2014-04-07 19:15:22 +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
bae7b97f82
Quantum ActionBar, cleaning up theme colors
...
BUG: 13731184
Change-Id: Icca14b094dc1b7f4156306d14a7950b857bbe9c9
2014-04-07 10:57:44 -07: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
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
77b1286f7f
Merge "Fix extra text appearing after ellipsis"
2014-04-07 15:27:12 +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
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
d07372e2e9
Hide IpConfiguration
...
Bug: 7606609, Bug: 8687763
Change-Id: I2970bf79ef14cb993878c1dc10c7022a716f46c5
2014-04-07 17:11:39 +09: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
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
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
Leon Scroggins
7716b7d8ef
Merge "Update to call new Skia APIs."
2014-04-04 20:31:00 +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
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
Leon Scroggins
cc11f15f76
Update to call new Skia APIs.
...
I816129d49c0118453222916f3c818eccac33663d merges a new version of
Skia that updates various APIs. Call the new ones.
SkBitmap::copyTo now takes an SkColorType instead of an
SkBitmap::Config, so do the conversion with
SkBitmapConfigToColorType or use the enum when it makes sense.
Call SkImageDecoder::decodeSubset instead of (deprecated)
SkImageDecoder::decodeRegion.
Override SkCanvas::ClipVisitor::clipRRect in ClipCopier.
In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was
previously called inside the clip call, to determine the return value.
For various SkPaint effects, call the new factories (as the constructors
have been made protected).
Implement SkJavaOutputStream::bytesWritten(), overriding a new pure
virtual function on SkWStream.
Update Matrix calls to always return true (since SkMatrix calls no
longer return a value).
Depends on I816129d49c0118453222916f3c818eccac33663d (skia).
Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002
2014-04-04 14:42:39 -04:00
Alan Viverette
43c290f05c
Tint more icons, fix dialog styles and headers
...
BUG: 13795227
Change-Id: I4cf217748196512a5245468684246299205319f2
2014-04-04 11:20:06 -07:00
Maxim Siniavine
a1976d58dd
Merge "DownloadManager test will wait until certain progress, is made during download before moving to next stage of the test."
2014-04-04 18:15:26 +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
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
5df825237a
am ff3d89c0: Merge "docs: Added permissions note for Context.getFilesDir. Bug: 13716053" into klp-docs
...
* commit 'ff3d89c08cd69c506ea07fb30a58f88e188b2dd9':
docs: Added permissions note for Context.getFilesDir. Bug: 13716053
2014-04-04 17:38:59 +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
d423986e68
Merge "Add android.software.managedprofiles feature flag."
2014-04-04 14:40:20 +00:00
Baligh Uddin
e4c3dfa7b6
Merge "Import translations. DO NOT MERGE"
2014-04-04 14:25:46 +00:00