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

94564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
513119e8b8 am b78af430: am 4d36d9d8: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev 
* commit 'b78af430f03c40875e1ee0d1317f2e9537339c15':
 2012-10-30 08:53:24 -07:00
Dirk Dougherty
ba621aa963 am f322c943: am 36eba5d0: am 7b9a2889: Doc change: fix some table formatting. 
* commit 'f322c94333d9fdebc13d866fa4fefd6f6ce28faa':
 2012-10-30 08:53:21 -07:00
John Spurlock
bb7faa1f45 am 0cb115f6: am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev 
* commit '0cb115f6bcfbff970cd66d89c9db951b4735c801':
  Use settings to persist sticky widget.
 2012-10-30 08:53:17 -07:00
Daniel Sandler
ee12c3063d am 0f527aa5: am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev 
* commit '0f527aa5f64ba43eb75a00baa162191b6bc8a076':
  Improved handle touch interaction.
 2012-10-30 08:53:13 -07:00
Daniel Sandler
c55eba7f97 am a01cfd01: am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev 
* commit 'a01cfd01ac0e836c690cb9bf723c777dcf86d9c9':
  Bigger lock icon.
 2012-10-30 08:53:10 -07:00
Adam Cohen
10f082c6ca am 9633ea97: am 47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed 
* commit '9633ea97c2558d7cb346cc227d3b1d479a176f1a':
  Ensuring layers are enabled on screen on and that pages are correctly transformed
 2012-10-30 08:53:06 -07:00
Adam Cohen
c19401a793 am 7fb0021d: am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev 
* commit '7fb0021d18a6491fdc816027081bff8c8d65f5aa':
  Polish to 3d carousel and standard pager
 2012-10-30 08:53:02 -07:00
Eric Laurent
4092a505f8 am f68f41b4: am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev 
* commit 'f68f41b474ed35875a771ec71fb86887b629c58c':
 2012-10-30 08:52:59 -07:00
Chris Wren
b04d5c94e7 am fe9356c0: am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev 
* commit 'fe9356c074278f1a936fbd2d9eb00d9cf1914984':
  single unlock target with honycomb semantics
 2012-10-30 08:52:55 -07:00
Daniel Sandler
4f98fbe9a9 am 83372881: am fdbbbba4: Updated add-widget graphics 
* commit '8337288183c9b5e145b44dbc8bae77f463edb4fc':
  Updated add-widget graphics
 2012-10-30 08:52:52 -07:00
The Android Automerger
604d1ee1e4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 08:52:42 -07:00
Jeff Brown
b78af430f0 am 4d36d9d8: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev 
* commit '4d36d9d80c616d469df662089ebf9f335890acb4':
 2012-10-30 08:49:12 -07:00
Dirk Dougherty
f322c94333 am 36eba5d0: am 7b9a2889: Doc change: fix some table formatting. 
* commit '36eba5d0a9bc8a7314349f86d617e300eb6b2fa3':
 2012-10-30 08:49:08 -07:00
John Spurlock
0cb115f6bc am b2f21c53: Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev 
* commit 'b2f21c53cf423cad5cf2f5d92579258decb40631':
  Use settings to persist sticky widget.
 2012-10-30 08:49:05 -07:00
Daniel Sandler
0f527aa5f6 am bc676a0a: Merge "Improved handle touch interaction." into jb-mr1-lockscreen-dev 
* commit 'bc676a0a1d15e932ca74bb94f3ae392e0a9dbbe2':
  Improved handle touch interaction.
 2012-10-30 08:49:01 -07:00
Daniel Sandler
a01cfd01ac am f002bf19: Merge "Bigger lock icon." into jb-mr1-lockscreen-dev 
* commit 'f002bf19e841301388238ef19552c9dfc24d4d72':
  Bigger lock icon.
 2012-10-30 08:48:57 -07:00
Adam Cohen
9633ea97c2 am 47c6cfaa: Ensuring layers are enabled on screen on and that pages are correctly transformed 
* commit '47c6cfaa3799951f999a4d2000cb628080708551':
  Ensuring layers are enabled on screen on and that pages are correctly transformed
 2012-10-30 08:48:52 -07:00
Adam Cohen
7fb0021d18 am effc03a9: Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev 
* commit 'effc03a952a881108fcbb51d4007ea0c21694077':
  Polish to 3d carousel and standard pager
 2012-10-30 08:48:48 -07:00
Eric Laurent
f68f41b474 am e7cd58bd: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev 
* commit 'e7cd58bd0323c02ebc51e48db11fe926ac4b9f9c':
 2012-10-30 08:48:44 -07:00
Chris Wren
fe9356c074 am 1d269e8e: Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev 
* commit '1d269e8e8fc508f59e4010777f4da6a2feafb0a4':
  single unlock target with honycomb semantics
 2012-10-30 08:48:38 -07:00
Daniel Sandler
8337288183 am fdbbbba4: Updated add-widget graphics 
* commit 'fdbbbba4cd4807bed1200f714609d4000501d4ee':
  Updated add-widget graphics
 2012-10-30 08:48:35 -07:00
Chris Wren
16d83fd13a Merge "post user activity on widget pager moves" into jb-mr1-lockscreen-dev 2012-10-30 08:21:02 -07:00
Roman Nurik
b817cfbf27 Update Device Art Generator for Nexus 4, 7, and 10. 
This CL also adds an 'older devices' section containing Nexus S, Galaxy Nexus,
and the Motorola XOOM.

Change-Id: Icca64ae5debe79325fbea38f79d33cd4ea85afb7
 2012-10-30 07:44:02 -07:00
John Spurlock
cf69c56b83 "Fix camera widget scale-up regression." -> frameworks/base 
lockhotness change-id: I69ccfa3a873943ab2e159d15937d5fb13f7acabd

Bug:7439300
Change-Id: I9e9eeae16b4e76d85a8145f3b198c22ad2e923e9
 2012-10-30 09:21:16 -04:00
Svetoslav Ganov
567fa75949 Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev 2012-10-29 23:15:16 -07:00
Svetoslav Ganov
3cd4640c0e Lockscreen accessibility - strings. 
Change-Id: Ia0f5a6356592f53081040667d20abf5f8eb09ad2
 2012-10-29 23:11:53 -07:00
Adam Cohen
8a7785c7aa Cleaning up the way in which the challenge influences widget size on first measure pass 
-> This change ensures that on first draw, the widget is the appropriate size if the
       security challenge is covering it.
    -> This change is in preparation for some new policy surrounding widget sizing --
       with this new policy, a given widget may need to be small even if the page is
       not being covered by the challenge. Hence, we propogate this small size to
       all the pages, whether or not they are covered. The pages will eventually
       use this.
    -> Ensure that paging hints are shown correctly (with the new sticky widget
       logic the page can be switched, and we weren't always seeing the appropriate
       hints).
    -> Also ensuring that the page is set correctly on first draw -- generally
       this change should make it so everything is right on the first draw.

Change-Id: I7e03be9b027aed0ebb0fada05652b4226fd23897
 2012-10-29 22:52:15 -07:00
Danielle Millett
1108a2cb41 Added a makeInvisible call to Face Unlock 
This makes it so that the view is hidden immediately when
a call to stop is made.  This also changes the call in onPause to
only stop and not go to the backup because we still want Face Unlock
to show as the view is being dragged down.

Change-Id: I66d8fc24e82dc3a0155f7d59d8ced932cb584660
 2012-10-29 23:40:12 -04:00
Dianne Hackborn
ef03a7f441 Work on issue #7343200: Fails to show wallpaper in the background... 
...for lockscreen sometimes and remains black / blank

Add some debug output to try to track down what is going on.

Change-Id: I98a96c5da9c04b988e948f6fc2766d927db49ebf
 2012-10-29 18:46:52 -07:00
Adam Powell
cfc3086b18 Keyguard polishing 
Integrate from proto app

* New assets

* Layout changes

* Dragging behavior change for sliding challenge

* Realign camera for new padding

Change-Id: Ia177c60f59f1fc74000d95fc39b048321acf1246
 2012-10-29 18:32:37 -07:00
Winson Chung
7bf93cf50f Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev 2012-10-29 17:53:28 -07:00
Winson Chung
9dc9923085 Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition. 
- Fixing issue where you can long press a widget to reorder while the challenge is up

Change-Id: I6ef2fa050a5ebc35d1c3e373bb27519580ebe03d
 2012-10-29 17:43:51 -07:00
Kenny Root
60b6ae23f6 am b33588e1: am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev 
* commit 'b33588e1353076398b081a2ec4c79a04305e256e':
  Move app-lib definition up for system app scanning
 2012-10-29 17:21:28 -07:00
Kenny Root
750d5e11df am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev 
* commit 'ca60ba1874a6537b42854b52cd766ebf1a8c8189':
  Move app-lib definition up for system app scanning
 2012-10-29 17:18:30 -07:00
Kenny Root
b33588e135 am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev 
* commit 'ca60ba1874a6537b42854b52cd766ebf1a8c8189':
  Move app-lib definition up for system app scanning
 2012-10-29 17:18:04 -07:00
Victoria Lease
2bb40c91d2 am b4fd7cfe: am 629a90cf: am 83f60c52: Merge "FusedLocation runs per user as user" into jb-mr1-dev 
* commit 'b4fd7cfe69f50c3bf611c1d790c963109baf14df':
  FusedLocation runs per user as user
 2012-10-29 17:15:27 -07:00
Victoria Lease
edc739db01 am 9348d760: am 4f5561b7: am 167282f1: Merge "Revert "make FLP play nicely with multiuser"" into jb-mr1-dev 
* commit '9348d76098c941ecaf8b114dc98933e511e3f556':
  Revert "make FLP play nicely with multiuser"
 2012-10-29 17:15:23 -07:00
Irfan Sheriff
0878d96a87 am ec82f20d: am b20dae4a: am 4bfa1e99: Merge "Fix handling escaped chars in ssid" into jb-mr1-dev 
* commit 'ec82f20d7a0e085cdadf63eddd6b2fa472867adb':
  Fix handling escaped chars in ssid
 2012-10-29 17:15:19 -07:00
Baligh Uddin
5a995ca7ab am da64dc7a: (-s ours) am ed6192f7: am dbcec903: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'da64dc7a619a0f8c7c7d2ef29c97788922926345':
  Import translations. DO NOT MERGE
 2012-10-29 17:15:15 -07:00
Baligh Uddin
474137518a am bb242a7d: (-s ours) am 7ca0dc50: (-s ours) am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bb242a7dd978460e34440f2b7b53d1a2051d7ae2':
  Import translations. DO NOT MERGE
 2012-10-29 17:15:11 -07:00
Jeff Brown
67f0211bfb am 76bce54b: am 9531b1c4: am 99e88721: Merge "Don\'t scale screen brightness by electron beam level." into jb-mr1-dev 
* commit '76bce54bc8c2cbe213c5aa914f45af9ac9022744':
  Don't scale screen brightness by electron beam level.
 2012-10-29 17:15:07 -07:00
Dirk Dougherty
2dc68703b2 am 308aae45: am f1d7dc73: am 7b9a2889: Doc change: fix some table formatting. 
* commit '308aae45dc53b259e603c3436df63d67ce04dd4b':
  Doc change: fix some table formatting.
 2012-10-29 17:15:03 -07:00
Eric Laurent
9c95a173f7 am 2aa46d35: am 67baf878: am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev 
* commit '2aa46d3518ac7e91f4ae621f767646d6e4b0a120':
  add settings for dock audio enabled
 2012-10-29 17:14:59 -07:00
Fabrice Di Meglio
ea5e56ad9c am d31f0ab9: am 9d662c77: am 68b14054: Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev 
* commit 'd31f0ab93f4f35a7ca6df6d428db2a5fd3d6750a':
  Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"
 2012-10-29 17:14:54 -07:00
Kenny Root
ca60ba1874 Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev 2012-10-29 17:14:51 -07:00
Victoria Lease
8e32da8ef0 am 5452d232: am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev 
* commit '5452d2324773ac1738a1c689eef102f005a8ef87':
  make FLP play nicely with multiuser
 2012-10-29 17:14:50 -07:00
Adam Powell
cc32e70aeb am f464bee4: am daa7218a: am 0a27c486: Fix measurement bug in keyguard/MultiPaneChallengeLayout 
* commit 'f464bee41fa73e7d798bcec7274c20afa032e1bb':
  Fix measurement bug in keyguard/MultiPaneChallengeLayout
 2012-10-29 17:14:41 -07:00
Adam Powell
0e3a9e4f69 am c4f06ec4: am 91885b55: am b0ed8bdb: Merge "Keyguard - prevent slider intercept when we don\'t want it" into jb-mr1-lockscreen-dev 
* commit 'c4f06ec48f2bfe2abf415eff01a236aed59e3706':
  Keyguard - prevent slider intercept when we don't want it
 2012-10-29 17:14:38 -07:00
Winson Chung
64593c9544 am e8e627db: am 69d0686f: am 113ca64a: Merge "Making the PagedView full screen on tablets." into jb-mr1-lockscreen-dev 
* commit 'e8e627dbdf0cce3528df1b239a7b215d65e63923':
  Making the PagedView full screen on tablets.
 2012-10-29 17:14:34 -07:00
Dianne Hackborn
5377e486fb am 0cc7b94e: am ffeb45a8: am 8905923c: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit '0cc7b94eee16d72c90bdfdc787118038ee6b1314':
 2012-10-29 17:14:30 -07:00