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

106052 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
e4f975a321 am 7328de3d: am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '7328de3d02b8784b7562e1e0d2e749fdb854a095':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:59:29 -07:00
Scott Main
7328de3d02 am 23f33bda: am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '23f33bdab3da7ac3eb11d483eb038024ed4e3564':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:56:54 -07:00
Scott Main
23f33bdab3 am 6b55515e: am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '6b55515ed3c1e97b0dd932a482c375d0103f84cc':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:54:26 -07:00
Scott Main
6b55515ed3 am 41b08da8: replace \'developers strick back\' with \'this week in android\' playlist 
* commit '41b08da8198e76118ef7167058a88cb920f9fb74':
  replace 'developers strick back' with 'this week in android' playlist
 2013-06-17 17:53:06 -07:00
Xia Wang
7ea4e277fd am 8fcb169f: am edc3bb66: Disable a flaky test case 
* commit '8fcb169f7989123f993adfac5894d1ad5f35ed0b':
  Disable a flaky test case
 2013-06-17 17:51:57 -07:00
Xia Wang
8fcb169f79 am edc3bb66: Disable a flaky test case 
* commit 'edc3bb661e9c8964d3926cbd7344793a32a2c2cd':
  Disable a flaky test case
 2013-06-17 17:48:47 -07:00
Scott Main
41b08da819 replace 'developers strick back' with 'this week in android' playlist 
Change-Id: I0aa94f6332da8543d7a2eba80307a36c26d7654c
 2013-06-17 17:47:36 -07:00
Xia Wang
edc3bb661e Disable a flaky test case 
Change-Id: I4ef780ed0c5394b67aa002baefc00e835018c4a0
 2013-06-17 17:14:10 -07:00
Elliott Hughes
704dfbfec4 am 48fa06f3: am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 
* commit '48fa06f34fe3098fd820b97d9d28c9f27f8591de':
  Correct Date format for el_GR, sv_SE and tr_TR locales
 2013-06-17 13:41:24 -07:00
Elliott Hughes
48fa06f34f am f6a67139: Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 
* commit 'f6a671394ca3d269835d5f5b882b46f9539e9a96':
  Correct Date format for el_GR, sv_SE and tr_TR locales
 2013-06-17 13:38:59 -07:00
Elliott Hughes
f6a671394c Merge "Correct Date format for el_GR, sv_SE and tr_TR locales" 2013-06-17 20:36:53 +00:00
howardb
5ad2451f9f Correct Date format for el_GR, sv_SE and tr_TR locales 
Amend DateFormat.getDateFormat to CLDR data from icu4c
instead of locale specific resource entries which are incorrect
for several locales.

No CTS tests are added as they require changing the locale which
is not currently possible.

Bug: https://code.google.com/p/android/issues/detail?id=56385

Change-Id: Ibd11c7fd9b595e19a3e2bf508e1585aa50067e03
Signed-off-by: howardb <android@howardb.com>
 2013-06-17 13:35:29 -07:00
Vladimir Marko
aa5fe3d206 Avoid unnecessary FindClass("java/lang/String"). 
Use previously retrieved global reference instead.
Check for NULL after creating the global reference.

Change-Id: I21670d2ef0f63ddb5801dd21e7e56359e5519479
 2013-06-17 17:54:58 +01:00
The Android Open Source Project
b832dfe72f Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I425b496bc37821b3d9c10f92b5799dd6010b89db
 2013-06-16 07:44:02 -07:00
The Android Automerger
070a260153 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-16 05:55:34 -07:00
Baligh Uddin
5bc35c7a50 am 9e7926f2: am 4a9e4226: (-s ours) Import translations. DO NOT MERGE 
* commit '9e7926f28a353f55042247529372848267516f36':
  Import translations. DO NOT MERGE
 2013-06-15 19:23:44 -07:00
Baligh Uddin
bdb795bab1 am 2f9807b8: Import translations. DO NOT MERGE 
* commit '2f9807b8d71fdc1a2336c22e89148325281b684e':
  Import translations. DO NOT MERGE
 2013-06-15 19:20:22 -07:00
Baligh Uddin
9e7926f28a am 4a9e4226: (-s ours) Import translations. DO NOT MERGE 
* commit '4a9e422680727cd1a8fd683bae98c62baa0710fd':
  Import translations. DO NOT MERGE
 2013-06-15 19:19:07 -07:00
Daniel Sandler
0e57464d90 Temporarily restore some support for icon==0 notifications. 
This is WRONG WRONG WRONG but certain apps rely on it to
poke the LED and so forth. In a future release this will
stop working.

Bug: 8623399
Change-Id: I49bb8ccc6891b1398ceec94c64d6c3a510ad1c38
 2013-06-15 12:20:55 -07:00
Baligh Uddin
2f9807b8d7 Import translations. DO NOT MERGE 
Change-Id: Ia0e22026f6b361ea67d393e154d719a46759ecea
Auto-generated-cl: translation import
 2013-06-14 19:28:47 -07:00
Baligh Uddin
4a9e422680 Import translations. DO NOT MERGE 
Change-Id: I45fbf411dc3f8cdb9a5ebd889ccf3a2868abb5a9
Auto-generated-cl: translation import
 2013-06-14 19:27:44 -07:00
Scott Main
3717cf6bc2 am 07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev 
* commit '07d6d9e74c1f79de791b37b1cb738fa398915879':
  additional documentation for media codec info
 2013-06-14 17:08:33 -07:00
Scott Main
07d6d9e74c Merge "additional documentation for media codec info" into jb-mr2-dev 2013-06-15 00:04:50 +00:00
Elliott Hughes
96fefaa23b am b87e6138: am 618ed234: Merge "Track nio API change." 
* commit 'b87e6138d169e5fd23b964056431e2c357323fd2':
  Track nio API change.
 2013-06-14 16:25:00 -07:00
Elliott Hughes
b87e6138d1 am 618ed234: Merge "Track nio API change." 
* commit '618ed2340283263164f578f818cc09148aacb9ed':
  Track nio API change.
 2013-06-14 16:22:12 -07:00
Elliott Hughes
618ed23402 Merge "Track nio API change." 2013-06-14 23:18:35 +00:00
Elliott Hughes
28b7245cc1 Track nio API change. 
Change-Id: I6a6d6c9e5f658b66dca0db226d2d91ee5f8ab2c7
 2013-06-14 15:41:26 -07:00
Daniel Sandler
5be52fb5ae am a0c9b9d2: Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev 
* commit 'a0c9b9d2a7a0566615b6b044ac8a6b434c80d5be':
  Temporarily restore some support for icon==0 notifications.
 2013-06-14 13:34:55 -07:00
Daniel Sandler
a0c9b9d2a7 Merge "Temporarily restore some support for icon==0 notifications." into jb-mr2-dev 2013-06-14 20:29:24 +00:00
Scott Main
c06bb7f5b9 additional documentation for media codec info 
Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad
 2013-06-14 11:56:15 -07:00
Scott Main
478471b579 am 3b0205b7: am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit '3b0205b7601a6fa3d7abf6dbc5a60223981103cc':
  fix transition from download to install instructions
 2013-06-14 11:07:21 -07:00
Scott Main
3b0205b760 am 0b3fe078: am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit '0b3fe0785c0c6ff0ce834c06b6828f884a658730':
  fix transition from download to install instructions
 2013-06-14 11:02:41 -07:00
Scott Main
0b3fe0785c am a17201a8: am 7190a059: fix transition from download to install instructions 
* commit 'a17201a81691ac337426923d1bdcf9e0a26b841e':
  fix transition from download to install instructions
 2013-06-14 10:56:28 -07:00
Scott Main
a17201a816 am 7190a059: fix transition from download to install instructions 
* commit '7190a05951efa4f5cf94bb22da48dce85c52bd06':
  fix transition from download to install instructions
 2013-06-14 10:53:45 -07:00
Scott Main
7190a05951 fix transition from download to install instructions 
Change-Id: Ibb06779891ffab2c213b7c3401293e6fb7a6c4c9
 2013-06-14 10:51:29 -07:00
Scott Main
0be889dd0e am 6e594289: am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit '6e5942894a40ed2a199f25bf4e8a215c95d2c79b':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:25:38 -07:00
Scott Main
6e5942894a am d2ad6dc5: am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'd2ad6dc5304e5c3a4f0dc1bd04f7ab713ed66c6d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:16:02 -07:00
Scott Main
d2ad6dc530 am 6af13a74: am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit '6af13a74d3dcf56187edf153e0341221faf9f1ad':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:12:30 -07:00
Scott Main
6af13a74d3 am ec025db4: change studio version number to use \'x\' for final decimal. also go to install guide after download begins 
* commit 'ec025db4a74914640c42412c63413f2d5d46e45d':
  change studio version number to use 'x' for final decimal. also go to install guide after download begins
 2013-06-14 10:09:12 -07:00
Dirk Dougherty
b5de95d1f8 am f1d2c5ae: Merge "Doc change: diffs for API 18" into jb-mr2-dev 
* commit 'f1d2c5aeb23739bde3708f4e4d4bdb99f059f1ed':
  Doc change: diffs for API 18
 2013-06-14 09:29:50 -07:00
Dirk Dougherty
f1d2c5aeb2 Merge "Doc change: diffs for API 18" into jb-mr2-dev 2013-06-14 16:23:12 +00:00
Scott Main
695be87d6e am 92053f8b: revise docs for new sensor types. fix markup error causing tons of code font 
* commit '92053f8b28ce0d035d292fa73622200990682511':
  revise docs for new sensor types. fix markup error causing tons of code font
 2013-06-14 08:45:20 -07:00
Scott Main
92053f8b28 revise docs for new sensor types. fix markup error causing tons of code font 
Change-Id: I7635bbc44e03b50faeddf5c5fe50f7f47e2cde35
 2013-06-13 16:37:51 -07:00
Dirk Dougherty
4c43ec639b Doc change: diffs for API 18 
Change-Id: I92d9880959e18bb0cffa68a05a042de6d5790aa4
 2013-06-13 16:33:04 -07:00
Scott Main
ec025db4a7 change studio version number to use 'x' for final decimal. 
also go to install guide after download begins

Change-Id: I9ec266b20585c00cf5a643fede2df64eb2066ebc
 2013-06-13 15:00:43 -07:00
Scott Main
11caa0b6d9 am f52532de: am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit 'f52532de2a3da2f41ddc28e25d2883d45f189018':
  add ninepatch search tag
 2013-06-13 14:56:03 -07:00
Scott Main
f52532de2a am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit 'cb2a85058e24ecd35349b5470e402bcb52df2d6b':
  add ninepatch search tag
 2013-06-13 14:54:48 -07:00
Scott Main
cb2a85058e am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '695896a46578e7ad4e540151e799a9f0b8828ad1':
  add ninepatch search tag
 2013-06-13 14:51:47 -07:00
Scott Main
695896a465 am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '46c8931ffc78f5204b34f7ba5098defbc318b7a4':
  add ninepatch search tag
 2013-06-13 14:49:20 -07:00
Scott Main
46c8931ffc Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 2013-06-13 21:47:27 +00:00