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

5896 Commits

Author SHA1 Message Date
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
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
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
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
Adam Powell
962159addd Fix up GlowPadView attributes 
Change-Id: I98c14177753e713fcdaaf886c44ce10ab49eebc9
 2012-10-23 16:09:40 -07:00
Daniel Sandler
69bdee7c87 Integrate new PIN pad. 
Change-Id: I08d6551dfde501c5526eb6fd641ae08475c1365b
 2012-10-23 16:45:50 -04:00
Chris Wren
3867ddabbe Merge "merge new multiuser avatars in from proto app" into jb-mr1-lockscreen-dev 2012-10-23 12:29:05 -07:00
Chris Wren
692bb13352 merge new multiuser avatars in from proto app 
Change-Id: I6a7f63738279be1c036061b4cea461e94fb51658
 2012-10-23 13:48:38 -04:00
Baligh Uddin
2107dcbd5c Import translations. DO NOT MERGE 
Change-Id: Ia49d738d4c123d06cc8ef2a31a18aa7156816d26
Auto-generated-cl: translation import
 2012-10-23 10:06:53 -07:00
Baligh Uddin
1c8e4dc101 Import translations. DO NOT MERGE 
Change-Id: I6d7f8dec6e1115a4586befbaa302eafe606fb901
Auto-generated-cl: translation import
 2012-10-23 10:03:00 -07:00
Jim Miller
5d3f859959 Merge multi-user stuff from prototype into framework. 
Change-Id: I195b588ecfcea3388a2489fe7278a851202380c6
 2012-10-22 20:45:56 -07:00
Jim Miller
022554e3da Merge latest prototype changes into keyguard 
- multi-user avatar stuff.
- new SlidingChallengeLayout changes.

Change-Id: I45bec7313b71dbca16544e7525281bf6c0e44a25
 2012-10-22 19:06:05 -07:00
Jim Miller
c28261d4fa Merge "Wire up "add widget" in keyguard" into jb-mr1-lockscreen-dev 2012-10-22 18:52:37 -07:00
Baligh Uddin
221f69b0fd Import translations. DO NOT MERGE 
Change-Id: I0e70aeaf47180803a74a258143ba462e487b0d4f
Auto-generated-cl: translation import
 2012-10-22 09:46:16 -07:00
Baligh Uddin
93c6094b67 Import translations. DO NOT MERGE 
Change-Id: I02aa0e6fa545b325429029f58d19247b9d3f3373
Auto-generated-cl: translation import
 2012-10-22 09:44:44 -07:00
Jim Miller
b5f3b707a7 Wire up "add widget" in keyguard 
Change-Id: If10e91b4ed1289259f04e0dca91db4ce8645a0f7
 2012-10-21 19:09:23 -07:00
Jim Miller
d6523da1ad Merge latest prototype changes into the framework 
Specifically, this adds the following functionality:
- portrait layout on phones
- new KeyguardViewStateManager
- new SlidingChallengeLayout
- some event wiring.

Change-Id: Ie4491416f591b6d4002d33e9803a764a8ae730f6
 2012-10-21 17:45:09 -07:00
Jim Miller
838906b165 Get basic keyguard working in new branch 
This merges the changes from the proto app into the framework.
Basic functionality tested on phone in portrait:

- Slide
- Pattern
- PIN
- Password (wonky)
- SIM PIN

Change-Id: I21b2c30cf05dc01ffb20948f41a044e7af1db25f
 2012-10-19 18:42:56 -07:00
John Spurlock
fd88c25725 am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
  Frameworks base: Promote dream setting defaults to config.
 2012-10-19 11:02:11 -07:00
John Spurlock
ed108f3d12 Frameworks base: Promote dream setting defaults to config. 
So that:
 - the values can be shared (to fix assoc bug)
 - the values can be customized in product overlays

Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
 2012-10-19 11:32:03 -04:00
Geremy Condra
b81cedad5e am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 
* commit 'a1f739ea83b6d770b8469ae1c2c4161f6fe96334':
  Change android.permission.SERIAL_PORT to signature|system.
 2012-10-19 00:03:17 -07:00
Geremy Condra
a1f739ea83 Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 2012-10-18 23:59:37 -07:00
Jeff Hamilton
d76ba62101 am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
  Changes to support updating location providers.
 2012-10-18 12:47:42 -07:00
Jeff Hamilton
e09aed49e3 Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-18 12:45:02 -07:00
Jeff Hamilton
fbadb69978 Changes to support updating location providers. 
This reverts commit 20de160ca32a8f2936a80ffd70551a22e2371d25.

Bug: 7242814
Change-Id: I9ec49a14feb835b6683186fc6da4a74ae19fbae2
 2012-10-18 01:28:10 -05:00
Baligh Uddin
3e336bd646 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-17 22:23:35 -07:00
Jeff Brown
d488b23143 am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 
* commit '23fa0320b88bd2141742d47eaf2626369cb03b22':
  Add a notification icon when connected to wireless display.
 2012-10-17 18:45:14 -07:00
Jeff Brown
23fa0320b8 Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 2012-10-17 18:42:25 -07:00
Baligh Uddin
917d8ac7fe Import translations. DO NOT MERGE 
Change-Id: I246d542b8032726b5ba49141f841cf23c208e7f7
Auto-generated-cl: translation import
 2012-10-17 18:38:36 -07:00
Jeff Brown
a7f9c966bc Add a notification icon when connected to wireless display. 
Bug: 7350174
Change-Id: I18481e2a1445b0aa3340e5d9b02511394521e50e
 2012-10-17 15:50:06 -07:00
Geremy Condra
c29f35b8f4 Change android.permission.SERIAL_PORT to signature|system. 
Bug: 7367956
Change-Id: I0bc65936ba59c43c18d9a6ba52affff4c921f2fb
 2012-10-17 14:06:31 -07:00
Baligh Uddin
779a19fe44 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-16 21:11:18 -07:00
Jim Miller
48994ce945 Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev 2012-10-16 17:28:08 -07:00
Jim Miller
bdffd5c3a1 Fix missing layout parameters in keyguard. 
This addresses crashes caused by an upcoming change to crash
when missing layout_width and layout_height attributes are missing.

Change-Id: I71044b4623d04cab41f4aee6a7a5c01b67b0d2a5
 2012-10-16 13:55:13 -07:00