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

5926 Commits

Author SHA1 Message Date
John Spurlock
f04a6ee705 am af5b49c1: Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev 
* commit 'af5b49c12dc2ff83b3d43663f4fda09401fb7d3f':
  Update swipe edge size to match ux prototype.
 2012-10-29 14:00:32 -07:00
Amith Yamasani
16f18a4ce8 am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '084824548f9706db8356ed4480c282288ffc0bd0':
  Fix the user name for the owner.
 2012-10-29 13:55:57 -07:00
John Spurlock
ee12f5aa57 am 47cde77b: Fix camera bugs found overnight. 
* commit '47cde77bc7ac5c3a1e486691596a7534ad855ff2':
  Fix camera bugs found overnight.
 2012-10-29 13:31:48 -07:00
Adam Powell
300772e6f8 am 6f35209e: Integrate assets from UX; drag/bouncer animation behavior in slider 
* commit '6f35209e728a7a9a56afbbdefd3d7bfa1e05ea73':
  Integrate assets from UX; drag/bouncer animation behavior in slider
 2012-10-29 13:31:40 -07:00
Jim Miller
3dd3a41aab am 9b1db682: Fix issue where security view sometimes doesn\'t show. 
* commit '9b1db682c32d103974b0f1193b50e77e254d5589':
  Fix issue where security view sometimes doesn't show.
 2012-10-29 13:31:36 -07:00
Adam Powell
0d980a3b29 am 0b1b5522: Keyguard bouncer notifications; focus moving and the bouncer; slops 
* commit '0b1b552268bc6641cc5d01fb80c12258da9c6985':
  Keyguard bouncer notifications; focus moving and the bouncer; slops
 2012-10-29 13:31:12 -07:00
John Spurlock
eb4c0cb509 am 2e8a98e2: Merge "Manual frameworks/base merge from lockhotness (camera)." into jb-mr1-lockscreen-dev 
* commit '2e8a98e269486700d985f842806ce70e3a394dc9':
  Manual frameworks/base merge from lockhotness (camera).
 2012-10-29 13:30:56 -07:00
Daniel Sandler
165303f645 am d5692742: PIN pad cosmetics. 
* commit 'd5692742c1ff056e9fe55a495632229c86ed5384':
  PIN pad cosmetics.
 2012-10-29 13:30:36 -07:00
Daniel Sandler
51b0919d30 am 2c1ce056: Cleaning up password input. 
* commit '2c1ce0564fbd329e9e9ccfca100c69cfc1fd2645':
  Cleaning up password input.
 2012-10-29 13:30:32 -07:00
Daniel Sandler
9e126b9251 am 51d39f2d: Add ECA to PIN view 
* commit '51d39f2df9ed787644290fbff49b3a8282444c9a':
  Add ECA to PIN view
 2012-10-29 13:30:28 -07:00
Adam Powell
662bf7b23e am eee20931: Beginnings of bouncer support; add scrims and state tracking 
* commit 'eee209313d564be37b8fc068f785b3844cd6597e':
  Beginnings of bouncer support; add scrims and state tracking
 2012-10-29 13:30:00 -07:00
Adam Powell
82da5b173c am c0657fb3: Integrate changes from lockscreen proto app 
* commit 'c0657fb36ce5ede652e8af084e484d07abfb449d':
  Integrate changes from lockscreen proto app
 2012-10-29 13:29:43 -07:00
Baligh Uddin
ea2078e82f am 985dc142: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '985dc142642c43e54c15a436027a11d9b61ab3d8':
  Import translations. DO NOT MERGE
 2012-10-29 12:46:05 -07:00
Baligh Uddin
b7ac4cbe50 am 2171fa1c: am 0fa4cf5b: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2171fa1cd3be23fba4d3be077ff0cd6521762107':
 2012-10-29 12:46:00 -07:00
John Spurlock
8c480e4b1f am 86b6357e: Manual f/b merge of lockhotness camera integration. 
* commit '86b6357e5eb91950eac7de7ffe29e5a4ad32903b':
  Manual f/b merge of lockhotness camera integration.
 2012-10-29 12:45:17 -07:00
Adam Powell
7e83e33953 am 848a5557: Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev 
* commit '848a5557dba25defd5f332ebc20b61d0097f27f0':
  Fix up GlowPadView attributes
 2012-10-29 12:45:13 -07:00
Jim Miller
412b6a5ef2 am 19a52670: Merge latest prototype changes into keyguard 
* commit '19a5267003e7dc70100a4bd4f1f449523b2ff38b':
  Merge latest prototype changes into keyguard
 2012-10-29 12:45:09 -07:00
Jason Simmons
df304ba0ba resolved conflicts for merge of 83b9647d to jb-mr1-aah-dev 
Change-Id: Ic6d9435cf6c86a8048a99488d2e1dab49b4454c6
 2012-10-29 11:24:11 -07:00
Chris Wren
0882fe87d4 am 3867ddab: Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 
* commit '3867ddabbe645749ba3d7db9fc0c0ab9ca84690b':
  merge new multiuser avatars in from proto app
 2012-10-29 09:25:16 -07:00
Jim Miller
bf83ea6aa3 am 5d3f8599: Merge multi-user stuff from prototype into framework. 
* commit '5d3f8599590026d6fc275739613fe6ddb180af55':
  Merge multi-user stuff from prototype into framework.
 2012-10-29 09:16:45 -07:00
Jim Miller
8615a071c4 am 022554e3: Merge latest prototype changes into keyguard 
* commit '022554e3da6e496524387a5d3ecc67ef9749b587':
  Merge latest prototype changes into keyguard
 2012-10-29 09:16:41 -07:00
Jim Miller
17ac77c767 am c28261d4: Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 
* commit 'c28261d4fabf186cd5af5a563e6bab9023ee3758':
  Wire up "add widget" in keyguard
 2012-10-29 09:16:37 -07:00
Baligh Uddin
712556f5f2 Import translations. DO NOT MERGE 
Change-Id: Ifec8cc64e9047964d26ac167583e81949d7f4826
Auto-generated-cl: translation import
 2012-10-28 10:14:37 -07:00
Amith Yamasani
084824548f Merge "Fix the user name for the owner." into jb-mr1-dev 2012-10-26 15:54:56 -07:00
Jim Miller
52c55cd0d0 am d6523da1: Merge latest prototype changes into the framework 
* commit 'd6523da1ad7bae805a3dbea8d7b398d86cd3c181':
  Merge latest prototype changes into the framework
 2012-10-26 15:24:28 -07:00
Jim Miller
13056c982a am 28f1f5e6: Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev 
* commit '28f1f5e6f9a9f4a8a5e82fcb58c8dfadca7b5f93':
  Get basic keyguard working in new branch
 2012-10-26 15:24:15 -07:00
Baligh Uddin
45a4aff0cc am 2fa64ac6: am 3e336bd6: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2fa64ac65689a325fdf05ee32608300efa4c05c2':
 2012-10-26 15:21:12 -07:00
Baligh Uddin
a625e8a344 am 19b304e7: am 779a19fe: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '19b304e79a05227b6d607dead013c3856e739678':
 2012-10-26 15:18:17 -07:00
Amith Yamasani
6f34b41114 Fix the user name for the owner. 
Use a version number to update the name to Owner, from Primary.
For new installations, use the correct localized string.

Bug: 7417150

Fix a typo in the permission description.

Bug: 7333304
Change-Id: I123741e581c6a02d4597b3cd81f2ca48a8587e2a
 2012-10-26 10:06:22 -07:00
John Spurlock
af5b49c12d Merge "Update swipe edge size to match ux prototype." into jb-mr1-lockscreen-dev 2012-10-26 08:27:32 -07:00
John Spurlock
000ea2191e Update swipe edge size to match ux prototype. 
Change-Id: I0712c445d015615793b47310875c2cfcdeb574c1
 2012-10-26 11:25:21 -04:00
John Spurlock
47cde77bc7 Fix camera bugs found overnight. 
- Fix crash in CameraWidgetFrame after rotating to landscape
 - Fix pages drift to the left bug
 - Address Jim's comments on c/245706
 - Disable camera widget if landscape

Bug: 7419070
Bug: 7417798
Bug: 7418781
Change-Id: I5c730c7c1baf3c1872367b6392e6786578765298
 2012-10-26 08:25:51 -04:00
Adam Powell
6f35209e72 Integrate assets from UX; drag/bouncer animation behavior in slider 
Integrated changes from prototype app

Change-Id: I5f017431531b6d12aca89a674d865402c60c2104
 2012-10-25 21:28:27 -07:00
Jim Miller
9b1db682c3 Fix issue where security view sometimes doesn't show. 
Since the code is now very careful about loading layouts, we
sometimes get into a situation where the security view isn't shown.

This CL ensures the security method is shown at least once
when the view is inflated.

Change-Id: If80a46adb868d92194610eccaf9d8d6c2a2c5b3d
 2012-10-25 19:39:58 -07:00
Adam Powell
0b1b552268 Keyguard bouncer notifications; focus moving and the bouncer; slops 
Integrate changes from prototype app

* Add callbacks for bouncer state changes

* Dismiss the bouncer if focus leaves the challenge area

* Increase edge swipe region, treat this as a slop for
  SlidingChallengeLayout's drag handle. (This allows edge swipes in
  the drag handle area to still page widgets instead.)

Change-Id: I732de1a8d999a34c7cc8aa8ed99e24b597f3444c
 2012-10-25 13:57:19 -07:00
Chet Haase
b3975088b6 am 9023cf91: Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev 
* commit '9023cf91018c75a179d04256fd4e306065528117':
  Set wallpaper bitmap reference to null before reloading
 2012-10-25 12:23:20 -07:00
Chet Haase
9023cf9101 Merge "Set wallpaper bitmap reference to null before reloading" into jb-mr1-dev 2012-10-25 12:19:34 -07:00
Chet Haase
589a6af173 Set wallpaper bitmap reference to null before reloading 
Give the GC a chance to collect the current bitmap if it needs to,
as it allocates memory for the next one. This helps avoid OOM situations
that can sometimes occur in extreme circumstances (huge bitmaps)

Also set the default_wallpaper to the right default size.

Issue #7352961 Wallpaper edge is cut-off while scrolling through home page

Change-Id: If76b55061d04b29af7f66a6162e307b8b53bf4ae
 2012-10-25 11:57:09 -07:00
John Spurlock
dcc9681b0d Manual frameworks/base merge from lockhotness (camera). 
Change-Id: I8649ef77b706120a2297ddccd9bbb4d7ddf026a9
Proto-Id: Ia60ed9ee263b6053b9ca00d71fbd3ffc64a96278
 2012-10-25 14:35:19 -04:00
Daniel Sandler
d5692742c1 PIN pad cosmetics. 
Also pull the Klondike telephone exchange letter strings out
into arrays.xml so we can override it for specific locales.

Change-Id: Idf79ff8bfd53e5a8277271cc85ac7a1784ae3b64
 2012-10-25 03:30:28 -04:00
Daniel Sandler
2c1ce0564f Cleaning up password input. 
Starting to try to show the IME at the right times.

Change-Id: Idc681304c309022666a03c26885a5c94ab4ec2a2
 2012-10-25 01:30:00 -04:00
Daniel Sandler
51d39f2df9 Add ECA to PIN view 
Change-Id: I46e854dc8d5920bb506ac9996af7ea3ca845468a
 2012-10-25 01:18:30 -04:00
Adam Powell
eee209313d Beginnings of bouncer support; add scrims and state tracking 
Integrating from prototype app

Change-Id: Ib142cf371c5997f547266d8af7e25129fb4e1343
 2012-10-24 16:33:44 -07:00
Adam Powell
c0657fb36c Integrate changes from lockscreen proto app 
Fix padding/layout issues in MultiPaneChallengeLayout

Change-Id: I610b4c0cc321a690fa29d071d6a960c05ffbe3a7
 2012-10-24 14:01:37 -07:00
Baligh Uddin
985dc14264 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-24 12:19:01 -07:00
Baligh Uddin
c1e2466502 Import translations. DO NOT MERGE 
Change-Id: I035193bae4235a54f721473ff5db4f63e1b1b4ae
Auto-generated-cl: translation import
 2012-10-24 12:10:45 -07:00
Baligh Uddin
c1b2060b17 Import translations. DO NOT MERGE 
Change-Id: I60e51769668cbf4823155238a51cdac84b4b49af
Auto-generated-cl: translation import
 2012-10-24 12:08:18 -07:00
John Spurlock
86b6357e5e Manual f/b merge of lockhotness camera integration. 
Change-Id: I5c7c3c49e13656e9ba4a3761be7d503642d5b76f
 2012-10-24 13:30:02 -04:00
Adam Powell
848a5557db Merge "Fix up GlowPadView attributes" into jb-mr1-lockscreen-dev 2012-10-23 21:54:42 -07:00
Jim Miller
19a5267003 Merge latest prototype changes into keyguard 
Change-Id: Ibec6e9a7667ec730a25a58226c3203332af64b24
 2012-10-23 19:52:04 -07:00