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

6387 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Adam Powell
738b190338 Merge "Import assets from UX" into jb-mr1.1-dev 2012-11-28 18:49:26 -08:00
Adam Powell
20b9cd2064 Import assets from UX 
Fixes issues with scaling/dithering artifacts in dialog/menu panel
assets.

Bug 7589786

Change-Id: I1285f9de5f8bcd0decfa7765c1463e444a56b335
 2012-11-28 18:41:10 -08:00
Robert Greenwalt
5a36e06ab2 Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 2012-11-28 17:40:02 -08:00
Robert Greenwalt
47918ae3b4 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
Change-Id: Id8ec2778b15fe001e6fd0d5a010181bb21c52ad8
 2012-11-28 16:42:32 -08:00
Dianne Hackborn
68e0da7e39 Merge "Quiet down a lot of logging." into jb-mr1.1-dev 2012-11-28 15:03:39 -08:00
Daniel Sandler
e9316c0675 am 78d2febf: am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev 
* commit '78d2febf1f3730c8ad5a6747456529cd1f34b0c7':
  New timings for default & fallback notification vibration.
 2012-11-28 06:30:15 -08:00
Dianne Hackborn
40e9f2922c Quiet down a lot of logging. 
Also fix a little problem where the USER_STARTED broadcasts
were not being sent as ordered broadcasts(!).

Change-Id: I3aa3e0a9b3900967cdd2d115ee103371b0a50c41
 2012-11-27 19:12:23 -08:00
Daniel Sandler
bdc9c83ba5 New timings for default & fallback notification vibration. 
Bug: 7599791
Change-Id: Ieae1cba864537b192be013e4f00131bcc59c6369
 2012-11-27 19:22:22 -05:00
Baligh Uddin
a0082a63a6 am 12e9bfd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '12e9bfd677895bee0d2b6f994e5f743d6df834fc':
  Import translations. DO NOT MERGE
 2012-11-27 13:18:54 -08:00
Baligh Uddin
d27c81fecc Import translations. DO NOT MERGE 
Change-Id: Iadbc15f54f259bea612b1ec99c1dfd64e1a51674
Auto-generated-cl: translation import
 2012-11-27 12:46:53 -08:00
Baligh Uddin
c8d2abd81d Import translations. DO NOT MERGE 
Change-Id: I1079e1b66c125f8b6044f3502961e11cc7858ba3
Auto-generated-cl: translation import
 2012-11-27 12:45:19 -08:00
Baligh Uddin
86b758f4f3 Import translations. DO NOT MERGE 
Change-Id: Iceeb36fd0bb841e6bca65966a425a2de9d3c4121
Auto-generated-cl: translation import
 2012-11-27 12:43:47 -08:00
The Android Open Source Project
5132d62600 Merge jb-mr1-dev into aosp/master - do not merge 
Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc
 2012-11-27 08:21:11 -08:00
Winson Chung
e41ea2c088 am 037e8ee2: am 9a0fbd4c: Merge "Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)" into jb-mr1.1-dev 
* commit '037e8ee26f9fa6e2f30d9501a4db43161904c905':
  Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)
 2012-11-26 11:50:59 -08:00
Winson Chung
4752e7d1a9 Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782) 
- Also adding feedback on the plus page (Bug 7500328)

Change-Id: Iddd09b7a3d5347a43bc040052114879cbaecccd9
 2012-11-26 11:36:40 -08:00
Baligh Uddin
652543fb4a am effb0191: Import translations. DO NOT MERGE 
* commit 'effb0191ba360e133eaf41693005b2ace2b009bd':
  Import translations. DO NOT MERGE
 2012-11-26 09:17:00 -08:00
Baligh Uddin
bbe3cbee5b Import translations. DO NOT MERGE 
Change-Id: I33e42bf56fda90ee829e0ad91c46ecd859eca0ae
Auto-generated-cl: translation import
 2012-11-22 21:54:25 -08:00
Baligh Uddin
f7f1c6a78e Import translations. DO NOT MERGE 
Change-Id: I9f2a464733eb765385c3f8f83bbcd1a1e33b0e26
Auto-generated-cl: translation import
 2012-11-22 21:52:46 -08:00
Baligh Uddin
effb0191ba Import translations. DO NOT MERGE 
Change-Id: I19ab9e770f5db475222e850fdb145593078656cc
Auto-generated-cl: translation import
 2012-11-22 21:51:02 -08:00
Baligh Uddin
7e6c3e8f6e am a15958a2: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a15958a2bd1916dc0e96d893a217494779ae9515':
  Import translations. DO NOT MERGE
 2012-11-22 11:04:07 -08:00
Baligh Uddin
458f43b550 Import translations. DO NOT MERGE 
Change-Id: I646dee02eeb319d87d5210faaa3025c50f85da86
Auto-generated-cl: translation import
 2012-11-20 22:37:24 -08:00
Baligh Uddin
0edbc0eb76 Import translations. DO NOT MERGE 
Change-Id: Ia01f5cbaa9a00034cf6bd277cb483bf0465d12e6
Auto-generated-cl: translation import
 2012-11-20 22:35:34 -08:00
Baligh Uddin
1b85b9058f Import translations. DO NOT MERGE 
Change-Id: I9a4ce3d014a8f7b264fe59eb51e747f36d16a226
Auto-generated-cl: translation import
 2012-11-20 22:33:48 -08:00
Fabrice Di Meglio
3ee4740009 am 95263ef3: am 4d931acd: Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev 
* commit '95263ef3cf4c0df65950d2cddda843aabac6fa48':
  Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode
 2012-11-20 14:42:13 -08:00
Fabrice Di Meglio
4d931acdb8 Merge "Fix for bug #7417949 TextView / EditText error Drawable is not put on the left in RTL mode" into jb-mr1.1-dev 2012-11-20 14:37:55 -08:00
Fabrice Di Meglio
e784ae8e6a am d689e8c3: am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 
* commit 'd689e8c3a05f3b200d19879bdc169e6ad6e0436b':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment
 2012-11-19 15:14:02 -08:00
Daniel Sandler
aaec726948 Notification vibration improvements: [DO NOT MERGE] 
- When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use same
   vibration pattern but can be changed easily in future.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
 2012-11-19 15:12:24 -08:00
Fabrice Di Meglio
b0f895b330 Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 2012-11-19 14:27:45 -08:00