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

36091 Commits

Author SHA1 Message Date
Baligh Uddin
c797fe43c1 Import translations. DO NOT MERGE 
Change-Id: Icecd6584ffbd05db4e596245269c1175c19a9346
Auto-generated-cl: translation import
 2012-10-29 09:57:18 -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
Jim Miller
0b728244dc Update status area and emergency call logic to match new spec 
Change-Id: Ic43d9d58168166aacf2b145663dc9412b099f9c2
 2012-10-28 20:04:57 -07:00
Baligh Uddin
ff45c88de2 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-28 17:24:21 -07:00
Baligh Uddin
2407ed1531 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-28 17:22:55 -07:00
Dirk Dougherty
36eba5d0a9 am 7b9a2889: Doc change: fix some table formatting. 
* commit '7b9a28892b1821a657bc9de5245528557d15a154':
  Doc change: fix some table formatting.
 2012-10-28 14:03:32 -07:00
Dirk Dougherty
7b9a28892b Doc change: fix some table formatting. 
Change-Id: I1533be695347697f5afd5c8d2719a0ff0b07abaa
 2012-10-28 13:40:26 -07:00
Baligh Uddin
3326211e1e Import translations. DO NOT MERGE 
Change-Id: Ib1def7a6a6aa0f56271d70678dd0400df2d5e826
Auto-generated-cl: translation import
 2012-10-28 10:19:37 -07:00
Baligh Uddin
c14ba5f014 Import translations. DO NOT MERGE 
Change-Id: Id9589f002eeb5cc1237b2afffbf92ebb77454016
Auto-generated-cl: translation import
 2012-10-28 10:17:12 -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
John Spurlock
b2f21c53cf Merge "Use settings to persist sticky widget." into jb-mr1-lockscreen-dev 2012-10-28 06:39:15 -07:00
Daniel Sandler
c606bf1af9 Improved handle touch interaction. 
- the handle size is now entirely independent of asset size
- the handle doesn't have to have a handle graphic
- the handle top/bottom sizing can each change based on
  whether the challenge is visible
- now, the handle becomes very small when the challenge is
  visible, and does not intrude into the challenge rect
  itself (so you really need to drag downward through the
  top edge of the challenge to activate the handle and close
  the challenge)
- when the challenge is closed, the handle may be clicked to
  open

Bug: 7428215
Change-Id: I4ca7b4d5d475337295a6a7492a831abbba288ac5
Proto-Id: Ibc8997ece27ca1e0fa4deb651bb11860f95d7b23
 2012-10-28 00:12:21 -04:00
Daniel Sandler
950c29ea7a Bigger lock icon. 
Bug: 7428215
Change-Id: I02a1c94b5a80f49f16b9b8563b6b9613f90a6a93
Proto-Id: I9174769ce6750ed69758519a91948d845828d583
 2012-10-28 00:10:11 -04:00
Adam Cohen
effc03a952 Merge "Polish to 3d carousel and standard pager" into jb-mr1-lockscreen-dev 2012-10-27 17:24:08 -07:00
Adam Cohen
f9048cd09b Polish to 3d carousel and standard pager 
-> updated assets
-> Always showing outlines as per new mock
-> Enabling layers on content during fades (still need to sort out layers for frames)
-> Added carousel overscroll as per discussion with danship
-> Fading side pages in carousel
-> other small polish

Change-Id: If88686768c621a65b175a74c07cb55a69321fd97
 2012-10-27 16:36:44 -07:00
Eric Laurent
e7cd58bd03 am c99a1107: Merge "add settings for dock audio enabled" into jb-mr1-dev 
* commit 'c99a1107c0d4fdf47595e5072192d647a01e13b3':
  add settings for dock audio enabled
 2012-10-27 14:46:22 -07:00
Eric Laurent
c99a1107c0 Merge "add settings for dock audio enabled" into jb-mr1-dev 2012-10-27 14:42:18 -07:00
John Spurlock
5f050e5c2c Use settings to persist sticky widget. 
Addressing some comments:
 - Sticky widget is now saved in a user-scoped setting.
 - Removed multi-user widget from computation (obsolete).
 - Removed status widget from computation (just use right-most).
 - Removed duplicate isMusicPlaying logic.

(frameworks/base)

Change-Id: I8ef8f826677d78ac24da52adf2d99d47c8d965ac
 2012-10-27 10:55:09 -04:00
Chris Wren
1d269e8e8f Merge "single unlock target with honycomb semantics" into jb-mr1-lockscreen-dev 2012-10-26 21:50:34 -07:00
Daniel Sandler
fdbbbba4cd Updated add-widget graphics 
Bug: 7421953
Change-Id: I7961e0e2b0e53467d57d3253d078055dc7614b4f
 2012-10-26 22:59:38 -04:00
Eric Laurent
7ee1e4ff73 add settings for dock audio enabled 
Add settings dock_audio_media_enabled indicating if dock audio
is enabled for media for docks that do not implement jack detection.

Bug 7302106.

Change-Id: I75766b606ceb870b3f89979c4e3cca88ed197aaf
 2012-10-26 18:11:21 -07:00
Fabrice Di Meglio
68b14054b9 Merge "Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)"" into jb-mr1-dev 2012-10-26 18:01:55 -07:00
Fabrice Di Meglio
bb4b601673 Revert "Fix bug #7325234 LayoutParams are not resolved correctly (Settings apps looks broken on Manta in Arabic)" 
This reverts commit 6bf6eb7d5f9207d6a3e1d6b61f17a8654d06fbdb.
and also fbc21e126f329b7b7c161858c1390ccb023be07e

I have also removed all unnecessary calls to resolveLayoutDirection(int). This is possible as
we are resolving layout params on every child of a ViewGroup as of commit
fcc3348f61b2992f0b84e8e8dcb3535fc715298f

Change-Id: I262a375b03fcc3c9261cbe2edebb6ec42ec2e186
 2012-10-26 17:13:33 -07:00
Adam Cohen
8daee80753 Merge "3D carousel initial stab -- paging outlines / alpha effects pending design" into jb-mr1-lockscreen-dev 2012-10-26 16:11:23 -07:00
Adam Cohen
9ec871def3 3D carousel initial stab -- paging outlines / alpha effects pending design 
Change-Id: I2d9851472472a0affa9b46b2508fc7a1cb8c9779
 2012-10-26 16:10:51 -07:00
Michael Jurka
a15eeacff9 Merge "Fix bug where it wasn't possible to add widgets" into jb-mr1-lockscreen-dev 2012-10-26 16:10:25 -07:00
Michael Jurka
229dd8b355 Fix bug where it wasn't possible to add widgets 
- Happened when you were down to 0 widgets (which
won't be possible in future, but fixing this as
well)
 2012-10-26 16:06:12 -07:00
Amith Yamasani
369f1c92e7 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-26 15:57:10 -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
Fabrice Di Meglio
b8a220cbef am 07ce0ca2: Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 
* commit '07ce0ca265274c5ba95e6ec3e0950e38b8ce97ea':
  Fix bug #7419054 TextView Drawables resolution is broken in RTL mode
 2012-10-26 15:31:43 -07:00
Jeff Brown
d3d523da9a am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
  Add MediaRouter API to get presentation display.
 2012-10-26 15:28:41 -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
Fabrice Di Meglio
07ce0ca265 Merge "Fix bug #7419054 TextView Drawables resolution is broken in RTL mode" into jb-mr1-dev 2012-10-26 15:18:30 -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
Chris Wren
f0ee5b8135 single unlock target with honycomb semantics 
Bug: 7411431
Change-Id: I27a86041c93369df2be2d53cb81c29658e70bcca
Proto-Id: I631fa48da4c67351366bcc1002a01dfa66a34d8c
 2012-10-26 18:00:25 -04:00
Jeff Brown
4e0bf7c486 Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 2012-10-26 13:52:03 -07:00
John Spurlock
011717d064 Merge "Implement "sticky" widget logic." into jb-mr1-lockscreen-dev 2012-10-26 13:04:57 -07:00
John Spurlock
358148e386 Implement "sticky" widget logic. 
(frameworks/base)
Used after screen-off, and after launching camera.

Bug: 7418847
Change-Id: I5179e6af13be4494fde77fde2cdb5610ab888dac
 2012-10-26 15:58:13 -04:00
Daniel Sandler
1f887cb292 Merge "Make the add widget button hitrectangle smaller." into jb-mr1-lockscreen-dev 2012-10-26 12:39:06 -07:00
Daniel Sandler
082351c98f Make the add widget button hitrectangle smaller. 
Bug: 7421953
Proto-Id: I04fe3f06a7c53603dc38434a18cc52053ccc6bac
Change-Id: Ie26ad9a9c683f41bd8bf0b0b24e6832ab32d9469
 2012-10-26 14:52:35 -04:00
Fabrice Di Meglio
1957d281ea Fix bug #7419054 TextView Drawables resolution is broken in RTL mode 
- check layout direction previous value in the onResolveDrawables(int) callback
- dont do any Drawables resolution if we cannot resolve the layout direction
- also remove unnecessary call to resolveRtlPropertiesIfNeeded() in ViewGroup when
  adding a child as the call to resolveRtlPropertiesIfNeeded() will be done into
  the measure() call itself later

Change-Id: I62237af3d307dfea203f7f2865551d1c61a0e0b8
 2012-10-26 10:55:02 -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