drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,679 Commits 1 Branch 0 Tags
Commit Graph

87679 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
db60b67533 am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
  Import translations. DO NOT MERGE
 2012-11-07 11:42:46 -08:00
Baligh Uddin
fc958f12f6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-07 11:39:41 -08:00
Baligh Uddin
2d6a1b778d Import translations. DO NOT MERGE 
Change-Id: Ia0befbcb0a476a7afffa3cd748625fa9f32e826f
Auto-generated-cl: translation import
 2012-11-07 11:34:53 -08:00
John Spurlock
506fd3b02e Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev 2012-11-07 11:31:30 -08:00
Romain Guy
59d73ab6fc Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774" into jb-mr1-dev 2012-11-07 11:15:36 -08:00
Daniel Sandler
8768278974 Fix docs to refer to the correct class. 
Bug: 6676920
Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
 2012-11-07 14:04:42 -05:00
Roman Nurik
0fc1b5ecba am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit '512950a9713f79f2900c73201906436d12da8639':
  docs: Minor Nexus 10 fix in Device Art Generator
 2012-11-07 09:52:44 -08:00
Roman Nurik
512950a971 Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 2012-11-07 09:49:37 -08:00
Baligh Uddin
a40ec75eb3 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 09:47:00 -08:00
Daniel Sandler
1b80345025 Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev 2012-11-07 09:42:36 -08:00
Baligh Uddin
8dbf3b8df0 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 09:39:39 -08:00
Chris Wren
cf9ee4c55d Merge "Don't pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 2012-11-07 09:12:32 -08:00
Brian Colonna
6b4ab7f170 Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 2012-11-07 09:00:05 -08:00
Brian Colonna
275016703e Centering FUL fixes b/7480608 
A simple one-line change to center FUL horizontally.  This looked
really bad on tablets when the charging text was showing as FUL was
obviously off-center compared to the text.  It was also off-center
on phones, which looked particularly bad when going to the backup.

Change-Id: Id0e3039a67c9bb746a8c9948e82ff87b6c815e1b
 2012-11-07 11:53:49 -05:00
Chris Wren
a042ac9064 Don't pop the IME for passwors at ScreenOn on tablets. 
Change-Id: I4c157559b2a70021d55211607c1d62ba73adc590
 2012-11-07 11:53:41 -05:00
John Spurlock
f55769fefa Low battery dialog should use UserHandle.CURRENT. 
Bug:7493313
Change-Id: Ie753633c550e4ce679fbb6f9e0c6adf56392ec87
 2012-11-07 11:50:33 -05:00
John Spurlock
34c4fe523a Fix remaining jank in secure add-widget transition. 
Wait for activity to launch before dismissing the keyguard.
Otherwise we see launcher/last activity waiting for the
picker to start up.

Also remove camera transition workaround obviated by:
  Iefee62061962625b622ff2cf9a307d9429c2ad54

Bug:7482560
Change-Id: I554ddffb7981488fa8a81933842b0c7730e775f3
 2012-11-07 10:22:06 -05:00
Michael Jurka
cabcc59007 Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 2012-11-07 01:16:11 -08:00
Michael Jurka
192d6d4ee2 Allowing rotation while adding lockscreen widgets 
Also cleaning up some unused code

Bug: 7468012
 2012-11-07 01:12:26 -08:00
Adam Cohen
1361758f90 Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 2012-11-06 23:31:49 -08:00
Adam Cohen
e41dd0f195 Giving glow pad the brains to scale itself dynamically (issue 7449554) 
Change-Id: I44f31d354171c01b607871d6a9e1e9d06a49ffc8
 2012-11-06 23:06:44 -08:00
Adam Powell
9799714f6c Keyguard layout tweaking/reworking 
Teach KeyguardSecurityViewFlipper about layout_maxWidth/Height. Give
maxes to security views. Fix some IME layout weirdness in
SlidingChallengeLayout by adding more weirdness.

Change-Id: I8047d32302aad44844de06d54b150586b0861dab
 2012-11-06 23:00:30 -08:00
Jim Miller
a976860962 Attempt to fix NegativeArraySizeException crash in keyguard 
Fixes bug 7490924

Change-Id: I974c9b7a4fb3de536efe9d47cdd480190772a1be
 2012-11-06 22:17:25 -08:00
Daniel Sandler
9edc48e263 Merge "Updated assets." into jb-mr1-lockscreen-dev 2012-11-06 21:14:13 -08:00
Daniel Sandler
fa61fc8532 Updated assets. 
Change-Id: I4daaddb01c6156bdfacc5400886a6d7fc61d3ac0
 2012-11-07 00:04:50 -05:00
Jim Miller
9d0d796f47 Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev 2012-11-06 19:05:43 -08:00
Adam Cohen
42164efac3 Merge "Ensuring bindAppWidget isn't called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev 2012-11-06 19:04:55 -08:00
Adam Cohen
efb3ffb029 Ensuring bindAppWidget isn't called until boot completed (issue 7469267) 
Change-Id: I997f5a191116db7c840bf4a947385958b57cd657
 2012-11-06 19:03:29 -08:00
Michael Jurka
835579e817 Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 2012-11-06 19:01:51 -08:00
Michael Jurka
76017cad4f Removing sticky widgets in lockscreen 
Also adding mechanism to show a widget after
adding it

Change-Id: Ic4d49e6ef1343c38fa731b0ed2a327c55b678abf
 2012-11-06 18:56:41 -08:00
Jim Miller
0928e019ce Fix emergency call area updates. 
This fixes a bug where the emergency call button doesn't reflect the current
state.

Fixes bug 7482869

Change-Id: I7de2100f10a078943cb92c13d638c72e99c7a643
 2012-11-06 18:43:22 -08:00
Svetoslav Ganov
ad9f594e1c am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit '5fff5f01f8af05164d5d7be72bdadee46360ba92':
  Make partially visible widget pages not important for accessibility.
 2012-11-06 17:49:02 -08:00
Svetoslav Ganov
5fff5f01f8 Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 2012-11-06 17:46:44 -08:00
Romain Guy
a76f7db323 Respond to ticks when a timezone is set and it doesn't display seconds 
Bug #7489774

This change also fixes a crash if you programmatically set the time
formats from code before the widget is attached to the window.

Change-Id: I73ead93f5866d9059a4b3823c4304aeca8e419b6
 2012-11-06 17:35:23 -08:00
Sascha Prueter
bc69698c8f am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit '872965bb22ba74a06b755547883c5d0de62bb956':
  Use a consistent policy for filtering wake keys.
 2012-11-06 17:14:35 -08:00
Sascha Prueter
872965bb22 Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 2012-11-06 17:11:26 -08:00
Jim Miller
51117262c8 Handle DevicePolicyManagement and safe mode when inflating widgets 
Bug 7459120
Bug 7444159
Bug 7444016

Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
 2012-11-06 17:04:26 -08:00
Jeff Brown
1c2e4948a1 Use a consistent policy for filtering wake keys. 
Previously wake keys were filtered differently depending on whether
a keyguard was showing.  If the user disables the keyguard then
no filtering was applied, which means that the volume key may
wake your device while in your pocket.

This change ensures that we use the same policy consistently
regardless of whether keyguard is showing.  The behavior is
otherwise the same.

Removed the "Locked" suffix on a method that was actually
being called without a lock held and which in fact does not
require it.

Bug: 7481025
Change-Id: I704c71ca009bc5437f349f858b9de7c77ea73e4b
 2012-11-06 16:48:15 -08:00
Romain Guy
475255bffc am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:18:19 -08:00
Romain Guy
1b3b2544e6 Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 2012-11-06 16:15:27 -08:00
Eino-Ville Talvala
688d98fe21 am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:10:52 -08:00
Eino-Ville Talvala
4a1b6e4242 Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 2012-11-06 16:06:01 -08:00
Romain Guy
d1cc1878cc Dismiss error icon on setError(null) [regression] 
Bug #7442935

Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
 2012-11-06 16:03:37 -08:00
kmccormick@google.com
7f9a053580 am 856e24d8: am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs 
* commit '856e24d82a5009db69058b6c37cbbe1af3b292f7':
  Doc change: GCM category & dry_run params
 2012-11-06 15:59:33 -08:00
kmccormick@google.com
856e24d82a am fa2dbd69: Merge "Doc change: GCM category & dry_run params" into jb-dev-docs 
* commit 'fa2dbd693c3ffebd806cbbb4f708f754d58423ed':
  Doc change: GCM category & dry_run params
 2012-11-06 15:56:25 -08:00
Adam Powell
7136544c06 Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev 2012-11-06 15:50:12 -08:00
Adam Powell
9d34f9db81 Keyguard - MultiPaneChallengeLayout measurement/layout changes 
Have the widget view and the user switcher stay fixed when IME insets
are applied. This keeps more stability in the layouts as the IME comes
and goes.

Change-Id: I5ac62c3da6ec618280f89e87993837b3e4941ec9
 2012-11-06 15:38:28 -08:00
Svetoslav Ganov
a90a18db91 Make partially visible widget pages not important for accessibility. 
1. If the lockscreen has more than one widet, the left and right widget
   pages are partially on the screen and visible. Therefore they may
   take accessibility focus so the user will hear a prompt that he is
   on the partially visible widget page but will not be able to interact
   with it - confusing. This change makes partially shown windget frames
   not important for accessibility.

bug:7454355

Change-Id: I475b21e215474a4421acaec485cde64dc4e2aee5
 2012-11-06 15:22:16 -08:00
Victoria Lease
8d803258ca am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit 'e6299d5af702dd17eb3585dbe84d29c289bfa8da':
  Fires geofence if the device is already in the geofence area.
 2012-11-06 15:09:38 -08:00
Chris Wren
5fcca70d28 Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev 2012-11-06 15:08:41 -08:00