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

5932 Commits

Author SHA1 Message Date
Philip Milne
e0ca5807da am 22238285: am 04b09636: Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 
* commit '222382855d0a15e35c0da785092d2d2a8043c3b4':
  Fix for bug: 7281620. Blank line after date in status widget disappears.
 2012-10-05 10:47:43 -07:00
Philip Milne
04b0963669 Merge "Fix for bug: 7281620. Blank line after date in status widget disappears." into jb-mr1-dev 2012-10-05 10:42:46 -07:00
Philip Milne
0223ffaa04 Fix for bug: 7281620. Blank line after date in status widget disappears. 
Change-Id: I9e8e31e14e17643551c3bf89bac898d91c3d37ca
 2012-10-05 10:27:42 -07:00
Jeff Hamilton
69813a0db1 am 7fe70683: am 20de160c: Revert "Changes to support updating location providers." 
* commit '7fe7068362e4e383390c039488dab65caa51df3b':
  Revert "Changes to support updating location providers."
 2012-10-05 00:52:44 -07:00
Jeff Hamilton
20de160ca3 Revert "Changes to support updating location providers." 
This reverts commit c19efc204aee1f0f3164dc21bd2ef3fdd4259c71.
 2012-10-05 02:32:52 -05:00
Matthew Xie
0c5785465c am 91d1d156: am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev 
* commit '91d1d15624d831eb822ac97dde1916762e136015':
  Add multi user support for bluetooth
 2012-10-04 23:27:17 -07:00
Matthew Xie
d21b483904 Merge "Add multi user support for bluetooth" into jb-mr1-dev 2012-10-04 23:21:34 -07:00
Baligh Uddin
9565ceb609 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 21:43:10 -07:00
Matthew Xie
fca9d63635 Add multi user support for bluetooth 
Create a BLUETOOTH_STACK permission to share between all users of
Bluetooth apk. Bluetooth Manager binds to apk of current user
bug 6925422

Change-Id: I2df5546e977c2d77bc66d97d12479d933826922a
 2012-10-04 18:35:42 -07:00
Jeff Hamilton
35512ab006 am f2e292f5: am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev 
* commit 'f2e292f5548fe791e5b5c882e5e2088e7417e8dc':
  Changes to support updating location providers.
 2012-10-04 18:29:51 -07:00
Jeff Hamilton
82b946496e Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-04 18:23:45 -07:00
Baligh Uddin
97c69c5309 Import translations. DO NOT MERGE 
Change-Id: Ia159a8f09466c150299e55fde16eae23a3d8097c
Auto-generated-cl: translation import
 2012-10-04 13:00:15 -07:00
Elliott Hughes
7e30cc588d am 1f7bddce: am 3594e855: Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev 
* commit '1f7bddce7943b26185da1ba9ac3475f3028f5c2e':
  Fix Catalan ("ca") date formatting.
 2012-10-04 12:42:37 -07:00
Elliott Hughes
3594e855a4 Merge "Fix Catalan ("ca") date formatting." into jb-mr1-dev 2012-10-04 12:38:24 -07:00
Baligh Uddin
ceb4a21e72 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 10:54:18 -07:00
Jeff Hamilton
c19efc204a Changes to support updating location providers. 
There is now only a single config value pointing
at a list of packages to get certs from. The old
system was a bit confusing.

The fused location provider also now builds
against SDK 17, and the meta data service version
tag was renamed from the overly generic "version"
to "serviceVersion".

Bug: 7242814
Change-Id: I00d27c9cbd5cc31a37bb4a98160435d15a72e19e
 2012-10-04 11:00:42 -05:00
Jim Miller
9b8c009510 am c2cb3c2f: am 5b14b969: Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev 
* commit 'c2cb3c2f3cc50a9d583b970cf85978ba36b97d63':
  Fix keyguard landscape layout on phones
 2012-10-03 20:34:07 -07:00
Jim Miller
5b14b9698c Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev 2012-10-03 20:30:10 -07:00
Baligh Uddin
85201d3d92 Import translations. DO NOT MERGE 
Change-Id: I50db6e8159487c9a725b224e3e2206791f58febd
Auto-generated-cl: translation import
 2012-10-03 19:17:05 -07:00
Adam Powell
bc2ddd5192 am 057b2f12: am ac2fc163: Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev 
* commit '057b2f12a964ec2508ae8958240c908857eaebb6':
  Remove unneeded margin below action bar subtitles
 2012-10-03 18:54:40 -07:00
Adam Powell
ac2fc16373 Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev 2012-10-03 18:50:10 -07:00
Jim Miller
ce3e948c5c Fix keyguard landscape layout on phones 
This particular layout didn't have layout_height specified, which
is undefined.  However, the undefined behavior seems to have changed
on the platform to one where this layout no longer works.  Not
specifying layout_height causes the security area view to be 0 pixels
wide, effectively ignoring layout_weight.

Fixes bug 7283261

Change-Id: I0e3d156e9b2d7ef1492dec9791f0e241e8cd7fe6
 2012-10-03 18:48:07 -07:00
Adam Powell
17033bfa15 Remove unneeded margin below action bar subtitles 
This just throws off alignment when the natural centering of this
layout will take care of things.

Bug 6369593

Change-Id: If0993091e0d47011f3bf5dd0b5a1fa649471f8e6
 2012-10-03 18:31:08 -07:00
Amith Yamasani
23243730a2 am f4809ebb: am 2e307a61: Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev 
* commit 'f4809ebba77bdf84b700ae863bfbd913367908d4':
  No breadcrumbs for single-pane preferences
 2012-10-03 17:18:29 -07:00
Amith Yamasani
2e307a61a3 Merge "No breadcrumbs for single-pane preferences" into jb-mr1-dev 2012-10-03 17:13:24 -07:00
Elliott Hughes
e59ac5cb27 Fix Catalan ("ca") date formatting. 
Bug: 7262477
Change-Id: I506972e214640f91d818c53c60d3c45d975a2f86
 2012-10-03 16:54:51 -07:00
Amith Yamasani
3ec7bac9a0 No breadcrumbs for single-pane preferences 
Bug: 7274530
Change-Id: I6a4b6321a72ad38a757098ea470ac58d4294639b
 2012-10-03 16:21:42 -07:00
Adam Powell
3597ea1b45 am b7843586: am 7ba4b482: Merge "Fix build" into jb-mr1-dev 
* commit 'b7843586c1f6e01c2da1dab7fd59dbd3d7fabf1c':
  Fix build
 2012-10-03 09:57:27 -07:00
Adam Powell
7ba4b4823d Merge "Fix build" into jb-mr1-dev 2012-10-03 09:51:47 -07:00
Adam Powell
e1339bf493 Fix build 
Change-Id: I0ec6a79ab4e82de04c438b2fb3fa914b21554593
 2012-10-03 09:47:33 -07:00
Baligh Uddin
9e85191e26 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 2012-10-03 09:43:09 -07:00
Baligh Uddin
b92df330d8 Revert "Import translations. DO NOT MERGE" 
Build broken

This reverts commit 6310b2099e98c843b41db0f83461bf07b1a707b4

Change-Id: I14f57183122252583b9b5cde5424595908000e65
 2012-10-03 09:11:19 -07:00
Baligh Uddin
8a29640e15 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-03 08:52:47 -07:00
Jim Miller
da0c961a76 am 65e79911: am 6bcd7320: Switch back to user switcher in keyguard 
* commit '65e79911aa6152b37fd7f0962d572dad9bf54826':
  Switch back to user switcher in keyguard
 2012-10-02 23:04:22 -07:00
Jim Miller
6bcd73203a Switch back to user switcher in keyguard 
Change-Id: I9acfb61fd34ad24a299e1f11f792e9e240f2b065
 2012-10-02 22:53:26 -07:00
Adam Cohen
f1cf62f50c am 52a38876: am 61cd69c3: Keyguard polish 
* commit '52a3887614a1e7a45cef38a9f27ffe38bba450ce':
  Keyguard polish
 2012-10-02 22:23:42 -07:00
Adam Cohen
61cd69c378 Keyguard polish 
-> Updated user switcher to be closer to spec (issue 7047393)
-> Drawing keyguard overscroll gradient manually in KeyguardWidgetFrame
   (eliminates need for assets, eliminates banding)
-> Fixed clipping of overscroll on sw600dp using negative margin

Change-Id: I90ec7f820ca7dccebf7e05628a3185e95d41af08
 2012-10-02 21:55:08 -07:00
Svetoslav Ganov
82eaaf05d9 am d18a31c6: am 5cf72e11: Merge "Accessibility support for the widgets switcher of the lock screen." into jb-mr1-dev 
* commit 'd18a31c6c1163988cb8d00ddc7e36bd55a770a92':
  Accessibility support for the widgets switcher of the lock screen.
 2012-10-02 17:06:07 -07:00
Irfan Sheriff
53c37806d3 am 5ffd5652: am 75c48009: Merge "Add icon for mobile notification" into jb-mr1-dev 
* commit '5ffd5652b699663f4bce89b314015205a5a01333':
  Add icon for mobile notification
 2012-10-02 17:02:52 -07:00
Svetoslav Ganov
5cf72e11b6 Merge "Accessibility support for the widgets switcher of the lock screen." into jb-mr1-dev 2012-10-02 17:00:21 -07:00
Irfan Sheriff
75c4800915 Merge "Add icon for mobile notification" into jb-mr1-dev 2012-10-02 16:58:15 -07:00
Svetoslav Ganov
6526fdd749 Accessibility support for the widgets switcher of the lock screen. 
bug:7232727
bug:7229598

Change-Id: Ib76b81b170bed0c4ef10f5141bf70f779ffa1ac4
 2012-10-02 16:58:04 -07:00
Irfan Sheriff
ebb8f413e6 Add icon for mobile notification 
Bug: 7087564
Change-Id: If856bdfa28c024fb775fd3f8231bd5a16fef59e6
 2012-10-02 16:50:29 -07:00
Jeff Brown
eaf3665861 am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev 
* commit '709b943475e3395b580451911557f894480e3133':
  Add new Display API for secure video capabilities.
 2012-10-02 16:44:02 -07:00
Jeff Brown
bcbe9cf475 Merge "Add new Display API for secure video capabilities." into jb-mr1-dev 2012-10-02 16:39:08 -07:00
Jim Miller
8c4343378c am 90f7f565: am 970a494c: Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev 
* commit '90f7f5657a67dc7a5caee42f44bcdd6d9b3da5b2':
  Attempt to fix missing transport control in keyguard
 2012-10-02 16:30:34 -07:00
Jim Miller
970a494ce1 Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev 2012-10-02 16:25:15 -07:00
Jeff Brown
77aebfdbae Add new Display API for secure video capabilities. 
Added a new API to determine whether the display supports
protected buffers so that an application can choose a different
content stream or change how it decodes the content so
that it will be viewable on the display.

At present, wifi display does not fully support protected
buffers although this may be enhanced in the future.

Bug: 6986623
Change-Id: If53a53d72b0ec92753cc4b29f99fcb131e00449b
 2012-10-02 16:25:10 -07:00
Robert Greenwalt
8bf6cbb958 am 94195fa6: am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev 
* commit '94195fa611331dd7ea771e1e24ca6d50caa0fb89':
  Re-add default sms_short_codes.
 2012-10-02 15:55:05 -07:00
Robert Greenwalt
98ec56604d Merge "Re-add default sms_short_codes." into jb-mr1-dev 2012-10-02 15:49:58 -07:00