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

86708 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
047ceab558 am d07f8d0b: Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev 
* commit 'd07f8d0b373fa4581c6b11738931c8f9fbd79ac7':
  Re-fixing content descritpion on quick settings toggle. Bug: 7362316
 2012-10-22 13:48:27 -07:00
Svetoslav Ganov
d07f8d0b37 Merge "Re-fixing content descritpion on quick settings toggle. Bug: 7362316" into jb-mr1-dev 2012-10-22 13:45:13 -07:00
Victoria Lease
2e2f8508ee am 92d99223: Merge "LocationManager javadoc permission fixes" into jb-mr1-dev 
* commit '92d9922370ffe50932361602f46b275d085e61b8':
  LocationManager javadoc permission fixes
 2012-10-22 13:41:21 -07:00
Victoria Lease
92d9922370 Merge "LocationManager javadoc permission fixes" into jb-mr1-dev 2012-10-22 13:38:09 -07:00
Amith Yamasani
aad8cd4daa am 22788981: Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 
* commit '2278898126c1cea4bd345bb96313d381b4ad3993':
  System server should always send broadcasts to a specific or all users
 2012-10-22 13:34:29 -07:00
Amith Yamasani
2278898126 Merge "System server should always send broadcasts to a specific or all users" into jb-mr1-dev 2012-10-22 13:32:24 -07:00
Victoria Lease
2291ca47c7 LocationManager javadoc permission fixes 
The javadoc mistakenly claimed that GPS and PASSIVE location
providers could be used with ACCESS_COARSE_LOCATION permissions.
That was incorrect, and the javadoc has been amended.

Bug: 7389249
Change-Id: I6f6489bb539679a962c67ae7263857700df33c82
 2012-10-22 12:53:32 -07:00
Amith Yamasani
cd75706117 System server should always send broadcasts to a specific or all users 
Bug: 7368245

Log a warning if the system process calls unqualified sendBroadcast()
and other calls.

As a result of the logging above, found a few more method calls such as
bindService() that would benefit from being more explicit to avoid
future confusion and reduce the log warnings.

Change-Id: I17f15c8be9adf7becd456d6abbab606f19befdbf
 2012-10-22 12:38:53 -07:00
Adam Powell
a6ea59ef49 am cd92db84: Merge "Remove View\'s long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 
* commit 'cd92db84c6d9e0c9992abfbbda45d504c7f5e062':
  Remove View's long press callbacks when ACTION_CANCEL is received
 2012-10-22 12:31:34 -07:00
Adam Powell
cd92db84c6 Merge "Remove View's long press callbacks when ACTION_CANCEL is received" into jb-mr1-dev 2012-10-22 12:29:02 -07:00
Daniel Sandler
cedb7095a0 am a4be1b2b: Merge "Fix empty notification panel." into jb-mr1-dev 
* commit 'a4be1b2bcdc768708f594b69923986617a367820':
  Fix empty notification panel.
 2012-10-22 12:17:26 -07:00
Adam Powell
5311c4476e Remove View's long press callbacks when ACTION_CANCEL is received 
Bug 7391646

Change-Id: Icd100d3eff63a54c892367fb70dec517257a01f8
 2012-10-22 12:15:49 -07:00
Daniel Sandler
c613a062f1 am 564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev 
* commit '564c03dac59ecd2255bba658b254fd1f5672ec22':
  Really hide the settings button on tablets.
 2012-10-22 12:15:35 -07:00
Daniel Sandler
a4be1b2bcd Merge "Fix empty notification panel." into jb-mr1-dev 2012-10-22 12:14:13 -07:00
Daniel Sandler
564c03dac5 Merge "Really hide the settings button on tablets." into jb-mr1-dev 2012-10-22 12:12:48 -07:00
Daniel Sandler
50bc4f5a7c Fix empty notification panel. 
If the panel closed before the flip animation completed, you
would have had a bad time.

Bug: 7391510
Change-Id: I45c29de45b718bc63e7be1a5544c1f73ac6f46e0
 2012-10-22 14:47:55 -04:00
Daniel Sandler
7382a025a7 Really hide the settings button on tablets. 
Bug: 7382185
Change-Id: Id452e2499ba2089b8cfb0071b6aedf6d1d917b35
 2012-10-22 14:37:20 -04:00
Michael Jurka
164497d671 am 39c65262: Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev 
* commit '39c6526249a27b9dd9252910adecf8353b0792f0':
  Add NPE check to fix crash in Recents
 2012-10-22 11:16:26 -07:00
Michael Jurka
39c6526249 Merge "Add NPE check to fix crash in Recents" into jb-mr1-dev 2012-10-22 11:12:01 -07:00
Michael Jurka
2a430cccc2 Add NPE check to fix crash in Recents 
Bug: 7383315
 2012-10-22 10:56:18 -07:00
Baligh Uddin
55fb1ab5ff Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-22 10:44:21 -07:00
Jeff Brown
1ab678ba71 am d6e3ad54: Merge "Reduce screen on/off latency." into jb-mr1-dev 
* commit 'd6e3ad54907ec085aa41e5c77296e9f385c22e67':
  Reduce screen on/off latency.
 2012-10-22 10:40:21 -07:00
Jeff Brown
d6e3ad5490 Merge "Reduce screen on/off latency." into jb-mr1-dev 2012-10-22 10:36:59 -07:00
Dianne Hackborn
a582c5081b am f584f111: Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev 
* commit 'f584f1112772fdffce13cba38995b9e28adca191':
  Fix issue #7353900: Brief flash of home screen while dream starts on lock screen.
 2012-10-22 10:32:19 -07:00
Baligh Uddin
ad0bda1994 am e53f5265: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e53f5265d17a14cdb36859779e16ddb1c1a76338':
  Import translations. DO NOT MERGE
 2012-10-22 10:32:16 -07:00
Baligh Uddin
e570c9c6f4 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-10-22 10:30:11 -07:00
Dianne Hackborn
f584f11127 Merge "Fix issue #7353900: Brief flash of home screen while dream starts on lock screen." into jb-mr1-dev 2012-10-22 10:29:10 -07:00
Baligh Uddin
e53f5265d1 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-22 10:28:21 -07:00
Baligh Uddin
7150c0a5d1 Import translations. DO NOT MERGE 
Change-Id: I148660f9239763887c14970ff0cfc574e0ae0251
Auto-generated-cl: translation import
 2012-10-22 10:05:55 -07:00
Baligh Uddin
221f69b0fd Import translations. DO NOT MERGE 
Change-Id: I0e70aeaf47180803a74a258143ba462e487b0d4f
Auto-generated-cl: translation import
 2012-10-22 09:46:16 -07:00
Baligh Uddin
93c6094b67 Import translations. DO NOT MERGE 
Change-Id: I02aa0e6fa545b325429029f58d19247b9d3f3373
Auto-generated-cl: translation import
 2012-10-22 09:44:44 -07:00
Daniel Sandler
17d237e1de am cc0106cd: Merge "Properly show emoji in the notification ticker." into jb-mr1-dev 
* commit 'cc0106cd99831ce7d3715e3c85e5b3e6c5c6ca78':
  Properly show emoji in the notification ticker.
 2012-10-22 08:19:06 -07:00
Daniel Sandler
a33079c7bc am 3c84c9bc: Merge "Show brightness dialog for all users." into jb-mr1-dev 
* commit '3c84c9bc7a3ecded5d268f6ec75d8578fd78617a':
  Show brightness dialog for all users.
 2012-10-22 08:19:02 -07:00
Daniel Sandler
cc0106cd99 Merge "Properly show emoji in the notification ticker." into jb-mr1-dev 2012-10-22 08:17:59 -07:00
Daniel Sandler
3c84c9bc7a Merge "Show brightness dialog for all users." into jb-mr1-dev 2012-10-22 08:16:14 -07:00
Daniel Sandler
363a119c52 am 2dd0c3a5: Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 
* commit '2dd0c3a576925be4b5f0438a57af626e6e162e0e':
  New lockscreen: allow search gesture from nav bar.
 2012-10-22 08:02:58 -07:00
Daniel Sandler
2dd0c3a576 Merge "New lockscreen: allow search gesture from nav bar." into jb-mr1-dev 2012-10-22 07:59:18 -07:00
Jim Miller
d6523da1ad Merge latest prototype changes into the framework 
Specifically, this adds the following functionality:
- portrait layout on phones
- new KeyguardViewStateManager
- new SlidingChallengeLayout
- some event wiring.

Change-Id: Ie4491416f591b6d4002d33e9803a764a8ae730f6
 2012-10-21 17:45:09 -07:00
Amith Yamasani
596f143fa6 am 8074e98b: Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 
* commit '8074e98b20ac04fdc032a1ed00dd6763b7e04147':
  Fix crashes when quickly adding and removing users
 2012-10-21 07:47:06 -07:00
Amith Yamasani
8074e98b20 Merge "Fix crashes when quickly adding and removing users" into jb-mr1-dev 2012-10-21 07:44:46 -07:00
Dirk Dougherty
9bd62847b8 am 7707b050: am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '7707b050f7f0f01819aaa6ccdafe0721c267fdeb':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:58:04 -07:00
Dirk Dougherty
7707b050f7 am 454248f0: am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '454248f0d25cfb7e4131acca07a4c38acb74934d':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:55:38 -07:00
Dirk Dougherty
454248f0d2 am e25c241b: am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit 'e25c241bddaf1e838b95c924976861733c7042bf':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:52:41 -07:00
Dirk Dougherty
e25c241bdd am 6faae9ad: Doc change: remove a few third-party refs. Fix broken image ref. 
* commit '6faae9ad08670c30379fed451e73171f7d1b6ac8':
  Doc change: remove a few third-party refs. Fix broken image ref.
 2012-10-20 17:51:00 -07:00
Dirk Dougherty
6faae9ad08 Doc change: remove a few third-party refs. Fix broken image ref. 
Change-Id: Ife1826f9c7d409e131b50e7178eba22f962d4219
 2012-10-20 17:47:18 -07:00
Jim Miller
28f1f5e6f9 Merge "Get basic keyguard working in new branch" into jb-mr1-lockscreen-dev 2012-10-19 19:19:24 -07:00
Fabrice Di Meglio
3f8794dfda am 59420ecd: Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 
* commit '59420ecd1518289cc47c32181250539c981f85f0':
  Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO
 2012-10-19 19:16:59 -07:00
Fabrice Di Meglio
59420ecd15 Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev 2012-10-19 19:14:30 -07:00
Fabrice Di Meglio
d3156a2a56 Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO 
This was a regression introduced by a previous CL.

- we actually need to let the layout params resolution goes all the time
as we dont have any "isResolved" state and a public API for doing its reset thru ViewGroup.

The current implementation is simple and works even if it is doing sometimes a bit more
than it should really do. This is a well conscious tradeoff.

Change-Id: I5c4d532331b3970dfe88f016bc305cbc4a0d83f1
 2012-10-19 18:46:43 -07:00
Jim Miller
838906b165 Get basic keyguard working in new branch 
This merges the changes from the proto app into the framework.
Basic functionality tested on phone in portrait:

- Slide
- Pattern
- PIN
- Password (wonky)
- SIM PIN

Change-Id: I21b2c30cf05dc01ffb20948f41a044e7af1db25f
 2012-10-19 18:42:56 -07:00