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

6160 Commits

Author SHA1 Message Date
Jim Miller
66b102b623 am c2cbd158: am c4c52ccb: am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev 
* commit 'c2cbd158b4989a476bccdaea7a9463d494005c6f':
  Disable camera and search from some security screens.
 2013-10-07 18:08:47 -07:00
Jim Miller
c2cbd158b4 am c4c52ccb: am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev 
* commit 'c4c52ccbaafccd1626bc8455641c3f9fc25b023c':
  Disable camera and search from some security screens.
 2013-10-07 17:54:44 -07:00
Jim Miller
c4c52ccbaa am 961d2f46: Merge "Disable camera and search from some security screens." into klp-dev 
* commit '961d2f4643e9b3f6f774ab9567c36f659f423254':
  Disable camera and search from some security screens.
 2013-10-07 17:51:33 -07:00
Jim Miller
961d2f4643 Merge "Disable camera and search from some security screens." into klp-dev 2013-10-08 00:49:23 +00:00
Michael Jurka
9c27a4dff5 am e5812347: am 9aa58405: am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev 
* commit 'e581234746cc977de62f3d1a495669833710eb39':
  Fix crash in built-in wallpaper cropper
 2013-10-07 17:30:23 -07:00
Michael Jurka
e581234746 am 9aa58405: am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev 
* commit '9aa58405ccddfcaace0387c7e052c88b9cc754b7':
  Fix crash in built-in wallpaper cropper
 2013-10-07 17:25:13 -07:00
Michael Jurka
9aa58405cc am 5dadf838: Merge "Fix crash in built-in wallpaper cropper" into klp-dev 
* commit '5dadf8389eed7b0bf04bcbf89d10f13d366b2d68':
  Fix crash in built-in wallpaper cropper
 2013-10-07 17:22:02 -07:00
Michael Wright
839dae4a96 am d07179ba: am 7c677bb8: am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev 
* commit 'd07179ba2343713685a546d7f8b14bf49d9b5a5c':
  Show no_sim icon when no SIM card is available.
 2013-10-07 17:19:51 -07:00
Michael Jurka
5dadf8389e Merge "Fix crash in built-in wallpaper cropper" into klp-dev 2013-10-08 00:18:02 +00:00
Michael Wright
d07179ba23 am 7c677bb8: am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev 
* commit '7c677bb8220023bc83ef5b78a8e298ef4d3ab463':
  Show no_sim icon when no SIM card is available.
 2013-10-07 17:16:58 -07:00
Michael Wright
7c677bb822 am bf33f34c: Merge "Show no_sim icon when no SIM card is available." into klp-dev 
* commit 'bf33f34c1b8e6483cefd3abefbe212f4583f6e6c':
  Show no_sim icon when no SIM card is available.
 2013-10-07 17:14:00 -07:00
Jim Miller
9c993bd6ba Disable camera and search from some security screens. 
This disables showing the camera and search buttons in the
navbar while SIM, PUK and Account security screens are showing.

Fixes bug 10991981

Change-Id: Ic64adc079685948f8c1114dbdefa42a671948350
 2013-10-07 17:13:45 -07:00
Michael Wright
bf33f34c1b Merge "Show no_sim icon when no SIM card is available." into klp-dev 2013-10-08 00:10:05 +00:00
Michael Jurka
e72aa7f0a6 Fix crash in built-in wallpaper cropper 
Also, sync to latest version of WallpaperCropActivity

Bug: 10950237
 2013-10-07 17:06:23 -07:00
Baligh Uddin
4a88a415be Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-08 00:01:19 +00:00
Adam Powell
80da140cc4 am 266b3026: am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '266b3026c42ed3ba0feedd9abe3e3bb6932c2f23':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 17:01:16 -07:00
Baligh Uddin
f78c7884ed Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-08 00:01:14 +00:00
Jim Miller
386ea6e0cd am 62d3158f: am bc015e84: am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev 
* commit '62d3158f9ea4678bf2a668508ede3d7f98823a9e':
  Disable keyguard text marquee when the display turns off.
 2013-10-07 17:01:12 -07:00
Adam Powell
266b3026c4 am 20ba658b: am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '20ba658bdb32cb6f02cb12d9f94419e29420f9f5':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 16:27:29 -07:00
Adam Powell
20ba658bdb am 31049d76: Use SCREEN Xfermode for keyguard badges; update SeekBar 
* commit '31049d76c55b18a6d9993f0d9687598740b16014':
  Use SCREEN Xfermode for keyguard badges; update SeekBar
 2013-10-07 16:25:17 -07:00
Adam Powell
31049d76c5 Use SCREEN Xfermode for keyguard badges; update SeekBar 
Plumb through the necessary API features through Drawables and
ImageView but leave it hidden for now pending future API review and
plumbing through the rest of the framework Drawable implementations.

Update SeekBar assets used for keyguard transport control.

Set selected status directly instead of finding views by id.

Bug 10531608
Bug 10784913

Change-Id: Ia38bd04ad1bc26e9e6da1dda8a374c9ba3ceccb3
 2013-10-07 16:14:17 -07:00
Jim Miller
62d3158f9e am bc015e84: am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev 
* commit 'bc015e847f01210298d7ccdd0239518fd8e7ee19':
  Disable keyguard text marquee when the display turns off.
 2013-10-07 16:11:54 -07:00
Jim Miller
bc015e847f am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev 
* commit 'dbc31105bda3591d64e4d3e2abb3b3eaf857222e':
  Disable keyguard text marquee when the display turns off.
 2013-10-07 16:08:54 -07:00
Jim Miller
dbc31105bd Merge "Disable keyguard text marquee when the display turns off." into klp-dev 2013-10-07 23:06:21 +00:00
Jim Miller
20daffd91e Disable keyguard text marquee when the display turns off. 
Fixes bug 11116666

Change-Id: Id9abb9d0531bcf4c5da7014ed4b9b202652b3754
 2013-10-07 15:50:43 -07:00
Jeff Sharkey
5b6372171c am 9d1383c6: am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '9d1383c61ca0932cb36b104a89c32db15de6a10e':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:16:14 -07:00
Jeff Sharkey
f1bab3c816 am f76843d5: am 73c3c65b: am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit 'f76843d52095315846d8a33a982bd7994cec9d8e':
  When launched into empty recents, show drawer.
 2013-10-07 15:16:11 -07:00
Jeff Sharkey
9d1383c61c am 5e02e0a9: am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit '5e02e0a9e1e075e3d451d929b0a67bf280c432ed':
  Add <intent-filter> support to <provider>.
 2013-10-07 15:12:16 -07:00
Jeff Sharkey
f76843d520 am 73c3c65b: am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit '73c3c65b1bb05754c688a76a1dbc79c0120c0915':
  When launched into empty recents, show drawer.
 2013-10-07 15:12:12 -07:00
Jeff Sharkey
5e02e0a9e1 am bcc77b50: Merge "Add <intent-filter> support to <provider>." into klp-dev 
* commit 'bcc77b502b56d4b91610adfa10c657003c9c820d':
  Add <intent-filter> support to <provider>.
 2013-10-07 14:44:52 -07:00
Jeff Sharkey
bcc77b502b Merge "Add <intent-filter> support to <provider>." into klp-dev 2013-10-07 21:41:45 +00:00
Jeff Sharkey
73c3c65b1b am 567fdd9f: Merge "When launched into empty recents, show drawer." into klp-dev 
* commit '567fdd9fbaae4a3f6f8dc123769771881a50ed70':
  When launched into empty recents, show drawer.
 2013-10-07 14:41:17 -07:00
Jeff Sharkey
567fdd9fba Merge "When launched into empty recents, show drawer." into klp-dev 2013-10-07 21:36:25 +00:00
Jeff Sharkey
85f5f81320 Add <intent-filter> support to <provider>. 
For the new documents work, we're only interested in the subset of
ContentProviders that actually implement DocumentsContract.  Instead
of returning all providers, add <intent-filter> support to make it
easier to limit the set of returned ProviderInfo.

Define a well-known action for DocumentsProviders, and start using it
when querying for roots.  Continue supporting the old <meta-data>
approach until all apps have been updated.

Bug: 8599233
Change-Id: I05f049bba21311f5421738002f99ee214447c909
 2013-10-07 14:19:13 -07:00
Jeff Sharkey
a82c2e24bc When launched into empty recents, show drawer. 
Pull out drawer to give users more context about meaningful places
to navigate to.  Also fix bug where restored roots weren't being
highlighted.

Bug: 10852518
Change-Id: Id294f6923477ca4dc505c4b0a21a5bdf8b722cf4
 2013-10-07 14:08:20 -07:00
Baligh Uddin
8033b4e36f Import translations. DO NOT MERGE 
Change-Id: Id8dccbfb430a8b347ce909f3ad1872565968420e
Auto-generated-cl: translation import
 2013-10-07 14:02:30 -07:00
Baligh Uddin
87037fad31 Import translations. DO NOT MERGE 
Change-Id: I118f92a82d6679a2944a959d69c9cb090642ee75
Auto-generated-cl: translation import
 2013-10-07 14:00:53 -07:00
Michael Wright
2eeacc02a2 Show no_sim icon when no SIM card is available. 
Bug: 10958943
Change-Id: I1fcd961ddab45e316d726b90fdbbc176e6e7d737
 2013-10-07 13:50:32 -07:00
Jeff Sharkey
d6269b1575 am ab5cbb7b: am 0e438c2a: am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit 'ab5cbb7bb58b17936193d6411a9f8c3e6015d9f9':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:24:19 -07:00
Jeff Sharkey
ab5cbb7bb5 am 0e438c2a: am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit '0e438c2a1b4e2de34702ce8332b3853db703dbdb':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:21:21 -07:00
Jeff Sharkey
0e438c2a1b am a27366ef: Merge "Ellipsize titles in middle, otherwise end." into klp-dev 
* commit 'a27366efc4cac889ef454b13fa74bb4c4473b2f1':
  Ellipsize titles in middle, otherwise end.
 2013-10-07 13:19:22 -07:00
Jeff Sharkey
a27366efc4 Merge "Ellipsize titles in middle, otherwise end." into klp-dev 2013-10-07 20:17:54 +00:00
Baligh Uddin
ce97178708 Merge "Import translations. DO NOT MERGE" 2013-10-07 19:44:44 +00:00
Baligh Uddin
a02c3b0db3 Merge "Import translations. DO NOT MERGE" 2013-10-07 19:44:36 +00:00
Baligh Uddin
917d56c73f Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:44:14 +00:00
Baligh Uddin
6ac16894a9 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:44:10 +00:00
Baligh Uddin
679ebad04d Merge "Import translations. DO NOT MERGE" 2013-10-07 19:43:58 +00:00
Baligh Uddin
621674dd64 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-07 19:43:54 +00:00
Baligh Uddin
79bcca2311 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-07 19:43:50 +00:00
Baligh Uddin
4180baa58f Merge "Import translations. DO NOT MERGE" 2013-10-07 19:43:43 +00:00