Romain Guy
f6ae4b897b
Reset stored background resource when setting a bg color
...
This sequence of operations would prevent the background from
changing:
setBackgroundResource(R.something)
setBackgroundColor(aColor)
setBackgroundResource(R.something)
The last call would be no-oped.
Change-Id: I436a33599c88e35f6f36bdd63e9c256c9219e052
2012-11-27 13:57:27 -08:00
Chet Haase
60b5509ff1
Merge "Fix layout-in-layout logic"
2012-11-26 07:20:16 -08:00
Svetoslav Ganov
6ce77cdd6a
Adding dump support for the accessibility manager service.
...
Change-Id: Ibc8d9eac3be065f1a753e1401568b8f93263b051
2012-11-21 16:38:50 -08:00
Chet Haase
d5a835259d
Fix layout-in-layout logic
...
Fix to allow requestLayout() during layout needs to disable
the "currently doing layout" flag while it processes the requests
that came in during layout to allow these initial requests to go
through unhindered.
Change-Id: Ied5ff1589224792f153cc10f65e004f14724523d
2012-11-21 16:30:07 -08:00
Fabrice Di Meglio
b920b40510
am e784ae8e: am d689e8c3: am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev
...
* commit 'e784ae8e6a0eab3d29afc9b19f65714e7b268b97':
Fix Javadoc for View layoutDirection / textDirection / textAlignment
2012-11-19 15:17:30 -08:00
Fabrice Di Meglio
e784ae8e6a
am d689e8c3: am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev
...
* commit 'd689e8c3a05f3b200d19879bdc169e6ad6e0436b':
Fix Javadoc for View layoutDirection / textDirection / textAlignment
2012-11-19 15:14:02 -08:00
Fabrice Di Meglio
d689e8c3a0
am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev
...
* commit 'b0f895b330d0d2b6725e7deee158ff20ed9155f8':
Fix Javadoc for View layoutDirection / textDirection / textAlignment
2012-11-19 14:31:02 -08:00
Fabrice Di Meglio
7d529cd6eb
Fix Javadoc for View layoutDirection / textDirection / textAlignment
...
Change-Id: I2fa2f02bd2f59ee93ccd56fc6bd28b93e4713cc4
2012-11-14 18:09:30 -08:00
Justin Koh
14b46b1583
am 674db142: am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev
...
* commit '674db142c56f01e581f7df4f3013e22f0922b21f':
Make tap events less sensitive.
2012-11-12 10:26:29 -08:00
Justin Koh
674db142c5
am 44643269: Merge "Make tap events less sensitive." into jb-mr1-aah-dev
...
* commit '446432692a2a7e60c7f547d6c7436922eb571d8e':
Make tap events less sensitive.
2012-11-12 10:24:21 -08:00
Ben Pietrzak
ffb5bdef63
Make tap events less sensitive.
...
Change-Id: I4d6f70b56373fbc51a414510897854078eeb0c40
2012-11-12 10:11:52 -08:00
Jim Miller
08bb2316f1
am 061b4fae: am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '061b4fae3daf40c90b46e16b12e7f22142eb498c':
Add mechanism to kick keyguard to show the assistant
2012-11-08 15:58:03 -08:00
Justin Koh
9d0640cfb6
am 3e94c562: am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
...
* commit '3e94c56215fa540ca722ab7b23710b82c08d20a4':
Catch exception of nonfound activities
2012-11-08 15:55:14 -08:00
Jim Miller
061b4fae3d
am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit 'a2bf6181dfca0f93461fc041f2bd2444551a4515':
Add mechanism to kick keyguard to show the assistant
2012-11-08 15:47:04 -08:00
Justin Koh
3e94c56215
am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
...
* commit 'cd38c32d85c13fde87ca7bee501cbe35230078b6':
Catch exception of nonfound activities
2012-11-08 15:43:34 -08:00
Jim Miller
d97b09b0f3
am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit 'bef827572ce9644253ea42ab91b11b8107d2300f':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-08 15:37:01 -08:00
Jim Miller
bef827572c
am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-08 15:32:09 -08:00
Jean-Baptiste Queru
7c8d2b63c0
Merge from jb-mr1-dev-plus-aosp
...
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
2012-11-08 15:19:11 -08:00
Jean-Baptiste Queru
c23cfe57a9
Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD
2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
40a419c2a5
Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD
2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
8d3d0250c4
Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11'
...
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
2012-11-08 14:40:12 -08:00
Jim Miller
a2bf6181df
am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev
...
* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
Add mechanism to kick keyguard to show the assistant
2012-11-08 13:13:23 -08:00
Justin Koh
5d1a9a902e
am 4608a0ae: am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
...
* commit '4608a0aec230a1a4857b54354afc3f233af7c1f2':
Support new touchpad event protocol.
2012-11-08 06:18:15 -08:00
Justin Koh
b892e8c642
am a1459793: am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
...
* commit 'a1459793d4e2ea483deb8baa733abbac56c2c199':
Trigger Google Now intent with swipe from bottom
2012-11-08 06:18:07 -08:00
Justin Koh
4608a0aec2
am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
...
* commit '41048d670d42075732723e72d7f303498690ea99':
Support new touchpad event protocol.
2012-11-08 06:12:30 -08:00
Justin Koh
a1459793d4
am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
...
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
Trigger Google Now intent with swipe from bottom
2012-11-08 06:12:26 -08:00
Jim Miller
4eeb4f664a
Add mechanism to kick keyguard to show the assistant
...
Fixes bug 7499778
Change-Id: Ic9ea514feb489feeee6716f40bdb9792842f9515
2012-11-08 00:39:04 -08:00
Justin Koh
cd38c32d85
Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev
2012-11-07 17:10:24 -08:00
Ben Pietrzak
6b1d912b25
Catch exception of nonfound activities
...
Change-Id: Id019c71937e73c38eb7a7c0a0cccfc2b9e87d069
2012-11-07 15:07:18 -08:00
Kenny Root
7b172a49a9
am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
...
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
Correct executable bit for source files
2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c
am 768d9e1a: Merge "Correct executable bit for source files"
...
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
2012-11-07 11:52:12 -08:00
Jim Miller
c7dc250d5a
am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev
...
* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
Add isSafeModeEnabled() API to WindowManagerService
2012-11-07 11:17:08 -08:00
Kenny Root
3a084af2e9
Correct executable bit for source files
...
Many media files and source code files were marked as executable in Git.
Remove those.
Also a shell script and python script were not marked as executable.
Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
2012-11-07 10:27:31 -08:00
Romain Guy
474a930030
am a1ca6d39: am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit 'a1ca6d39f9c0089aaab05249269ee8fbfe66f035':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 16:01:50 -08:00
Romain Guy
a1ca6d39f9
am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1
am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation."
...
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
2012-11-06 15:55:22 -08:00
Justin Koh
41048d670d
Merge "Support new touchpad event protocol." into jb-mr1-aah-dev
2012-11-06 13:22:26 -08:00
Justin Koh
58e0fb9adb
Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev
2012-11-06 13:20:51 -08:00
Jim Miller
bfec0a8616
Add isSafeModeEnabled() API to WindowManagerService
...
This adds a means of determining when the device is in safe mode,
as required by keyguard to disabled some features.
Change-Id: I31d357e6738c92e1837f9e0263e5f3f4de66315a
2012-11-05 20:27:38 -08:00
Svetoslav Ganov
d307640724
am 9d456661: am c9300f19: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit '9d4566611928ed71e58c8a7aaf231c6e306b204f':
View's visibility to the user not checking predecessor alpha.
2012-11-05 17:11:02 -08:00
Svetoslav Ganov
9d45666119
am c9300f19: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit 'c9300f196335410483c5c07eccac620332b75def':
View's visibility to the user not checking predecessor alpha.
2012-11-05 17:08:46 -08:00
Svetoslav Ganov
c9300f1963
am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev
...
* commit '0f4d5df5d815466398dba5f2d07aa98f18c35aaa':
View's visibility to the user not checking predecessor alpha.
2012-11-05 17:06:25 -08:00
Svetoslav Ganov
0f4d5df5d8
Merge "View's visibility to the user not checking predecessor alpha." into jb-mr1-dev
2012-11-05 17:03:37 -08:00
Baligh Uddin
19f8aa180a
am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev
...
* commit '00b5ed8fa9f2f38e15894519f3afeaae56e97e94': (21 commits)
Clearing connected message in stop fixes 7401152
bouncer: hide more text and frame less.
Recover from badly behaving 3rd party secure cameras.
Show bouncer mode for Slide mode in keyguard if widget isn't expanded
Making challenge come back if within the same gesture you return to the original page (issue 7422999)
Ensure edge swiping is enforced immediately upon showing keyguard (issue 7453156)
Fix issue 7468224, make sure to size pages if page changes
If a default keyguard layout isn't specified, fallback to the default layout
Use better signal for camera launch.
Render camera widget on a background thread.
Fully block user interactions when transitioning to camera.
Fixing up overscroll / hints on tablet
Cleaning up the overscroll effect
Updating UI to new design, widget shouldn't expand until page settles (issue 7467435)
Making screen hints just side page outlines, as per new design (issue 7467968)
Clean up separator string in keyguard view
Attempt to fix MENU key issue.
Update DevicePolicyManager documentation with new keyguard flags
Polish user selector accessibility.
Fix pages disappearing (issue 7456885)
...
2012-11-05 15:58:55 -08:00
Ben Pietrzak
ad6a9c992b
Support new touchpad event protocol.
...
Change-Id: Ib690f7a1abd367870c8b633d77d2c18d6ada9b05
2012-11-05 13:10:14 -08:00
Svetoslav Ganov
11f19f15ea
View's visibility to the user not checking predecessor alpha.
...
1. A view is visible to the user if is attached to a visible window,
its visibility is VISIBLE, its alpha is not zero, all its
predecessors have visibility VISIBLE and non zero alpha, the
view is not fully covered by predecessors and is within the
screen.
The function that computes whether a view is visible for
accessibility purposes was not taking into account the
predecessors' alpha.
bug:7454355
Change-Id: I7609f4366da260091d68e5b25832498843fd3d0a
2012-11-02 16:39:16 -07:00
Svetoslav Ganov
f74d0c39b6
Merge "Polish user selector accessibility." into jb-mr1-lockscreen-dev
2012-11-02 15:55:11 -07:00
Svetoslav Ganov
fc9c4cd51b
Polish user selector accessibility.
...
1. The current user was not announced as such.
2. The event for a user switch was not sent.
Change-Id: Ib3caf1f9e93ea1f0b5450246601bc37f416be6da
2012-11-02 15:32:25 -07:00
Svetoslav Ganov
b104b202bd
am cb5c66b9: am 5e27e55a: am 28e8f76c: Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
...
* commit 'cb5c66b9c1602b750bb481641253604ba3d59ac6':
Cannot click on partially visible views in touch exploration.
2012-11-02 11:59:29 -07:00
Svetoslav Ganov
5e27e55aec
am 28e8f76c: Merge "Cannot click on partially visible views in touch exploration." into jb-mr1-dev
...
* commit '28e8f76c50b26efd657bc0740fee25ac18520f9e':
Cannot click on partially visible views in touch exploration.
2012-11-02 11:54:36 -07:00