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

94010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
d7337fb97a am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit '3781523becbb2d576761c2701763ff3588294a97':
  Play a tone when wireless charging begins.
 2012-12-11 14:19:41 -08:00
Jeff Brown
3781523bec am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit 'eaae7d976a5629e064af06f0e2c10f97f1a8c462':
  Play a tone when wireless charging begins.
 2012-12-11 14:17:50 -08:00
Jeff Brown
eaae7d976a Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 2012-12-11 14:14:54 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins. 
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
 2012-12-11 12:55:03 -08:00
John Spurlock
5ccefdd6d5 am 49cc9cb8: am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 
* commit '49cc9cb85376bad11611966fcdbe58dae1ab7a56':
  Fallback to default dream if the current dream is removed.
 2012-12-11 11:56:56 -08:00
The Android Open Source Project
6c0ad7a064 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I1ff629cf6a936691e18b7857c1f796a3ed55fc47
 2012-12-11 11:54:15 -08:00
John Spurlock
49cc9cb853 am 5def50da: Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 
* commit '5def50da0de624abeafafe71dc72b4baf423b985':
  Fallback to default dream if the current dream is removed.
 2012-12-11 11:53:53 -08:00
John Spurlock
5def50da0d Merge "Fallback to default dream if the current dream is removed." into jb-mr1.1-dev 2012-12-11 11:51:41 -08:00
Baligh Uddin
fca736b889 am c39adf91: am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'c39adf91c9d99eea31d9e83fa3c905516ebbb37e':
  Import translations. DO NOT MERGE
 2012-12-10 20:23:59 -08:00
Baligh Uddin
c39adf91c9 am d39a0d80: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'd39a0d8041cec16429331937ec81d55f18b0db72':
  Import translations. DO NOT MERGE
 2012-12-10 20:22:17 -08:00
Baligh Uddin
8672f044ff am 73f6e3f5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '73f6e3f583b1ff2948fd82e68a3f813750165b14':
  Import translations. DO NOT MERGE
 2012-12-10 20:20:17 -08:00
Baligh Uddin
d39a0d8041 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-10 20:19:06 -08:00
Baligh Uddin
73f6e3f583 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-10 20:17:14 -08:00
The Android Automerger
20340705bb merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 19:33:40 -08:00
Mita Yun
81f82d29ed am aa8dc2ee: Removed mCallbackLooper from WallpaperService 
* commit 'aa8dc2ee18c15a5c7fb897d2f41116950fd30fe6':
  Removed mCallbackLooper from WallpaperService
 2012-12-10 18:36:01 -08:00
Mita Yun
aa8dc2ee18 Removed mCallbackLooper from WallpaperService 
Change-Id: Icb060a9225dbe7e848bbe80e6a9ab28fcfb59969
 2012-12-10 18:32:03 -08:00
Wink Saville
8c0e3c232a am 74199056: Merge "Add config_speed_up_audio_on_mt_calls option" 
* commit '7419905676db3cecb011d7e63a0eb64421e02b55':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 18:11:34 -08:00
Alex Yakavenka
176c7a2b72 am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '4d56777e678ab17379ec54a0875a14299817da8e':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:08:58 -08:00
Alex Yakavenka
4d56777e67 am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '32b424f7240580e3948f44559050262e18de99d8':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:06:44 -08:00
Wink Saville
7419905676 Merge "Add config_speed_up_audio_on_mt_calls option" 2012-12-10 17:03:46 -08:00
Alex Yakavenka
32b424f724 Add config_speed_up_audio_on_mt_calls option 
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
 2012-12-10 15:47:35 -08:00
Mita Yun
ebcbfb3fc7 am a98cd512: Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev 
* commit 'a98cd5122be643a51f563d02069e8f9409d44394':
  Use asynchronous messages for input method events.
 2012-12-10 15:35:05 -08:00
The Android Open Source Project
a41474d45c Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I2d8ac7dc080c9f3c400d4a7bde4df1dd892ffba4
 2012-12-10 15:19:31 -08:00
John Spurlock
bbdb062d98 Fallback to default dream if the current dream is removed. 
To minimize fix size, return only valid dreams from the service api.

Settings will "just work" with no changes.

Bug:7699398
Change-Id: I3eb88237a8ccc421fdb68d1de19820614b13d7b8
 2012-12-10 18:15:07 -05:00
Wink Saville
879723dd2d am e22217c2: Merge "Telephony: Use IccUtils from uicc package" 
* commit 'e22217c2787b0f4967b357d080d49a7f095b2db9':
  Telephony: Use IccUtils from uicc package
 2012-12-10 14:48:21 -08:00
Mita Yun
a98cd5122b Merge "Use asynchronous messages for input method events." into jb-mr1-aah-dev 2012-12-10 14:37:38 -08:00
Wink Saville
e22217c278 Merge "Telephony: Use IccUtils from uicc package" 2012-12-10 14:13:18 -08:00
The Android Automerger
7406c32d42 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-10 13:06:04 -08:00
Adam Powell
a52b4792d1 am d692c2c6: Merge "Fix EventLog string class problem in onOptionMenuSelected" 
* commit 'd692c2c6856072a3ec8bec4550466d15a9fef8d7':
  Fix EventLog string class problem in onOptionMenuSelected
 2012-12-10 11:41:29 -08:00
Quddus Chong
81f91ce997 am ecacbd26: am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs. 
* commit 'ecacbd266a7bfe52610066ec44439977cc067a98':
  docs: Edit fixes for IABv3 docs.
 2012-12-10 11:36:56 -08:00
Quddus Chong
ecacbd266a am 8642f406: am 9d7578c7: docs: Edit fixes for IABv3 docs. 
* commit '8642f406dcfa23836903540c7ecb0895e1e7ac4d':
  docs: Edit fixes for IABv3 docs.
 2012-12-10 11:34:56 -08:00
Quddus Chong
8642f406dc am 9d7578c7: docs: Edit fixes for IABv3 docs. 
* commit '9d7578c73afa69272dcf9476ae3eefc2b59d6778':
  docs: Edit fixes for IABv3 docs.
 2012-12-10 11:32:58 -08:00
Quddus Chong
9d7578c73a docs: Edit fixes for IABv3 docs. 
Change-Id: I20228491c90d05a39ce44f80aa1a065ce60c31e3
 2012-12-10 11:17:48 -08:00
Adam Powell
d692c2c685 Merge "Fix EventLog string class problem in onOptionMenuSelected" 2012-12-10 11:09:32 -08:00
Alex Yakavenka
5d35fcfc32 Telephony: Use IccUtils from uicc package 
Change-Id: I80204a2f3dc57cac875abeab390bb9db7a636ff7
 2012-12-10 10:35:08 -08:00
Nick Kralevich
c0ffba907f am 261bc704: Merge "convert jint to uint32_t." 
* commit '261bc70411ba1dd58654c4eb1c91acbbcfb49060':
  convert jint to uint32_t.
 2012-12-10 10:31:56 -08:00
Nick Kralevich
261bc70411 Merge "convert jint to uint32_t." 2012-12-10 09:44:24 -08:00
Baligh Uddin
ca4d4f7c90 Import translations. DO NOT MERGE 
Change-Id: I7bae78f78c7b112e6084791607023cc6154efa27
Auto-generated-cl: translation import
 2012-12-10 09:18:48 -08:00
Baligh Uddin
9f106549bc Import translations. DO NOT MERGE 
Change-Id: Idecee06e6e72dcc9112b92b793af1bb8f8ce3916
Auto-generated-cl: translation import
 2012-12-10 09:16:28 -08:00
zobject
332944f8a0 Fix EventLog string class problem in onOptionMenuSelected 
EventLog function can handle string,integer class and long class. (in android_util_EventLog.cpp)
If menu title string are used bold tag(like <b>test</b>), it'll be android.text.SpannedString.
In onOptionMenuSelected, it is using item.getTitleCondensed() function for writing event log.
therefore any android activity using tag menu string(like <b></b>) can be crashed by IllegalArgumentException.

I found this crash on GMS Application.
change locale chinese -> launch Google+ -> hangout -> menu key -> Invite(expressed chinese) click -> Google+ crash

Change-Id: I0437be81699925e29bf4510eb615ef2424432763
 2012-12-10 23:19:45 +09:00
Quddus Chong
5fe65556c5 am 3aecb61b: am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '3aecb61bebbe038b74b5e0d96acbb7142835127e':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:53:52 -08:00
Quddus Chong
3aecb61beb am 47050d35: am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '47050d3578986febcc4b28f901effd6b4b9ae41a':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:51:35 -08:00
Quddus Chong
47050d3578 am 768dba6d: docs: Merged commits for final release of IABv3 docs. 
* commit '768dba6d8cd6ad56fb6d4e7e30b3260e0d5e0ffd':
  docs: Merged commits for final release of IABv3 docs.
 2012-12-09 18:49:39 -08:00
Quddus Chong
768dba6d8c docs: Merged commits for final release of IABv3 docs. 
Change-Id: Ib7c26052bb1b4de9a44d78817d7012839eaa953a
 2012-12-09 18:24:06 -08:00
Wink Saville
64a9864591 am be5316e0: Merge "Use Rlog" 
* commit 'be5316e012d98cd3e74f8aff628c88845cc3fb13':
  Use Rlog
 2012-12-08 13:11:45 -08:00
Wink Saville
be5316e012 Merge "Use Rlog" 2012-12-08 12:11:34 -08:00
Wink Saville
22b1e80c24 Use Rlog 
Change-Id: I44919126606cd55f7dce7c942027ed0d914f04bd
 2012-12-08 09:06:51 -08:00
Wink Saville
20ab6d1f02 am c43670be: Merge "Add Rlog.java" 
* commit 'c43670be2b10d0d89b1bfd2fbbf6f70006d00968':
  Add Rlog.java
 2012-12-08 08:38:43 -08:00
Wink Saville
c43670be2b Merge "Add Rlog.java" 2012-12-08 08:00:26 -08:00
Nick Kralevich
7353cf305e convert jint to uint32_t. 
This works around a compiler bug, and is probably more
correct anyway.

Change-Id: I1c49064bd64c31dafae560e416c665de0449f245
 2012-12-07 16:56:47 -08:00