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

6760 Commits

Author SHA1 Message Date
Alex Yakavenka
4fee26799e am 176c7a2b: am 4d56777e: am 32b424f7: Add config_speed_up_audio_on_mt_calls option 
* commit '176c7a2b72ff3ee6c34096cb637a48058a7b6798':
  Add config_speed_up_audio_on_mt_calls option
 2012-12-10 17:36:45 -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
32b424f724 Add config_speed_up_audio_on_mt_calls option 
Bug: 7612431
Change-Id: Ia2758f81b78a2576df8dd23c700dba3eaaef8efc
 2012-12-10 15:47:35 -08:00
Adam Powell
29c04ef841 Set an ID for the action bar's Spinner 
This ensures state is preserved properly.

Change-Id: I4bdccaf9b8a30a0a38466a5615cebbb596d80fb4
 2012-12-10 15:42:22 -08:00
Baligh Uddin
c4c10faabd Import translations. DO NOT MERGE 
Change-Id: I961d9eec3384d2ced8ab73b2a60a457a759632ca
Auto-generated-cl: translation import
 2012-12-07 11:58:05 -08:00
Baligh Uddin
6063862966 am 5885a734: Import translations. DO NOT MERGE 
* commit '5885a7349ee456765d0b63eac9581f9d1ff1685d':
  Import translations. DO NOT MERGE
 2012-12-07 11:51:28 -08:00
Baligh Uddin
ef489fe9ed Import translations. DO NOT MERGE 
Change-Id: I4aaf67f3d31f73092284f9ebc09e7f619591cf5e
Auto-generated-cl: translation import
 2012-12-07 11:50:46 -08:00
Baligh Uddin
5885a7349e Import translations. DO NOT MERGE 
Change-Id: If369015db9eff3365982c588ff33f41cf5ef4b93
Auto-generated-cl: translation import
 2012-12-07 11:48:21 -08:00
Eric Laurent
1e8753e460 am 056017cd: am c56a57f7: am 2b89f73e: Enforce camera shutter sound for Korea. 
* commit '056017cd7d966ae4962f2ebd064a615b3e076a85':
  Enforce camera shutter sound for Korea.
 2012-12-06 23:22:48 -08:00
Jake Hamby
f87f1f6e66 am 5fe4be69: am 6fb126b5: am 91bb0771: Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev 
* commit '5fe4be69141ab67b32f99d86cad9817653764417':
  Enable Turkish language encoding for Turkish SIM cards.
 2012-12-06 23:22:44 -08:00
Fabrice Di Meglio
fc46484aa1 am 1527cc19: am a4884a12: am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 
* commit '1527cc19ed4934d0c60a275f8a3c8617baf791fe':
  Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
 2012-12-06 23:22:20 -08:00
Jeff Sharkey
012cfb245e am a4ff88cf: am 1fad16a6: am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit 'a4ff88cf579cc336d54e9d7d8107d90af90bcf98':
  Fix baseline alignment of notification times.
 2012-12-06 23:22:16 -08:00
Eric Laurent
056017cd7d am c56a57f7: am 2b89f73e: Enforce camera shutter sound for Korea. 
* commit 'c56a57f7d775e7b097c62f9e8fb809467dc5cf0c':
  Enforce camera shutter sound for Korea.
 2012-12-06 19:00:52 -08:00
Jake Hamby
5fe4be6914 am 6fb126b5: am 91bb0771: Merge "Enable Turkish language encoding for Turkish SIM cards." into jb-mr1.1-dev 
* commit '6fb126b5bbcf51f50064477f5070fe845cfd5454':
  Enable Turkish language encoding for Turkish SIM cards.
 2012-12-06 19:00:38 -08:00
Fabrice Di Meglio
1527cc19ed am a4884a12: am 0f3af41f: Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 
* commit 'a4884a12a1a6d833bad2e0d0fb85f2129e0a936f':
  Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"
 2012-12-06 18:59:10 -08:00
Jeff Sharkey
a4ff88cf57 am 1fad16a6: am 3757e234: Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 
* commit '1fad16a6353f912168b130a9e595ac4540487827':
  Fix baseline alignment of notification times.
 2012-12-06 18:59:06 -08:00
Eric Laurent
2b89f73ef8 Enforce camera shutter sound for Korea. 
Bug 7680515.

Change-Id: Iafd0296aac36bd048e409f42f7e99eb0895d3d26
 2012-12-06 15:58:19 -08:00
Jake Hamby
37a2163267 Enable Turkish language encoding for Turkish SIM cards. 
Enable Turkish language encoding for SMS messages. Adds an
MCC-specific config.xml override to enable the Turkish
language tables for Turkish SIM cards. Also modifies
GsmAlphabet.java to load the config.xml values before use,
so the SMSDispatcher will get the current values instead of
caching the boot-time values before the MCC is loaded.

Bug: 7422368
Change-Id: I57cd5fcc1d04a2d0cba3e8b9022078679cf5d4c1
 2012-12-06 14:53:44 -08:00
Nick Kralevich
a170bb81d5 Remove duplicate AndroidManifest.xml entries. 
The automerger added the entries twice...

Change-Id: I7910cb2126b339b0c8aee11051db1a2de8ae26ae
 2012-12-05 16:11:42 -08:00
Fabrice Di Meglio
0f3af41fbc Merge "Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart"" into jb-mr1.1-dev 2012-12-05 15:17:35 -08:00
Jeff Sharkey
3757e234d7 Merge "Fix baseline alignment of notification times." into jb-mr1.1-dev 2012-12-05 14:54:00 -08:00
Fabrice Di Meglio
9de0ed43c3 Fix bug #7663550 ActionBar menu items should probably use android:textAlignment="viewStart" 
- add "viewStart" for popup and list menu items

Change-Id: I3adf1a17080056e6d0e5fc8b9c9c95dcaafa90f6
 2012-12-04 18:52:20 -08:00
Jeff Sharkey
ce8e7eec8d Fix baseline alignment of notification times. 
Bug: 7668052
Change-Id: Ifc868ac5988e00c3d63aa1e1e91544d433c858a5
 2012-12-04 16:40:16 -08:00
Daniel Sandler
3ff1139032 am 994901ee: am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit '994901ee7f096751cc593e213ea60a1cbdd9504a':
  Revised language for notification ringtone picker.
 2012-12-04 11:09:25 -08:00
Daniel Sandler
994901ee7f am d9e46ac5: am d8cb8fa4: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit 'd9e46ac5ffcd2a1b3abf70bde14af7d10ebf018b':
  Revised language for notification ringtone picker.
 2012-12-04 11:06:25 -08:00
Daniel Sandler
d8cb8fa463 Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 2012-12-04 11:01:04 -08:00
Daniel Sandler
aa9c5b6e9f Revised language for notification ringtone picker. 
Bug: 7659273
Change-Id: I5cb94a24b8ebff96ab5b567efc39a780300ee7ee
 2012-12-04 09:06:21 -05:00
Baligh Uddin
d8567b661c am 47ae0b93: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '47ae0b93c3a3b4fcb32cd46ad3b8313959344912':
  Import translations. DO NOT MERGE
 2012-12-03 21:09:55 -08:00
Baligh Uddin
2306bec585 am 4ca5fbaa: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4ca5fbaa91dc002647b2fd5f63b8a162cefc3553':
  Import translations. DO NOT MERGE
 2012-12-03 21:04:02 -08:00
Baligh Uddin
7481fecf04 Import translations. DO NOT MERGE 
Change-Id: Ib3112fc5a6ae82de1a37c63d0196ce764d56b18d
Auto-generated-cl: translation import
 2012-12-03 10:28:48 -08:00
Baligh Uddin
a4e15c12d8 Import translations. DO NOT MERGE 
Change-Id: I3ebc7310e109d45facea00213daacf9d10e22285
Auto-generated-cl: translation import
 2012-12-03 10:15:19 -08:00
Baligh Uddin
3f2f8d6df5 Import translations. DO NOT MERGE 
Change-Id: Idcd2644aeb1afe111214bad797fb84bf638dd08f
Auto-generated-cl: translation import
 2012-12-03 10:13:15 -08:00
Roger Chen
0ce57a92d7 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>

Cherrypicked from external contribution.
b/7648349
 2012-11-30 12:43:41 -08:00
Nick Kralevich
701e73d3f6 am 4816f4b4: am 0def7b94: am 849f5188: am 6643ea82: resolved conflicts for merge of 011132a7 to jb-mr1-dev 
* commit '4816f4b4088ce35b2cddf1034ae483e30b7ed22c':
  Secure a handful of framework broadcasts
 2012-11-30 10:43:24 -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
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
Marco Nelissen
0c779aa1fb am 7f05beb1: am 334a36b3: Merge "Change the text color of timer in MediaController" 
* commit '7f05beb125a0270fee58a96b533baf97536d8b7e':
  Change the text color of timer in MediaController
 2012-11-30 10:12:47 -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
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
d46cf31689 Merge "Import translations. DO NOT MERGE" 2012-11-29 21:09:18 -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
Adam Powell
04173385b6 am 1126c2a6: am 76ee9a9c: am 738b1903: Merge "Import assets from UX" into jb-mr1.1-dev 
* commit '1126c2a693421fe178d52e0543f32d585848e506':
  Import assets from UX
 2012-11-29 14:32:56 -08:00
Robert Greenwalt
6bc32a73b9 am 81cf3abd: am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '81cf3abdd52bdf212e742c88c53b00969f7cc34f':
  Secure a handful of framework broadcasts
 2012-11-29 14:32:37 -08:00
Dianne Hackborn
36893b16ce am 221d59f7: am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '221d59f723584d316ea225bdaf1bc75cbfd7a794':
  Quiet down a lot of logging.
 2012-11-29 14:32:25 -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
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
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
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