6727 Commits

Author	SHA1	Message	Date
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
Baligh Uddin	b377e5b621	Import translations. DO NOT MERGE ... Change-Id: I2c44f925196a13859e6e1da2571ae08252fa9f4a Auto-generated-cl: translation import	2012-11-29 09:11:57 -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	cfb95d0549	am e9316c06: am 78d2febf: am c7f55f55: Merge "New timings for default & fallback notification vibration." into jb-mr1.1-dev ... * commit 'e9316c06756f4553c812b34cf023f54a514e86aa': New timings for default & fallback notification vibration.	2012-11-28 06:31:53 -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	6f65b352a4	Import translations. DO NOT MERGE ... Change-Id: If8c2f4d122f4f99ac8af2912be919f8345b17410 Auto-generated-cl: translation import	2012-11-27 12:54:58 -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
Romain Guy	f6e7b2089d	Merge "Add new mipMap attribute to BitmapDrawable"	2012-11-27 11:04:57 -08:00
Romain Guy	5769fcd88a	Add new mipMap attribute to BitmapDrawable ... This attribute can be used to enable/disable mipmapping on bitmaps. See Bitmap.setHasMipMap() for details. Change-Id: I13cc800a258b6876a94e2a9605dcec4ea4f1ea48	2012-11-27 11:03:22 -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	26c8a8c912	am e41ea2c0: 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 'e41ea2c0888964a5feb5836260f7f93cd36e0a8f': Removing the plus page when we reach the max number of allowable widgets. (Bug 7564782)	2012-11-26 11:53:00 -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	18f3bdda1e	Import translations. DO NOT MERGE ... Change-Id: Iaff2592ce93e54835624d2d0c49aace8802a9f41 Auto-generated-cl: translation import	2012-11-22 22:01:24 -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	aae5fb42cc	Import translations. DO NOT MERGE ... Change-Id: I47fc111ea3f6e2e2e63e1ba2a54bd94d81155b54 Auto-generated-cl: translation import	2012-11-20 22:44:58 -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