Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,831 Commits 3 Branches 0 Tags
63ed1663dfa1efce442add8270e91bd28f14ee8a
Commit Graph

98831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
63ed1663df am 59f733ac: Merge "port system ui over to new ICU date formatting API." 
* commit '59f733acc4b8a3252aa7587790610c9dae62e9d7':
  port system ui over to new ICU date formatting API.
 2013-01-15 14:22:41 -08:00
Chris Wren
59f733acc4 Merge "port system ui over to new ICU date formatting API." 2013-01-15 14:20:44 -08:00
Chris Wren
56018e577e port system ui over to new ICU date formatting API. 
Bug: 7288134
Change-Id: Icea2ff96fd91c6db66b3aad6f6653b21203351b1
 2013-01-15 17:14:48 -05:00
Victoria Lease
8bbf6d7c40 am 2f8b097e: Merge "fix NPE in updateClientUids" 
* commit '2f8b097ea1c25a614ce6c1c4b1ae960938634f8f':
  fix NPE in updateClientUids
 2013-01-15 13:52:10 -08:00
Victoria Lease
2f8b097ea1 Merge "fix NPE in updateClientUids" 2013-01-15 13:48:29 -08:00
Yorke Lee
f7aec70e8f am be33f969: Merge "Allow supplying extras when assigning QuickContactsBadge" 
* commit 'be33f9696a1194d9f927fb4446e07e199a468f9d':
  Allow supplying extras when assigning QuickContactsBadge
 2013-01-15 11:28:43 -08:00
Raph Levien
49a7e454d1 am 7cd0859a: Merge "Update framework text layout to use Harfbuzz NG" 
* commit '7cd0859a735c0c6a489d70d5d96e44e9d1a27be8':
  Update framework text layout to use Harfbuzz NG
 2013-01-15 11:28:40 -08:00
Yorke Lee
be33f9696a Merge "Allow supplying extras when assigning QuickContactsBadge" 2013-01-15 11:26:20 -08:00
Raph Levien
7cd0859a73 Merge "Update framework text layout to use Harfbuzz NG" 2013-01-15 11:25:05 -08:00
Victoria Lease
ea78b85bb7 fix NPE in updateClientUids 
Bug: 8009908
Change-Id: I54d97c587a3fa9d003f654f98fdfdbe21af791d6
 2013-01-15 10:39:28 -08:00
Irfan Sheriff
9b7e81bd54 am 77e843a3: Merge "Fix connectivitymanagertest" 
* commit '77e843a305279f30a5d26aa0d7fdc2646d01d53f':
  Fix connectivitymanagertest
 2013-01-15 10:39:26 -08:00
Irfan Sheriff
77e843a305 Merge "Fix connectivitymanagertest" 2013-01-15 10:36:40 -08:00
Irfan Sheriff
f2488b6328 Fix connectivitymanagertest 
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
 2013-01-15 10:35:02 -08:00
Romain Guy
616a87736d am 61840eb0: Merge "Preliminary Support for region clipping" 
* commit '61840eb03882e1a964ae971725bd21229c3db42c':
  Preliminary Support for region clipping
 2013-01-15 10:28:01 -08:00
Romain Guy
61840eb038 Merge "Preliminary Support for region clipping" 2013-01-15 10:25:00 -08:00
Irfan Sheriff
29745eb22c am 82176350: Merge "Fix build" 
* commit '8217635056efa9fb285bd4a0eb26a1789c5cd557':
  Fix build
 2013-01-15 10:16:54 -08:00
Irfan Sheriff
8217635056 Merge "Fix build" 2013-01-15 10:13:53 -08:00
Irfan Sheriff
86ee9640ee Fix build 
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
 2013-01-15 10:11:27 -08:00
Raph Levien
aaedde51b7 Update framework text layout to use Harfbuzz NG 
These are the frameworks changes to use the new version of Harfbuzz.

Change-Id: Idbef325e8fc1c27a9f2296414ddb1f79b778a00e
 2013-01-15 09:58:06 -08:00
Dirk Dougherty
457112e383 am fef45db2: am f37d9c07: am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit 'fef45db2aa3271bc414794ffb9c34d7659dccb1a':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-15 09:42:23 -08:00
Dirk Dougherty
fef45db2aa am f37d9c07: am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit 'f37d9c07b258ceeea991801f9223ecf071debd08':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-15 09:37:04 -08:00
Baligh Uddin
4ed5ca795f am 4ed11353: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '4ed11353b351ae1de817298d8480811858d8518a':
  Import translations. DO NOT MERGE
 2013-01-15 09:36:30 -08:00
Craig Mautner
56ffeee999 am 07f943d4: Merge "Add Overrides, remove trailing whitespace." 
* commit '07f943d4176fac15995985db2ac562f11fd7ffef':
  Add Overrides, remove trailing whitespace.
 2013-01-15 09:36:27 -08:00
Irfan Sheriff
2643471eed am 92325abb: Merge "Refactor enterprise config" 
* commit '92325abb2c07e8499d88b92cf262955aba6f1e54':
  Refactor enterprise config
 2013-01-15 09:36:24 -08:00
Baligh Uddin
4ed11353b3 Merge "Import translations. DO NOT MERGE" 2013-01-15 09:27:59 -08:00
Baligh Uddin
70472381ce Merge "Import translations. DO NOT MERGE" into master-chromium 2013-01-15 09:27:06 -08:00
Craig Mautner
07f943d417 Merge "Add Overrides, remove trailing whitespace." 2013-01-15 09:10:10 -08:00
Craig Mautner
6cfa7292cf Add Overrides, remove trailing whitespace. 
Once and for all.

Change-Id: I0835515696c1a8ec7dff719fb734cbbd0b4252d6
 2013-01-15 09:05:42 -08:00
Irfan Sheriff
92325abb2c Merge "Refactor enterprise config" 2013-01-15 09:02:59 -08:00
Irfan Sheriff
9b81319002 Refactor enterprise config 
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
 2013-01-15 08:57:26 -08:00
Dirk Dougherty
f37d9c07b2 am b78714b5: am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit 'b78714b5dfc871fee251db125ec5e14f4e0aff5f':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:30:34 -08:00
Dirk Dougherty
b78714b5df am 5941ff03: am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit '5941ff03721005228072dca5b1c808cb5d12a001':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:28:11 -08:00
Satoshi Kataoka
337d5af1b6 am 8e303cc5: Refactor utilities for InputMethodManagerSerivce that we want to share with the Settings application 
* commit '8e303cc5dd4860b6050d5725ce60ca7e6fb00c7b':
  Refactor utilities for InputMethodManagerSerivce that we want to share with the Settings application
 2013-01-14 21:27:02 -08:00
Dirk Dougherty
5941ff0372 am 9af5cf2b: am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit '9af5cf2b38d82d5ddda5ada67aab51314b473800':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:26:13 -08:00
Dirk Dougherty
9af5cf2b38 am 20d47ca8: Doc change: add developer video to carousel and spotlight pages. 
* commit '20d47ca81df71096fd74bc9205e0e2a744cb630a':
  Doc change: add developer video to carousel and spotlight pages.
 2013-01-14 21:24:16 -08:00
Dirk Dougherty
20d47ca81d Doc change: add developer video to carousel and spotlight pages. 
Change-Id: Ia12eb98f4d86edea72dfa1142d782ea24d3373f7
 2013-01-14 20:47:11 -08:00
Satoshi Kataoka
8e303cc5dd Refactor utilities for InputMethodManagerSerivce that we want to share with the Settings application 
Bug: 7872918

Change-Id: I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6
 2013-01-15 12:52:47 +09:00
Elliott Hughes
d92f54063a am 0152360d: am a99a9f4f: am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings." 
* commit '0152360d8b419ddd0fd5b1d701932f96d5839276':
  Manual fix for some Norwegian format strings.
 2013-01-14 19:30:23 -08:00
Elliott Hughes
6a2650db99 am 5bd48b52: am 67ae48f3: am fc91d730: am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c." 
* commit '5bd48b528e6477c2c3d318cb71cef861392b1b8a':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
 2013-01-14 19:30:20 -08:00
Elliott Hughes
0152360d8b am a99a9f4f: am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings." 
* commit 'a99a9f4f80ceb47db0c7b3e9e32547cef4e3ee03':
  Manual fix for some Norwegian format strings.
 2013-01-14 19:28:24 -08:00
Elliott Hughes
5bd48b528e am 67ae48f3: am fc91d730: am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c." 
* commit '67ae48f32545791fe0a0574f02bfe714e106074b':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
 2013-01-14 19:28:20 -08:00
Elliott Hughes
a99a9f4f80 am 9fa542a5: am 727adb8b: Merge "Manual fix for some Norwegian format strings." 
* commit '9fa542a5032d8adc3f502cef0c5c98d8f10abbc2':
  Manual fix for some Norwegian format strings.
 2013-01-14 19:25:56 -08:00
Elliott Hughes
67ae48f325 am fc91d730: am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c." 
* commit 'fc91d73067d76e129869fe472238f4c80aa5d435':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
 2013-01-14 19:25:52 -08:00
Elliott Hughes
9fa542a503 am 727adb8b: Merge "Manual fix for some Norwegian format strings." 
* commit '727adb8b4795dd4eb708c03ecec69ff64fa8d552':
  Manual fix for some Norwegian format strings.
 2013-01-14 19:23:51 -08:00
Elliott Hughes
fc91d73067 am cbfece82: Merge "Switch over to getting 12-/24-hour time formats from CLDR via icu4c." 
* commit 'cbfece8237cb9cf62547e75ab9572ccbf682369a':
  Switch over to getting 12-/24-hour time formats from CLDR via icu4c.
 2013-01-14 19:23:48 -08:00
Elliott Hughes
727adb8b47 Merge "Manual fix for some Norwegian format strings." 2013-01-14 18:06:27 -08:00
Jeff Brown
536d8861ae am 9380abe6: (-s ours) am 31ea5707: (-s ours) am 9afb2e1a: Optimize focused input event dispatch in view root. DO NOT MERGE 
* commit '9380abe619c056a72b626db071a37af463e6b794':
  Optimize focused input event dispatch in view root. DO NOT MERGE
 2013-01-14 18:06:04 -08:00
Xia Wang
2a769de760 am 151aa458: am 2439c921: (-s ours) am cfa979b2: am b88564d2: am 12798957: am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev 
* commit '151aa4583c2839a6a797ccf30fe1339979b1c1b7':
  Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
 2013-01-14 18:06:00 -08:00
Jeff Brown
9380abe619 am 31ea5707: (-s ours) am 9afb2e1a: Optimize focused input event dispatch in view root. DO NOT MERGE 
* commit '31ea5707fa4f258533a869d58ef6f9f50cd99c65':
  Optimize focused input event dispatch in view root. DO NOT MERGE
 2013-01-14 18:02:12 -08:00
Xia Wang
151aa4583c am 2439c921: (-s ours) am cfa979b2: am b88564d2: am 12798957: am d1a18011: Merge "Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks." into jb-mr1-dev 
* commit '2439c921fb531299730a8bb9bb9ba3c463b40b32':
  Fix image processing test to include all benchmark tests -- each test case can be excuted separately -- add a test case to run all benchmarks.
 2013-01-14 18:01:34 -08:00