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

6559 Commits

Author SHA1 Message Date
Daniel Sandler
2a08223fd6 am 744fa85f: am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit '744fa85f12fdb4b601339c12abe342ada2dc8e18':
  Updated assets.
 2012-11-08 15:37:55 -08:00
Daniel Sandler
744fa85f12 am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit 'f6a5070bf59ecc5497196f923930d28286b49287':
  Updated assets.
 2012-11-08 15:33:05 -08:00
Jean-Baptiste Queru
7c8d2b63c0 Merge from jb-mr1-dev-plus-aosp 
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
 2012-11-08 15:19:11 -08:00
Jean-Baptiste Queru
c23cfe57a9 Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD 2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
5189fca3df Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD 2012-11-08 14:48:28 -08:00
Jean-Baptiste Queru
de8717c5f2 Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD 2012-11-08 14:44:44 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
d35f576ea0 Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD 2012-11-08 14:40:34 -08:00
Jean-Baptiste Queru
ce2a3746b8 merge 19f8aa180a7ccb29b11a322378002e37517abfc9 
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
 2012-11-08 14:13:21 -08:00
Robert Greenwalt
1f030df226 am 744c5204: am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit '744c520472d59c59f5320e1b0cf0801418eba773':
  Add Coin graphic to premium-sms dialog.
 2012-11-08 06:18:25 -08:00
Robert Greenwalt
744c520472 am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
  Add Coin graphic to premium-sms dialog.
 2012-11-08 06:13:17 -08:00
Jim Miller
9210016ff9 am 449f48ff: am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit '449f48ff3bc99544ecf1676ed15a4126beea1f1e':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-07 15:10:12 -08:00
Jim Miller
449f48ff3b am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-07 15:06:37 -08:00
Jean-Baptiste Queru
f5a79d313e am 476fceab: Merge 5418dd92 
* commit '476fceaba3e8c8d5b775fc07ad098792fc757f76':
  Adding bouncer animation on PagedView. (Bug 7459660)
 2012-11-07 14:54:34 -08:00
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92 
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
 2012-11-07 14:41:18 -08:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
 2012-11-07 13:08:25 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Daniel Sandler
f6a5070bf5 am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit 'f74cac46991cb46dc6e80a02f0c3a83dc5ed12ed':
  Updated assets.
 2012-11-07 11:17:55 -08:00
Daniel Sandler
f74cac4699 am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit '9edc48e26354f6a7282e68851a6d9ba734c7ceb1':
  Updated assets.
 2012-11-07 11:14:34 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Baligh Uddin
f6a4a04cad Merge "Import translations. DO NOT MERGE" 2012-11-07 09:41:08 -08:00
Baligh Uddin
20040dafbc Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 09:38:43 -08:00
Daniel Sandler
fa61fc8532 Updated assets. 
Change-Id: I4daaddb01c6156bdfacc5400886a6d7fc61d3ac0
 2012-11-07 00:04:50 -05:00
Jean-Baptiste Queru
45e99647dd am ecf37221: Merge eead9274 
* commit 'ecf372213db4a1e12f07b4684f3357a838b90daa':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 15:26:54 -08:00
Jean-Baptiste Queru
ecf372213d Merge eead9274 
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
 2012-11-06 15:16:09 -08:00
Robert Greenwalt
bbe5cafeeb Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 2012-11-06 15:07:35 -08:00
Baligh Uddin
8949fd828a Import translations. DO NOT MERGE 
Change-Id: Ib3047c233de6d48ceffc7edb5c9a03dd56175090
Auto-generated-cl: translation import
 2012-11-06 14:19:45 -08:00
Baligh Uddin
bc3a2b9f65 Import translations. DO NOT MERGE 
Change-Id: I45d540fce163bd0eb6e2edbb6358a1aa6f50193b
Auto-generated-cl: translation import
 2012-11-06 13:57:58 -08:00
Robert Greenwalt
a72b3aa034 Add Coin graphic to premium-sms dialog. 
bug:7205024
bug:7180681
Change-Id: Iece09d89598aefc5fd879587c65e5b179569e8e5
 2012-11-06 10:53:15 -08:00
Jim Miller
7dfc588a9d Workaround for layout bug in SIM PIN/PUK views 
This prevents a degenerate layout while we figure out what's
going on.

Change-Id: I99d1c6e5ce59fd48a74258158208270b775c1511
 2012-11-05 22:45:35 -08:00
Winson Chung
48275d2de9 Adding bouncer animation on PagedView. (Bug 7459660) 
- Adding Remove text for translations.

Change-Id: Ic18188a2a3caa9dfde8785611242b1c9925f7b87
 2012-11-05 16:15:34 -08:00
Adam Cohen
6f72b1c917 Fix small widgets not showing up on tablet (issue 7471516) 
Change-Id: Ie217268ef9c96512942f64b8ffd7e1d54a0ea850
 2012-11-05 15:20:42 -08:00
Scott Main
4c105e8558 am e7610cd3: am 0d1a575d: am 737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev 
* commit 'e7610cd3d30df5b8469aae800f5e7007218f3bfe':
  docs: explain implicit permissions applied by sdk versions bug: 7453055
 2012-11-05 14:20:08 -08:00
Scott Main
e7610cd3d3 am 0d1a575d: am 737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev 
* commit '0d1a575d95041aa7304374c7bd49b01cd936fbd8':
  docs: explain implicit permissions applied by sdk versions bug: 7453055
 2012-11-05 14:15:29 -08:00
Chris Wren
b3f87c24ee Merge "bouncer: hide more text and frame less." into jb-mr1-lockscreen-dev 2012-11-05 12:24:11 -08:00
Scott Main
de2c3192b1 am 737a20fd: Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev 
* commit '737a20fda62fe9885f74e208ac21a1574c1593f7':
  docs: explain implicit permissions applied by sdk versions bug: 7453055
 2012-11-05 11:15:55 -08:00
Scott Main
737a20fda6 Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev 2012-11-05 11:12:12 -08:00
Chris Wren
c0ae9e67eb bouncer: hide more text and frame less. 
Bug: 7464865
Change-Id: Ic8dac2582c014922143919f142fd36eb720dd3a9
Proto-Id: Id80601c9ffbdc34669b485e943b42cee237898f3
 2012-11-05 13:30:26 -05:00
Baligh Uddin
0ecc81cfd7 Merge "Import translations. DO NOT MERGE" 2012-11-04 17:48:28 -08:00
Baligh Uddin
746a7abc69 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-04 17:47:34 -08:00
Baligh Uddin
8cf1ea908d Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-04 17:43:31 -08:00
Adam Cohen
5d47a8dc2e Cleaning up the overscroll effect 
Change-Id: I685693fa178fb7b6418145554eb320b1a62d7462
 2012-11-03 19:19:11 -07:00
Jim Miller
aa200e2bc0 Merge "Clean up separator string in keyguard view" into jb-mr1-lockscreen-dev 2012-11-02 17:33:41 -07:00
Jim Miller
e93d1b4ed9 Clean up separator string in keyguard view 
The whitespace in the string was being removed by aapt.

Change-Id: I0c6a3e6960feb80cc0263d3f63005aee8bd0a7cd
 2012-11-02 17:26:52 -07:00
Baligh Uddin
d681e5787e am 6490f42b: am 940e92e1: am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into jb-mr1-dev 
* commit '6490f42be703e17a1d3c49b4fccb49957c6511f2': (26 commits)
  hide the correct text, and more text, on bounce
  Improve PIN key layouts.
  Obscure speech for PIN password keys when no headset plugged in.
  Initial changes to allow dropping on delete target to remove widget.
  hide multiuser selector when IME is up.
  Block swipe up gesture if challenge non-interactive.
  Properly disable challenge handle.
  Disable disable back if using an alternate back icon.
  Disable security handle when swiping into camera widget.
  Import translations. DO NOT MERGE
  Fix small issue with previous CL
  Widget size policy, size callbacks
  Don't show security method until we actually return from the camera
  Fix whitespace problem and sync with prototype.
  PUK support.
  Fix build.
  SIM PIN support.
  Use clock's widget as the default keyguard widget
  Add configurable em-dash separator for all concatenated keyguard strings
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  ...
 2012-11-02 16:56:47 -07:00
Baligh Uddin
6490f42be7 am 940e92e1: am 841ce670: Merge commit \'81af21e67cd842d16d4b45e8a2d1ec56ff8d764f\' into jb-mr1-dev 
* commit '940e92e124db5e97427d4c4942ce68d953879060': (26 commits)
  hide the correct text, and more text, on bounce
  Improve PIN key layouts.
  Obscure speech for PIN password keys when no headset plugged in.
  Initial changes to allow dropping on delete target to remove widget.
  hide multiuser selector when IME is up.
  Block swipe up gesture if challenge non-interactive.
  Properly disable challenge handle.
  Disable disable back if using an alternate back icon.
  Disable security handle when swiping into camera widget.
  Import translations. DO NOT MERGE
  Fix small issue with previous CL
  Widget size policy, size callbacks
  Don't show security method until we actually return from the camera
  Fix whitespace problem and sync with prototype.
  PUK support.
  Fix build.
  SIM PIN support.
  Use clock's widget as the default keyguard widget
  Add configurable em-dash separator for all concatenated keyguard strings
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  ...
 2012-11-02 16:53:04 -07:00
Daniel Sandler
a96cd636ec Merge "Improve PIN key layouts." into jb-mr1-lockscreen-dev 2012-11-02 12:34:16 -07:00
Daniel Sandler
80bc85a791 Improve PIN key layouts. 
- space between digit and mnemonics
 - better center the (left-aligned) text in its container
 - nudge the enter arrow a little to the left in its
   container
 - add missing contentDescriptions for SIMPIN/PUK

Bug: 7427380
Change-Id: I0f5d9d1554a476c00591981028733ee6924bb729
 2012-11-02 15:31:48 -04:00
Winson Chung
f3b9ec8230 Initial changes to allow dropping on delete target to remove widget. 
- Fixing deletion animation

Change-Id: Ie93991c0e9af0c6b64c6b3808e38f349f6845965
 2012-11-02 10:41:41 -07:00
Chris Wren
5f69f380ac hide multiuser selector when IME is up. 
Bug: 7437062
Change-Id: I7d1b2cf8e74b5ac8546aa9ae7545b69ab3584633
 2012-11-02 12:55:16 -04:00