Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,390 Commits 3 Branches 0 Tags
5c28267461abfde7007d4de1069a79e8a757f978
Commit Graph

27718 Commits

Author SHA1 Message Date
Bjorn Bringert
5c28267461 am f9173428: am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev 
* commit 'f9173428688ce2b6192e72fd70d18ff74cbb34be':
  Add intents to open text and video from search.
 2012-09-21 12:46:50 -07:00
Dan Morrill
9589c79914 am 7c987ca4: am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev 
* commit '7c987ca47cf37af719d05b161e7b516c0dee8740':
  New method returning user metadata.
 2012-09-21 12:45:08 -07:00
Daniel Sandler
94b5cd9b37 am 89e27caa: am 0887711d: Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 
* commit '89e27caa0cc4a488eaf202c2478204238f95fc0a':
  Add Notification.Builder.setShowWhen(boolean).
 2012-09-21 12:44:19 -07:00
Bjorn Bringert
45b07b9427 Merge "Add intents to open text and video from search." into jb-mr1-dev 2012-09-21 10:30:20 -07:00
Dan Morrill
466bd63681 Merge "New method returning user metadata." into jb-mr1-dev 2012-09-21 09:53:57 -07:00
Daniel Sandler
0887711d0f Merge "Add Notification.Builder.setShowWhen(boolean)." into jb-mr1-dev 2012-09-21 07:30:43 -07:00
Florian Uunk
b1ac72b54b Add intents to open text and video from search. 
We're adding support for searching for text (books, magazines) and video
(tv, movies).

Bug: 7208141
Change-Id: I19dd2f745518a96b22b02a29c1ab9a89d53cc0cc
 2012-09-21 15:15:04 +01:00
Michael Jurka
8f7ac705f8 am 3b3bd0f5: am 7566abd3: Merge "Add support for changing status widget on security screen" into jb-mr1-dev 
* commit '3b3bd0f5031c6dafcd34c1b6335c33d1f877c01b':
  Add support for changing status widget on security screen
 2012-09-21 01:15:32 -07:00
Wu-cheng Li
17a5666183 am ff05108d: am c9cc62b9: Merge "Add secure version of image capture intent." into jb-mr1-dev 
* commit 'ff05108dc6a0213bbce551554e426e8d8f20a418':
  Add secure version of image capture intent.
 2012-09-21 01:13:54 -07:00
Michael Jurka
7566abd305 Merge "Add support for changing status widget on security screen" into jb-mr1-dev 2012-09-21 01:10:53 -07:00
Wu-cheng Li
c9cc62b965 Merge "Add secure version of image capture intent." into jb-mr1-dev 2012-09-21 01:08:00 -07:00
Wu-cheng Li
37959ef70f Add secure version of image capture intent. 
bug:7141738

Change-Id: I77789ffb53e70efd946f331286a895b7a1239661
 2012-09-21 14:47:47 +08:00
Amith Yamasani
f16c559cff am e6a5c571: am 74defbf2: Merge "Query users excluding any being removed" into jb-mr1-dev 
* commit 'e6a5c571c3bb174fe66d2f418070c549bc195c98':
  Query users excluding any being removed
 2012-09-20 23:13:21 -07:00
Amith Yamasani
74defbf202 Merge "Query users excluding any being removed" into jb-mr1-dev 2012-09-20 23:08:45 -07:00
Amith Yamasani
920ace0bbc Query users excluding any being removed 
Keep track of user creation and last logged-in time.
adb shell dumpsys users
User switcher shouldn't show users about to be removed.
No need to check for singleton for activities.

Bug: 7194894
Change-Id: Ic9a59ea5bd544920479e191d1a1e8a77f8b6ddcf
 2012-09-20 22:33:43 -07:00
Fabrice Di Meglio
69235be493 am eedda1d1: am 8da91a69: Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev 
* commit 'eedda1d1c66c736b68027c452402292edef4d4ae':
  Fix bug #7205072 Text inside popup window is too close to the edge
 2012-09-20 20:28:37 -07:00
Jeff Brown
a627db895e am 2872e019: am f2eb2e3e: Merge "Fix javadoc." into jb-mr1-dev 
* commit '2872e01929dc2fcfdec03166b9a16577743b59b8':
  Fix javadoc.
 2012-09-20 20:28:33 -07:00
Adam Cohen
bae266f03d am 836739a3: am 11a6450e: Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev 
* commit '836739a341f62a93fd115f56c0c3747e9d4e3270':
  Fixing partiallyUpdateAppWidget to cache the new changes
 2012-09-20 20:28:18 -07:00
John Reck
6a05111556 am 45e84330: am e6ff4784: Merge "Use less static synchronized" into jb-mr1-dev 
* commit '45e843304f6f60e45d4371ce637e2fa442f4f28a':
  Use less static synchronized
 2012-09-20 20:27:53 -07:00
Eric Laurent
116ad74808 am 2af42833: am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev 
* commit '2af4283374015d2d44433e628259f94a53e111e9':
  Fix safe volume warning message flickering
 2012-09-20 20:27:46 -07:00
Christopher Tate
61b03a04ee am 820c12c1: am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 
* commit '820c12c1cb6e6f275fb6beb0706d8ac3abe38f5f':
  Multiuser awareness in content observer infrastructure
 2012-09-20 20:27:35 -07:00
Dan Morrill
e4ab16ad98 New method returning user metadata. 
Change-Id: Ic1a42cf54152fe2e6bcd01b1bd9f1edb77d1710e
 2012-09-20 20:25:55 -07:00
Michael Jurka
20c41d5382 Add support for changing status widget on security screen 
Change-Id: I080fd89eb84445604c602b6e807b55153a7ee129
 2012-09-20 19:19:41 -07:00
Fabrice Di Meglio
8da91a699c Merge "Fix bug #7205072 Text inside popup window is too close to the edge" into jb-mr1-dev 2012-09-20 18:51:23 -07:00
Jeff Brown
f2eb2e3e03 Merge "Fix javadoc." into jb-mr1-dev 2012-09-20 18:47:50 -07:00
Fabrice Di Meglio
3e27c34e0e Fix bug #7205072 Text inside popup window is too close to the edge 
- if targetSDK is pre JB-MR1 then we really need to use the User padding
when it is defined and valid

Change-Id: If416fbc181b8784de446e9171529147ab03c9373
 2012-09-20 18:27:17 -07:00
Adam Cohen
11a6450e54 Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev 2012-09-20 18:09:11 -07:00
Jeff Brown
a95a3b494f Fix javadoc. 
Bug: 7172727
Change-Id: I55ee0099ea2e61f5f0a9de7b434fb8fb858ad5f9
 2012-09-20 17:49:47 -07:00
John Reck
e6ff47840f Merge "Use less static synchronized" into jb-mr1-dev 2012-09-20 16:55:40 -07:00
Eric Laurent
6730c3c69f Merge "Fix safe volume warning message flickering" into jb-mr1-dev 2012-09-20 16:53:10 -07:00
Eric Laurent
0516a9ecb0 Fix safe volume warning message flickering 
Do not display a new warning message when one is already showing.

Bug 7064975.

Change-Id: I920656c6d742a969c29e8f42a438ecbc794d1114
 2012-09-20 16:48:44 -07:00
Dianne Hackborn
febd9cb1af am b79d01ed: am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 
* commit 'b79d01edb29f1d047ce9adb3e1b90c308ddcb47c':
  Implement multi-user PackageMonitor.
 2012-09-20 15:46:29 -07:00
Dianne Hackborn
53cfedca95 am f8171e22: am e6f63800: Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 
* commit 'f8171e229bb3036e762bc8545c99e31e1cbfef3b':
  Fix issue #7196015: system_server deadlock during setup wizard
 2012-09-20 15:46:17 -07:00
Christopher Tate
58e7f73c6e Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev 2012-09-20 15:43:57 -07:00
John Reck
9f9d34552f Use less static synchronized 
Bug: 6482144

Change-Id: I86161e3298101c10a112add406615001561e649e
 2012-09-20 15:25:16 -07:00
Adam Cohen
fbe44b7d5e Fixing partiallyUpdateAppWidget to cache the new changes 
-> This is a good change to the widget framework that I've wanted to
   make for a while, but issue 7174198 triggered the immediate need.

Change-Id: I3f267e0e67f2d9f28920bb53973af365a3c9e0ba
 2012-09-20 15:18:47 -07:00
Dianne Hackborn
6de76d21ff Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 2012-09-20 14:54:10 -07:00
Dianne Hackborn
c72fc674a3 Implement multi-user PackageMonitor. 
New APIs let you indicate what user(s) to monitor, and tell you
what user is changing when receiving a callback.

Fix package manager to only deliver package brpadcasts to the
running users.  (This isn't really a change in behavior, since
the activity manager would not deliver to stopped users anyway).
Make sure all broadcasts that package monitor receives also include
user information for it to use.

Update wallpaper service to (hopefully) now Really Correctly
monitor package changes per user.

Change-Id: Idd952dd274abcaeab452277d9160d1ae62919aa0
 2012-09-20 14:53:18 -07:00
Dianne Hackborn
e6f6380027 Merge "Fix issue #7196015: system_server deadlock during setup wizard" into jb-mr1-dev 2012-09-20 14:33:50 -07:00
Christopher Tate
b756445429 Multiuser awareness in content observer infrastructure 
Content observers are registered under the calling user's identity,
not under the provider host's identity (unless the caller is using
the new permissioned entry points that allow observers to be
registered for a different user's view of the data).  The most important
implication of this is that when the settings provider is directly
queried, the Cursor returned to the app is wired for change notifications
based on that calling app's user.

Note that it is not possible to use query() / insert() to read/write
data for different users.  All such manipulations should use the
standard get* / put* methods in Settings.*.

Bug 7122169

Change-Id: If5d9ec44927e5e56e4e7635438f4ef48a5430986
 2012-09-20 13:58:16 -07:00
Irfan Sheriff
b42fb03b79 am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev 
* commit '6c0fcc961e1650113947918dc105c2a459ebf40d':
  Captive check for both mobile and wifi
 2012-09-20 13:39:30 -07:00
Irfan Sheriff
314488b791 Merge "Captive check for both mobile and wifi" into jb-mr1-dev 2012-09-20 13:33:52 -07:00
Geremy Condra
d25ce3a8a7 am 50caa25a: am d053554f: Merge "Push dropbox logging into libcore." into jb-mr1-dev 
* commit '50caa25a53efaa6f9338064436599945d6d8d616':
  Push dropbox logging into libcore.
 2012-09-20 13:01:03 -07:00
Eric Laurent
2bb7e677b6 am 13bd3ed4: am f9fac2c5: Merge "Add multi user volume management" into jb-mr1-dev 
* commit '13bd3ed4796fae13f0daaa8ce062fdd8effec737':
  Add multi user volume management
 2012-09-20 13:00:55 -07:00
John Reck
91249ce452 am cfe353ba: am b6610d82: Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 
* commit 'cfe353bad0e5daed9f2166ce37973f2a6b3d9c54':
  Fix DPI scaling on TVDPI
 2012-09-20 13:00:47 -07:00
Elliott Hughes
dbd0abd6f9 am ce14f217: am 3d5be42e: Merge changes I87c2ab9e,I2dafcc34,I731c96c2 into jb-mr1-dev 
* commit 'ce14f2176028108b649b3b068ac1275b81287b21':
  Fix formatDateRange month names for Farsi.
  Use localized digits for Time formatting.
  Use proper digits in formatElapsedTime and format3339
 2012-09-20 13:00:44 -07:00
Irfan Sheriff
9538bdd3c7 Captive check for both mobile and wifi 
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
 2012-09-20 12:13:06 -07:00
Geremy Condra
d053554f80 Merge "Push dropbox logging into libcore." into jb-mr1-dev 2012-09-20 11:24:14 -07:00
Eric Laurent
f9fac2c5fe Merge "Add multi user volume management" into jb-mr1-dev 2012-09-20 11:18:17 -07:00
John Reck
b6610d8289 Merge "Fix DPI scaling on TVDPI" into jb-mr1-dev 2012-09-20 10:21:41 -07:00