Wei Liu
0641ab3dd0
am 636f3eac: Add clear_top flag to settings action intent. Bug: 17200185
...
* commit '636f3eac6d3ae69e7cc1dd159fe7cdbb043ce2df':
Add clear_top flag to settings action intent. Bug: 17200185
2014-09-05 16:52:20 +00:00
Wei Liu
636f3eac6d
Add clear_top flag to settings action intent.
...
Bug: 17200185
Change-Id: I156a8726055452b56d8ccd52010cdea8baaa79c3
2014-09-04 21:33:20 +00:00
Filip Gruszczynski
896a82d77e
am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
...
* commit 'd0e03392394164e1e261ef8829e187ad2362d426':
Fix double chin issue, where bottom inset is applied twice.
2014-07-28 23:40:13 +00:00
Filip Gruszczynski
6393196f5d
Fix double chin issue, where bottom inset is applied twice.
...
This changes how windowOutsetBottom is applied. Instead of being added to
whatever inset is already set, it overwrites it.
Bug: 16567038
Change-Id: Idedae93b790652e9de0519764ea7a03841f9e8fd
2014-07-25 14:25:16 -07:00
Filip Gruszczynski
bbc499415c
am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev
...
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
Only use bottom outset for main display.
2014-07-17 19:55:27 +00:00
Filip Gruszczynski
b57503c34d
Only use bottom outset for main display.
...
Change-Id: I42154d026811ee4b7ba9711c560c7a62fcdde7ee
2014-07-17 11:23:13 -07:00
Filip Gruszczynski
95198b9166
am 39f0e7da: Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev
...
* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
Using outset bottom from theme as bottom inset on circular screens.
2014-07-17 10:55:43 +00:00
Filip Gruszczynski
dcb70c2e08
Using outset bottom from theme as bottom inset on circular screens.
...
Change-Id: I46374b345e60a74b6afbbb6a278a0b8e81650681
2014-07-16 17:09:06 -07:00
Bill Yi
96f6a1a9e7
DO NOT MERGE - Fix build issue isScreenOn
...
Change-Id: I8821efd561d375c32702be55903fe401ab719e80
2014-07-15 22:50:55 +00:00
Michael Kolb
b936c57c2c
am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev
...
* commit 'a730881d769cfe0bdce1faafae2c3b88f86d6978':
DO NOT MERGE : Fix measuring with outset for orientation
2014-06-16 20:55:39 +00:00
Michael Kolb
ee028d502e
DO NOT MERGE : Fix measuring with outset for orientation
...
Bug: 14992865
Change-Id: Ie133d8010a394403e52512f4012632389bc32c4a
2014-06-16 20:28:52 +00:00
Jeff Brown
cd4c754e99
am 374013f4: Merge "Suppress haptic feedback for SLEEP key when already asleep." into klp-modular-dev
...
* commit '374013f4dba56c9ea340d22dcefdf904cbd47ce6':
Suppress haptic feedback for SLEEP key when already asleep.
2014-06-13 03:08:35 +00:00
Jeff Brown
1a073a8f55
am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev
...
* commit '926e1f01a5f2366c5d0eeab358822ba1d138d980':
When watch is docked, home key press should launch dock home.
2014-06-13 03:04:25 +00:00
Jeff Brown
bae8e77db6
Suppress haptic feedback for SLEEP key when already asleep.
...
Bug: 15377857
Change-Id: I4dfd273b089871d3a78513f52436a3f9c7d40fa4
2014-06-12 19:59:45 -07:00
Jeff Brown
4f5fa285a8
When watch is docked, home key press should launch dock home.
...
Bug: 15575717
Change-Id: Ib3fbe3ed0380378b0162901bfeebe3c218c4d568
2014-06-12 19:19:15 -07:00
Craig Mautner
22af5b8428
am 81dfc082: Merge "Force all windows to redraw before unblanking screen" into klp-modular-dev
...
* commit '81dfc082d2add8463469e3eac9db94d6d93005ce':
Force all windows to redraw before unblanking screen
2014-06-03 22:44:52 +00:00
Craig Mautner
228742d278
Force all windows to redraw before unblanking screen
...
The screen turning on would show windows as they were when the screen
turned off. This fix forces all showing windows to redraw first and
only then allow the screen to turn on.
Fixes bug 15092354.
Change-Id: I349995bf6446d6c462dccdc2b599bab9ab0ab2c8
2014-06-02 20:29:38 -07:00
Jeff Brown
fcc4fed3c1
am 6fb904bf: Merge "Make power button behavior configurable." into klp-modular-dev
...
* commit '6fb904bfd1f943547d6e5bc6f199ffec2290da01':
Make power button behavior configurable.
2014-05-21 08:40:33 +00:00
Jeff Brown
6d8fd27e51
Make power button behavior configurable.
...
Allow power button to be used to either go to sleep as usual,
which may doze, or skip that completely and really go to sleep.
May also really go to sleep and go home all at once.
Bug: 14406056
Change-Id: Ia19e2551b9c2a72271bb2eddd5c0d1749761e019
2014-05-20 21:24:38 -07:00
Justin Koh
8b2e7c4aaa
am 0ade263c: Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
...
* commit '0ade263c28ea62e619972752ef2e6a6c994eeddf':
If there is only 1 simple global action, autolaunch it
2014-05-15 17:20:23 +00:00
Justin Koh
0ade263c28
Merge "If there is only 1 simple global action, autolaunch it" into klp-modular-dev
2014-05-15 17:17:14 +00:00
Justin Koh
1c46c2d784
If there is only 1 simple global action, autolaunch it
...
Requested by UX. Also made settings available before provisioning
Bug: 14683740
Bug: 14886954
Change-Id: If62ccc6472a72b7adb4d309ee89e51069f8e0413
2014-05-14 17:30:32 +00:00
Aaron Whyte
8452776b95
am 5ff35f8a: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
...
* commit '5ff35f8a7fa543e43b2e1ea8a23ba6d32563e34b':
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 20:36:31 +00:00
Aaron Whyte
1fb617fecd
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
...
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859
Change-Id: I342eea5afafd56bed9b4138b97c2e906a10d300d
2014-05-12 22:08:53 -07:00
Aaron Whyte
d67fd6428a
am 6af2ef8e: Merge "Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"" into klp-modular-dev
...
* commit '6af2ef8e25844b740e84dc410ca713361bd6dbcc':
Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
2014-05-13 02:27:00 +00:00
Aaron Whyte
d5f010e4e7
Revert "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859"
...
This reverts commit 3f3e3e87e2a8f899d896c0c54441a37a23fdba3b.
Change-Id: I799d9a2b0eeb708f57127be60780c7a005b792b5
2014-05-13 02:19:10 +00:00
Aaron Whyte
064789efc1
am 24f3d091: Merge "Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859" into klp-modular-dev
...
* commit '24f3d0915e55d490b7537b20aeadbfa2e6a780a9':
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork. Make LauncherActivity CTS tests pass on clockwork. Bug: 14657859
2014-05-13 01:49:16 +00:00
Aaron Whyte
3f3e3e87e2
Disallow FEATURE_INDETERMINATE_PROGRESS for clockwork.
...
Make LauncherActivity CTS tests pass on clockwork.
Bug: 14657859
Change-Id: I0a8641894b41058f53a5bf241763a9a0605244d1
2014-05-12 17:20:02 -07:00
Adam Powell
c41fa70827
am a0516e7a: Merge "onWindowDismissed API cleanup" into klp-modular-dev
...
* commit 'a0516e7ad12a647cc40fb5651e8d14cd39571c7a':
onWindowDismissed API cleanup
2014-05-06 20:20:40 +00:00
Adam Powell
117b695222
onWindowDismissed API cleanup
...
Move the window swipe to dismiss plumbing off of Window.Callback into
its own internal interface implemented by Activity and Dialog. Make it
internal API instead of public. Apps should control this via the
window feature setting.
Change-Id: I64cd237fa7eab08719b2c34e31dac7d34f02563a
2014-05-05 18:20:47 -07:00
Justin Koh
9abf0b9031
am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
...
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
Make global action key timeout configurable.
2014-05-02 17:28:53 +00:00
Justin Koh
feabd2c730
Make global action key timeout configurable.
...
Make global action key timeout configurable: deprecated the old public method
and created a new one: getDeviceGlobalActionKeyTimeout.
Bug: 14441321
Change-Id: Ifa9b136984a9f02cfe4040baeff11275174967c5
2014-05-02 10:04:34 -07:00
Jeff Brown
4f8cd18880
am 7f6ab17d: Merge "Clean up some terminology related to interactive state." into klp-modular-dev
...
* commit '7f6ab17d414726868563105cd995b37dd519320b':
Clean up some terminology related to interactive state.
2014-05-01 23:29:13 +00:00
Jeff Brown
7f6ab17d41
Merge "Clean up some terminology related to interactive state." into klp-modular-dev
2014-05-01 23:25:11 +00:00
Vinod Krishnan
8e95d98836
am 5c10c3cf: Merge "DialogAlert window changes for Micro" into klp-modular-dev
...
* commit '5c10c3cfa65ff2ad9e92ec42f3f3384fc730d253':
DialogAlert window changes for Micro
2014-05-01 22:46:16 +00:00
Vinod Krishnan
5c10c3cfa6
Merge "DialogAlert window changes for Micro" into klp-modular-dev
2014-05-01 22:43:58 +00:00
Jeff Brown
140ffc783c
Clean up some terminology related to interactive state.
...
Change-Id: Ife4445685a5314dea64332a3490fa8dd3ffd89a2
2014-05-01 15:22:27 -07:00
Mark Renouf
5b72a6abf8
am 41615284: Merge "SwipeDismiss: limit fade to 50% alpha while swiping" into klp-modular-dev
...
* commit '41615284dfb00595ed642c4e31da6a035ff53224':
SwipeDismiss: limit fade to 50% alpha while swiping
2014-05-01 17:32:10 +00:00
Mark Renouf
d076121630
SwipeDismiss: limit fade to 50% alpha while swiping
...
BUG: 14319825
Change-Id: I3704fab77f2d3660ae374bdf16c767c124dcb8e9
2014-05-01 01:21:19 +00:00
Vinod Krishnan
fa8fc41bdc
DialogAlert window changes for Micro
...
Bug: 13243004
- The only difference between alert_dialog_micro.xml and alert_dialog_holo.xml is:
< android:layout_height="match_parent"
---
> android:layout_height="wrap_content"
> android:layout_marginStart="8dip"
> android:layout_marginEnd="8dip"
Change-Id: I84f9a88099a37aa7f5868e128b19cb1e812cb745
2014-04-28 22:07:26 -07:00
Justin Koh
d90712d044
am 3b9a3cc0: Update GlobalActions for watches.
...
* commit '3b9a3cc02ecb025f8b1f322015c7d1fb46222f9e':
Update GlobalActions for watches.
2014-04-22 17:06:56 +00:00
Justin Koh
3b9a3cc02e
Update GlobalActions for watches.
...
Update GlobalActions for watches: only have power off and settings, due to
limited real estate.
Change-Id: Ie3cbbb287f8c71c8c16a00637c83da6921d56e2e
2014-04-22 10:01:47 -07:00
Mindy Pereira
03f7f44250
am cb54f978: Merge "Update window alpha at the same time as translating" into klp-modular-dev
...
* commit 'cb54f978b565459210e80054e95becd1f8cae173':
Update window alpha at the same time as translating
2014-04-17 22:57:23 +00:00
Mindy Pereira
b0ea484615
Update window alpha at the same time as translating
...
Note: algorithm for alpha per progress may be updated
This is a first pass proof of concept
Change-Id: Ia043200ea737ff9d132e350449e17ba0fde10d65
2014-04-17 14:53:24 -07:00
Jeff Brown
337e764deb
am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev
...
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
Plumb display power state through display manager.
2014-04-11 03:49:37 +00:00
Jeff Brown
037c33eae7
Plumb display power state through display manager.
...
Declare a new method, Display.getState() to retrieve the actual
power state of a display.
Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.
Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.
Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.
Eliminated the bright here and woke here policy flags since they
were unused. Simplified the input dispatch policy somewhat.
Ensure that screen wake locks are respected up until the point
when dozing really begins.
Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.
Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
2014-04-10 20:46:14 -07:00
Craig Mautner
ffb22827d7
am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:56:55 +00:00
Craig Mautner
2b6fe2990d
am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev
...
* commit 'c70f15fe298655de02c2e72023fafe6fc33d2a55':
Fix FLAG_DISMISS_KEYGUARD not working
2014-04-01 21:48:04 +00:00
Craig Mautner
2fc798a227
resolved conflicts for merge of 8c6e6e73 to klp-dev
...
Change-Id: I9fc9bc3d935e9e730ebca767d848b1c66203f3b4
2014-04-01 13:57:37 -07:00
Michael Kolb
2c73e08d36
am 17bbd976: Merge "Add outset to decor view measuring" into klp-modular-dev
...
* commit '17bbd976c0971f25447b2ce66117f08029dc2fa9':
Add outset to decor view measuring
2014-04-01 20:46:38 +00:00