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

36905 Commits

Author SHA1 Message Date
Svetoslav Ganov
d902dbb2ea am ed734d98: am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit 'ed734d98d014945cf28aa5e49ba1fd2ff5c82c01':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 13:21:53 -08:00
Svetoslav Ganov
ed734d98d0 am 0e7adaff: am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit '0e7adaff99778c596bfd3f4c1e42710592c472a2':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 13:17:08 -08:00
Svetoslav Ganov
0e7adaff99 am 438a3b35: Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 
* commit '438a3b35f7a6184a19919de90f733be82e21a84c':
  Cannot move edit text cursor to first position using character granularity.
 2012-11-30 12:40:37 -08:00
Svetoslav Ganov
438a3b35f7 Merge "Cannot move edit text cursor to first position using character granularity." into jb-mr1-dev 2012-11-30 11:43:54 -08:00
Nick Kralevich
4816f4b408 am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev 
* commit '0def7b94960ae551c498212d97c7919da7529429':
  Secure a handful of framework broadcasts
 2012-11-30 10:40:18 -08:00
Nick Kralevich
0def7b9496 am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev 
* commit '849f5188e34ea667b689e795d88411a2412db2e8':
  Secure a handful of framework broadcasts
 2012-11-30 10:38:21 -08:00
Nick Kralevich
849f5188e3 am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev 
* commit '6643ea823bf8b0726da0518ffecfcc7a9f60f87d':
  Secure a handful of framework broadcasts
 2012-11-30 10:35:44 -08:00
Nick Kralevich
6643ea823b resolved conflicts for merge of 011132a7 to jb-mr1-dev 
Change-Id: I304ef91eef99526dec348a59b12c0934173bcfcb
 2012-11-30 10:23:56 -08:00
Robert Greenwalt
011132a7d3 am b8da0376: Secure a handful of framework broadcasts 
* commit 'b8da0376f2d50fdb2ee58deacc6d2041689e36d1':
  Secure a handful of framework broadcasts
 2012-11-30 10:05:33 -08:00
Marco Nelissen
7f05beb125 am 334a36b3: Merge "Change the text color of timer in MediaController" 
* commit '334a36b32c96d26f3aedcca81ab475391414dc80':
  Change the text color of timer in MediaController
 2012-11-30 09:55:34 -08:00
Eric Laurent
b46857d228 am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 
* commit 'b1f45c4a587e5adda39774a867c78b56682c5f0d':
  AudioService: improve initial safe volume delay
 2012-11-30 09:31:03 -08:00
Eric Laurent
b1f45c4a58 am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 
* commit 'c3eb57b22f930f07448e877f0814eb5659bfc3c5':
  AudioService: improve initial safe volume delay
 2012-11-30 09:28:56 -08:00
Eric Laurent
c3eb57b22f Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev 2012-11-30 09:26:30 -08:00
Roger Chen
56dc91f7ce Change the text color of timer in MediaController 
The color of timer and backgroud in MediaController
are too closer to distinguish.

Change-Id: Id60ecbc26233857c7ef291ef891c9d4720309dfa
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
 2012-11-30 08:58:43 -08:00
Baligh Uddin
a1b3b99c7f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-29 21:06:23 -08:00
Baligh Uddin
2c2b232b41 am 2138e5c0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '2138e5c0f6b78e0e248945da498bd716c928505f':
  Import translations. DO NOT MERGE
 2012-11-29 21:06:04 -08:00
Baligh Uddin
4668391b27 am 497a40e0: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '497a40e0b274ecdbc7dd8e771ded57be9f0b6727':
  Import translations. DO NOT MERGE
 2012-11-29 21:04:54 -08:00
Baligh Uddin
497a40e0b2 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-29 21:02:10 -08:00
Eric Laurent
05274f348e AudioService: improve initial safe volume delay 
AudioService relies on a valid mmc in order to enforce the headset
volume limitation or not. There is a timeout to enforce the limitation
if no mcc is configured after boot.
Until this timeout is reached or a valid SIM is detected the headset
volume is not limited.

This change makes that the last known volume limitation state (enforced or
not) is persisted so that next time we boot, last known state is applied until
a new mcc is configured if any. In most cases, the mcc does not change from one
boot to the next and we do the right thing. If teh mcc does change, the correct
policy will be enforced when the mcc is detected or after the timeout.

Also fix a bug where the volume panel was not displayed if the limitation mechanism
is triggered at the first press on VOL+ key.

Bug 7455275.

Change-Id: Id0f2996d893d38c6a14f4f9e4a0e9e3be17ef127
 2012-11-29 17:46:05 -08:00
Michael Jurka
4ed32c248a am d2de8033: am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit 'd2de8033a304e951426e66e1f2c800402271c5e3':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:56:34 -08:00
Michael Jurka
d2de8033a3 am a8d63ec9: Merge "Disable adding keyguard widgets until setup is done" into jb-mr1.1-dev 
* commit 'a8d63ec9f328e56d9ccad385f137a30fa104c1a7':
  Disable adding keyguard widgets until setup is done
 2012-11-29 15:54:47 -08:00
Dianne Hackborn
84ea428d24 am ed8c323a: am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev 
* commit 'ed8c323a6c776540de356d6fc7d902cc5916fef5':
  Fix issue #7585876: When changing the font settings, the movie...
 2012-11-29 14:28:24 -08:00
zzy
de95a276e7 am 3fe63ce4: am 652678af: timeout support for accept() and added check for signal size 
* commit '3fe63ce4a97a448e6f91754b6b9fa80eecead40b':
  timeout support for accept() and added check for signal size
 2012-11-29 14:27:33 -08:00
Fabrice Di Meglio
cd91470aad am 146b1290: am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev 
* commit '146b129075bfe879aa09888744d1ba8de06f331a':
  Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
 2012-11-29 14:27:05 -08:00
Adam Powell
8912a72cb2 am 46263369: am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 
* commit '462633695774a3cfd84b5c729266d039ec686a64':
  Fix time-related ScaleGestureDetector methods
 2012-11-29 14:27:01 -08:00
Adam Powell
2a1f11e975 am 57c23a46: am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '57c23a464a8428f089531a5d3cab20c81eb6ccee':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-29 14:26:57 -08:00
Adam Powell
1126c2a693 am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '76ee9a9c171d08802b44883be54b32dc31aa680b':
  Import assets from UX
 2012-11-29 14:26:49 -08:00
Dianne Hackborn
5007dea96e am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit 'bac91ebdd0ae310a6b92a8b4bb91613025238356':
  Cleaner initial boot.
 2012-11-29 14:26:37 -08:00
Adam Cohen
20b9edd805 am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:26:29 -08:00
Robert Greenwalt
81cf3abdd5 am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '10659cb1be0059353f9e2ae64c7cfcc9ec312ba3':
  Secure a handful of framework broadcasts
 2012-11-29 14:26:20 -08:00
Fabrice Di Meglio
52c3833e20 am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '075817450c61902ecaaf4af2d96e8542123a86bd':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-29 14:25:43 -08:00
Dianne Hackborn
221d59f723 am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
  Quiet down a lot of logging.
 2012-11-29 14:25:40 -08:00
Michael Jurka
fff5614cae Disable adding keyguard widgets until setup is done 
Bug: 7504154

Change-Id: I865f0139bb328e6b9b19493e0d8f9f086e2ebc38
 2012-11-29 13:15:39 -08:00
Robert Greenwalt
b8da0376f2 Secure a handful of framework broadcasts 
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.

bug:7622253
(cherry picked from commit 47918ae3b4e7ebb54711884e9ff9d0300591ab8b)

Conflicts:

	core/res/AndroidManifest.xml

Change-Id: I118b31489fe7add5b8d69289cab9f4e8ab269495
 2012-11-29 13:06:23 -08:00
Dianne Hackborn
ed8c323a6c am 38e84700: Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev 
* commit '38e847004978031c2b914714e92bc5407ba3ce65':
  Fix issue #7585876: When changing the font settings, the movie...
 2012-11-29 12:08:41 -08:00
Dianne Hackborn
38e8470049 Merge "Fix issue #7585876: When changing the font settings, the movie..." into jb-mr1.1-dev 2012-11-29 12:05:33 -08:00
Dianne Hackborn
7ac8bbddfc Fix issue #7585876: When changing the font settings, the movie... 
...just keeps attempting to load and doesn't play on the TV

Change-Id: Ifcdc969a037a113224632f907d55f60a168dd05a
 2012-11-29 11:59:58 -08:00
Elliott Hughes
878da65328 am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error." 
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
  Fix AndroidHttpClient documentation error.
 2012-11-29 10:21:23 -08:00
Elliott Hughes
9ed4abd875 Merge "Fix AndroidHttpClient documentation error." 2012-11-29 09:23:54 -08:00
Elliott Hughes
565de5f6cb am 820b3e29: Merge "Make transactGetSockaddr locale safe" 
* commit '820b3e29caab93de9535f18d98c6fd264c7fa983':
  Make transactGetSockaddr locale safe
 2012-11-29 09:14:35 -08:00
Baligh Uddin
6abe146700 Import translations. DO NOT MERGE 
Change-Id: Ie73d50cbd57de973c7a01c51eedbf807fb7526e4
Auto-generated-cl: translation import
 2012-11-29 09:02:02 -08:00
Baligh Uddin
eeac626809 Import translations. DO NOT MERGE 
Change-Id: I5ba3917c7ad5b6ec719f22aa79ce6132aea74b39
Auto-generated-cl: translation import
 2012-11-29 08:59:36 -08:00
Baligh Uddin
5cf78cc48c Import translations. DO NOT MERGE 
Change-Id: I342da4dadf4edafa807354d324efc15af94f70a3
Auto-generated-cl: translation import
 2012-11-29 08:57:01 -08:00
Elliott Hughes
820b3e29ca Merge "Make transactGetSockaddr locale safe" 2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error. 
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
 2012-11-29 08:32:13 -08:00
zzy
3fe63ce4a9 am 652678af: timeout support for accept() and added check for signal size 
* commit '652678af4d18b9a6c18ce6a860de01d958bc82fe':
  timeout support for accept() and added check for signal size
 2012-11-29 00:30:28 -08:00
zzy
652678af4d timeout support for accept() and added check for signal size 
bug 7592240

Change-Id: Ide1868da669c190cdfed90f7af3f739ec9da690b
 2012-11-28 22:12:27 -08:00
Fabrice Di Meglio
146b129075 am cdc6d5cf: Merge "Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode" into jb-mr1.1-dev 
* commit 'cdc6d5cf88e8eb73a557052679c436e864cb1853':
  Fix bug #7617883 RelativeLayout is not having the correct width when in RTL mode
 2012-11-28 19:50:49 -08:00
Adam Powell
4626336957 am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 
* commit '66cedab63bf0c17e59a5815200bd9200164d89ec':
  Fix time-related ScaleGestureDetector methods
 2012-11-28 19:50:46 -08:00
Adam Powell
57c23a464a am 10479a29: Merge "Clean up behavior of type arguments for MediaRouter#getSelectedRoute" into jb-mr1.1-dev 
* commit '10479a29cbdc55cfd25b30cd792a151234b55fa6':
  Clean up behavior of type arguments for MediaRouter#getSelectedRoute
 2012-11-28 19:50:43 -08:00