Scott Main
14a4702739
am 18ab5540: am df55c297: am 56a3ce03: Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev
...
* commit '18ab55402f437f56930f64e813c4c2ae74fa5860':
docs: update description for location permissions bug: 6996667
2012-11-01 11:59:32 -07:00
Scott Main
18ab55402f
am df55c297: am 56a3ce03: Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev
...
* commit 'df55c2979edbc8a91a24cc1c3967300937b37645':
docs: update description for location permissions bug: 6996667
2012-11-01 11:56:13 -07:00
Scott Main
56a3ce038e
Merge "docs: update description for location permissions bug: 6996667" into jb-mr1-dev
2012-11-01 11:47:44 -07:00
Romain Guy
331b552734
am aabe4bb4: am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
...
* commit 'aabe4bb4776c21592db7e0714b3fec960b6778c7':
A new clock widget to create lock screen appwidgets
2012-11-01 11:45:40 -07:00
Romain Guy
aabe4bb477
am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
...
* commit '9c0010f856d623845b20a7dd13c024023626623c':
A new clock widget to create lock screen appwidgets
2012-11-01 11:28:13 -07:00
Romain Guy
998d03bd94
Merge "A new clock widget to create lock screen appwidgets" into jb-mr1-dev
2012-11-01 11:23:17 -07:00
Scott Main
277b352d9f
docs: update description for location permissions
...
bug: 6996667
Change-Id: I3b5d706d98b56386a88b33a343721ff7432063b9
2012-11-01 10:55:02 -07:00
Michael Jurka
2fd2fe3348
am 345c0fa0: am 40d90211: am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
...
* commit '345c0fa06c246efde48526fd56e0830678e1759b':
Use new keyguard appwidget picker
2012-10-31 20:39:48 -07:00
Adam Powell
919227abe3
am 65d33bac: am 302b6819: am 077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
...
* commit '65d33bacd7b2a85147763a9e025effe306ad3741':
Fix some drag behavior bugs in keyguard
2012-10-31 20:39:43 -07:00
Svetoslav Ganov
3daa9c3bc4
am b5447463: am 0c777537: am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
...
* commit 'b5447463654a2aa319cb33c266b688391f529dfc':
Fix keypad accessibility.
2012-10-31 20:39:11 -07:00
Svetoslav Ganov
cac01f94dc
am 6525efaf: am 708d8db9: am 51cfc540: Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev
...
* commit '6525efafa995182271a22a44eabddd8dc009acdf':
Accessibility of the lock screen - strings
2012-10-31 20:39:02 -07:00
Michael Jurka
345c0fa06c
am 40d90211: am c8dc8eb3: Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
...
* commit '40d90211fe038219ef6595a8d56e5d9b390e2f89':
Use new keyguard appwidget picker
2012-10-31 20:35:57 -07:00
Adam Powell
65d33bacd7
am 302b6819: am 077105ba: Merge "Fix some drag behavior bugs in keyguard" into jb-mr1-lockscreen-dev
...
* commit '302b6819cdedefff5d7ec74133bf73a461eab99f':
Fix some drag behavior bugs in keyguard
2012-10-31 20:35:53 -07:00
Svetoslav Ganov
b544746365
am 0c777537: am cdb80888: Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
...
* commit '0c77753749bf0372a3876ba5f8a45d497208614c':
Fix keypad accessibility.
2012-10-31 20:35:24 -07:00
Svetoslav Ganov
6525efafa9
am 708d8db9: am 51cfc540: Merge "Accessibility of the lock screen - strings" into jb-mr1-lockscreen-dev
...
* commit '708d8db946e048527a56a23accfaa2e94333ca5c':
Accessibility of the lock screen - strings
2012-10-31 20:35:17 -07:00
Romain Guy
3d1728c03a
A new clock widget to create lock screen appwidgets
...
This new widget replaces DigitalClock. It listens to all the correct
system events and offer the ability to customize the formatting
patterns in 12-hour and 24-hour modes. It also supports fixed
time zones to create world clocks.
One more step towards becoming ClockOS!
Change-Id: I677e5dfca8cd8c8d1f8c49e54d7507f4d1885bf4
2012-10-31 20:31:58 -07:00
Adam Powell
3119c00db7
am 055f001f: am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
...
* commit '055f001f76950e4a504a6bea059310a455281134':
Fix keyguard bugs
2012-10-31 19:45:27 -07:00
Jim Miller
21c9c6a87b
am 0b063f31: am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
...
* commit '0b063f31035b98d20899468f5f71c0d577b16d0c':
Re-enable transition animation between face unlock and backup
2012-10-31 19:45:19 -07:00
Svetoslav Ganov
f66d2593c9
am 412a92cf: am acb544dd: am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
...
* commit '412a92cfe28e74602bd2e9f0af378118a619aad8':
Lockscreen accessibility - strings.
2012-10-31 19:45:11 -07:00
Adam Powell
055f001f76
am 45d2f164: am e74fcc0e: Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
...
* commit '45d2f164877a8bfd4e99666b00d56169b23ff979':
Fix keyguard bugs
2012-10-31 19:41:55 -07:00
Jim Miller
0b063f3103
am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
...
* commit '2bf287c884f18e0f5c18c738d2d9b42d34323857':
Re-enable transition animation between face unlock and backup
2012-10-31 19:41:46 -07:00
Svetoslav Ganov
412a92cfe2
am acb544dd: am 8ea7cbe6: Merge "Lockscreen accessibility - strings." into jb-mr1-lockscreen-dev
...
* commit 'acb544dda8861b7da84c8c078d87a7a713f363a8':
Lockscreen accessibility - strings.
2012-10-31 19:41:36 -07:00
Michael Jurka
c8dc8eb327
Merge "Use new keyguard appwidget picker" into jb-mr1-lockscreen-dev
2012-10-31 17:10:11 -07:00
Adam Powell
fa668cc930
Fix some drag behavior bugs in keyguard
...
Integrate from proto app
Make sure you can drag back up immediately without the delay of extra
offset on the challenge view.
There are still a few further tweaks to make here that will be
dependent on another upcoming patch.
Change-Id: I6af599e43d6be6da7b431dca5b87e39c157a54df
2012-10-31 17:01:38 -07:00
Michael Jurka
fc753c0cf6
Use new keyguard appwidget picker
...
Also, remove ability to filter widgets by feature
in appwidget picker in anticipation of api change
Change-Id: I325de0b98f03d3a250758d504229ea27794b5330
2012-10-31 16:53:04 -07:00
Baligh Uddin
ae89c3449b
am 8994804c: am 0abea6d6: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '8994804c7d4665634c677af8425c5b6e84a0343a':
Revert "Removed symbol causing compile breakage."
2012-10-31 16:41:55 -07:00
Baligh Uddin
8994804c7d
am 0abea6d6: am 9e3a900c: Merge "Revert "Removed symbol causing compile breakage."" into jb-mr1-dev
...
* commit '0abea6d6e78758e225f4e0b1fcd3b92be1c4e63b':
Revert "Removed symbol causing compile breakage."
2012-10-31 16:39:03 -07:00
Baligh Uddin
db636e69f1
am fce1cc9a: am f3820b13: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit 'fce1cc9a6cb0a7591bacdca2beeaf917674a4adc':
Removed symbol causing compile breakage.
2012-10-31 16:33:45 -07:00
Baligh Uddin
fce1cc9a6c
am f3820b13: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev
...
* commit 'f3820b139e7a79df959c977cb83324639652c11a':
Removed symbol causing compile breakage.
2012-10-31 16:31:25 -07:00
Baligh Uddin
9f7910609f
Merge "Revert "Removed symbol causing compile breakage.""
2012-10-31 16:22:09 -07:00
Baligh Uddin
fd25e1dcab
Revert "Removed symbol causing compile breakage."
...
breaks build.
This reverts commit 48e4d2619d73f500efb90c7794d754fda91edb5c
Change-Id: Id5618ae21d55103d862f9278ae6de48ef151d272
2012-10-31 16:21:16 -07:00
Baligh Uddin
2a2734f242
Revert "Removed symbol causing compile breakage."
...
breaks build.
This reverts commit d8a5792ae760a22aed4aa4ffd2caa5161d61baad
Change-Id: Ib92e9eee7f581bd9c508a735ef8a770316565d25
2012-10-31 16:16:22 -07:00
Svetoslav Ganov
cdb80888b7
Merge "Fix keypad accessibility." into jb-mr1-lockscreen-dev
2012-10-31 15:06:32 -07:00
Baligh Uddin
d8a5792ae7
Removed symbol causing compile breakage.
...
Seems like this string was removed in
https://googleplex-android-review.googlesource.com/#/c/247477
Change-Id: I2cc96143980d326cfdbc1db3b2a3c9766963ef03
2012-10-31 15:05:47 -07:00
Baligh Uddin
65c996ddf3
Merge "Removed symbol causing compile breakage."
2012-10-31 15:01:20 -07:00
Svetoslav Ganov
562afa97c2
Accessibility of the lock screen - strings
...
Change-Id: I573a65e5de4c258831bd14f4d54ab3eabf67b8e1
2012-10-31 14:32:08 -07:00
Jean-Baptiste Queru
81ee8ecbd3
am 9cd86758: Merge "Fix build - Add back symbol that\'s still needed" into jb-mr1-dev-plus-aosp
...
* commit '9cd8675825feff3c7b98f0feda1a9977e79599d1':
Fix build - Add back symbol that's still needed
2012-10-31 11:46:30 -07:00
Jean-Baptiste Queru
ab5202c3f1
Fix build - Add back symbol that's still needed
...
Change-Id: Iee59db7950bd83a480baa0b63729b16563251ad9
2012-10-31 11:35:48 -07:00
Baligh Uddin
48e4d2619d
Removed symbol causing compile breakage.
...
Seems like this string was removed in
https://googleplex-android-review.googlesource.com/#/c/247477
Change-Id: I2cc96143980d326cfdbc1db3b2a3c9766963ef03
2012-10-31 10:54:31 -07:00
Baligh Uddin
5b0398448b
Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-lockscreen-dev
2012-10-31 10:37:04 -07:00
Baligh Uddin
8029f74fb8
Revert "Import translations. DO NOT MERGE"
...
Broken Build:
frameworks/base/core/res/res/values/symbols.xml:558: error: Symbol 'keyguard_accessibility_widget_changed' declared with <java-symbol> not defined
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1
This reverts commit 30a3eeaa4bc8d654b6ff3beb109b6af3f347b135
Change-Id: I505c6c1f3444c80519fbee50d7dda656f5c9b76e
2012-10-31 10:35:22 -07:00
Baligh Uddin
86e39cf6d4
Merge "Revert "Import translations. DO NOT MERGE""
2012-10-31 10:33:28 -07:00
Baligh Uddin
666a629873
Revert "Import translations. DO NOT MERGE"
...
Broken Build:
frameworks/base/core/res/res/values/symbols.xml:558: error: Symbol 'keyguard_accessibility_widget_changed' declared with <java-symbol> not defined
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1
This reverts commit c9346832109236cf880343651e4bd3227a2c7f71
Change-Id: Iecba0e628a2a754b652c3b8af3ccc19c3f0d4ccb
2012-10-31 10:32:47 -07:00
Baligh Uddin
a1d2c6de85
Merge "Import translations. DO NOT MERGE"
2012-10-31 10:14:14 -07:00
Baligh Uddin
02dfd644c9
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
2012-10-31 10:13:00 -07:00
Adam Powell
e74fcc0eb1
Merge "Fix keyguard bugs" into jb-mr1-lockscreen-dev
2012-10-30 21:00:40 -07:00
Adam Powell
cdf8b48745
Fix keyguard bugs
...
Integrate from proto app
Get some layout/alignment right between security views, bouncer,
etc. Expand the space available for the more cramped security views
when not in the bouncer.
Fix bug 7434391 - don't allow widget swiping in bouncer mode. Fix a
few other bouncer-related state tracking problems as well.
Use layers when moving the security view around.
Change-Id: Ied14bab8bb5c3d997c734a3ae657b766c427253f
2012-10-30 20:57:10 -07:00
Jim Miller
162fc8e64b
Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
2012-10-30 20:43:52 -07:00
Jim Miller
22ae05d50c
Re-enable transition animation between face unlock and backup
...
Change-Id: Ia90cf73e400f45c8b73f34cbc521dcbc62258ca8
2012-10-30 20:37:57 -07:00
Baligh Uddin
c934683210
Import translations. DO NOT MERGE
...
Change-Id: I21fa45d0c31549882d1153262cc234ac46fdddab
Auto-generated-cl: translation import
2012-10-30 19:24:02 -07:00