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

95342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
bf8a663c53 am 3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation." 
* commit '3f7a49904cef7ea14808590b63b115a4381537a1':
  Improve the Resource.getQuantityString/getQuantityText documentation.
 2013-03-08 13:59:59 -08:00
Elliott Hughes
3f7a49904c Merge "Improve the Resource.getQuantityString/getQuantityText documentation." 2013-03-08 21:18:34 +00:00
Elliott Hughes
ac071e36ae am 0c25ecfd: Merge "Use getRelativeDayString in getRelativeTimeSpanString." 
* commit '0c25ecfd43235340c9b6bf5b640232138a217836':
  Use getRelativeDayString in getRelativeTimeSpanString.
 2013-03-08 11:47:39 -08:00
Elliott Hughes
95d5ab30f2 Improve the Resource.getQuantityString/getQuantityText documentation. 
Natural languages differ so much and in such odd ways that you can't
use getQuantityString as an "if" statement. It's really just for grammaticality.
This is explained well in
http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
but we need to make more of an effort to motivate people to read that, and to
at least get the most important point across if they don't read it.

Change-Id: I549b9f3563462c45f2dea34c558185e0714127cd
 2013-03-08 11:26:57 -08:00
Elliott Hughes
0c25ecfd43 Merge "Use getRelativeDayString in getRelativeTimeSpanString." 2013-03-08 18:39:47 +00:00
Elliott Hughes
5acc6e5214 Use getRelativeDayString in getRelativeTimeSpanString. 
The bug we're fixing here is that languages that don't
distinguish the "one" case grammatically (such as Japanese)
would say the equivalent of "In 1 day" rather than "Tomorrow"
because of the misuse of getQuantityString.

This has the side-effect of switching us over to the CLDR
strings for relative day names, which have consistent capitalization;
the Android donottranslate-cldr.xml strings varied even within
a language, so although this is a change, it seems like a step
in the right direction.

In a future change, we should actually push all relative
day formatting down into icu4c.

Bug: 7098707
Change-Id: Ia2f9af3d18c441d6093dd5da7956a3d0130e5b06
 2013-03-07 16:46:55 -08:00
Scott Main
d9cdde94f3 am 6d3943b6: am b3d07573: am 49e3d6ba: am d55091f6: change devbytes playlist order to reverse playlist order 
* commit '6d3943b69d5b766e94a12a8249fcd268d0337c2f':
  change devbytes playlist order to reverse playlist order
 2013-03-07 16:25:49 -08:00
Scott Main
6d3943b69d am b3d07573: am 49e3d6ba: am d55091f6: change devbytes playlist order to reverse playlist order 
* commit 'b3d07573617656e6008466d01dfb5aebbd7568ba':
  change devbytes playlist order to reverse playlist order
 2013-03-07 16:24:41 -08:00
Scott Main
b3d0757361 am 49e3d6ba: am d55091f6: change devbytes playlist order to reverse playlist order 
* commit '49e3d6baf55098b8de07cd6a4585ea0984f86d16':
  change devbytes playlist order to reverse playlist order
 2013-03-07 16:23:26 -08:00
Scott Main
49e3d6baf5 am d55091f6: change devbytes playlist order to reverse playlist order 
* commit 'd55091f6fdec4bb42e2f922369dfa19f8993be8d':
  change devbytes playlist order to reverse playlist order
 2013-03-07 16:20:23 -08:00
Scott Main
d55091f6fd change devbytes playlist order to reverse playlist order 
Change-Id: Ic6f91cf6adc3999ff4c6394f652a7ef4e2fc3c22
 2013-03-07 16:17:06 -08:00
Elliott Hughes
4a1bd4640c am d0d1be2d: Merge "Explain why the frameworks/base DateUtilsTest isn\'t merged with CTS\' DateUtilsTest." 
* commit 'd0d1be2d27af35fe7553835ee8c411fd13d1c8d7':
  Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
 2013-03-07 15:39:46 -08:00
Elliott Hughes
d0d1be2d27 Merge "Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest." 2013-03-07 23:24:40 +00:00
Elliott Hughes
025148cc4d Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest. 
Change-Id: Icbdb4e9133a9ae1c1b37f822367e1ac86e9e36cb
 2013-03-07 14:30:17 -08:00
Scott Main
4147f86699 am 69a98134: am 2da55bd9: am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 
* commit '69a981342c620b829a4fe09c767a3eb50fbd2464':
  fix rounding errors in dashboard data
 2013-03-07 11:49:34 -08:00
Scott Main
baea90ddf5 am 77560a3d: am 08664441: am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs 
* commit '77560a3d6e9b37c16f346b98bbe618834a24d6a2':
  update google io banner graphic
 2013-03-07 11:49:31 -08:00
Trevor Johns
f9f0283109 am 03740d22: am 2d6f8185: am df4fd7ba: am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '03740d228396bbbbcdc1589bdd997280f3b428f1':
 2013-03-07 11:49:28 -08:00
Trevor Johns
c19b866158 am ef631700: am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit 'ef631700eb26a47820eeab2b2450dcfb4213af5c':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-07 11:49:26 -08:00
Scott Main
69a981342c am 2da55bd9: am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 
* commit '2da55bd9ec4cf3a6f68f7a37f973cc2b28f71ac5':
  fix rounding errors in dashboard data
 2013-03-07 11:45:49 -08:00
Scott Main
77560a3d6e am 08664441: am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs 
* commit '086644416623741c0aad4a65b2c7c135fb1ef20b':
  update google io banner graphic
 2013-03-07 11:45:46 -08:00
Trevor Johns
03740d2283 am 2d6f8185: am df4fd7ba: am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '2d6f81852c685abe423ce249359b019a2f2f9dc1':
 2013-03-07 11:45:44 -08:00
Trevor Johns
ef631700eb am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit 'b02ca5efd995f167ccd90fc56572033e88b57032':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-07 11:45:41 -08:00
Scott Main
2da55bd9ec am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 
* commit 'b4d42b0247576b9ad08600080f5fcec1aecb116f':
  fix rounding errors in dashboard data
 2013-03-07 11:42:49 -08:00
Scott Main
0866444166 am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs 
* commit '4ce887bdca72478c998baab0f7f85b7ea84d7ba9':
  update google io banner graphic
 2013-03-07 11:42:47 -08:00
Trevor Johns
2d6f81852c am df4fd7ba: am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit 'df4fd7baf80e9cb1b86d358957f1df26cac6aba3':
 2013-03-07 11:42:39 -08:00
Trevor Johns
b02ca5efd9 am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '0c9f413b898341e2d20ae6045ce0f71e39cf97a4':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-07 11:42:36 -08:00
Scott Main
b4d42b0247 am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 
* commit '6f6b20d9675711ef5ff7e776bc5542688d77d144':
  fix rounding errors in dashboard data
 2013-03-07 08:55:50 -08:00
Scott Main
6f6b20d967 Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 2013-03-07 16:52:14 +00:00
Scott Main
4ce887bdca am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs 
* commit '3378c90a09079af9f3f3bd8f9176413aa8644f48':
  update google io banner graphic
 2013-03-07 08:50:23 -08:00
Scott Main
3378c90a09 Merge "update google io banner graphic" into jb-mr1.1-docs 2013-03-07 16:46:38 +00:00
Scott Main
9b0d5dcd7a fix rounding errors in dashboard data 
Change-Id: Ifc65072e95f2bf761fd947231c8512d432f55e24
 2013-03-07 08:26:57 -08:00
Scott Main
7c063b2f42 update google io banner graphic 
Change-Id: I20e2b8472f384b4e60d64c412ec226dc1b2aaa44
 2013-03-06 19:44:27 -08:00
Trevor Johns
df4fd7baf8 am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '34418be01049ea81312d2e821ec6a8919b617540':
 2013-03-06 17:06:24 -08:00
Trevor Johns
34418be010 am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '58a54cb3805e219b2d0a76cd8b9df9b33e41e0d0':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-06 17:03:02 -08:00
Trevor Johns
0c9f413b89 am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training 
* commit '58a54cb3805e219b2d0a76cd8b9df9b33e41e0d0':
  [docs] Fix issue #8288695: Typo in OAuth2 training
 2013-03-06 17:02:55 -08:00
Trevor Johns
58a54cb380 [docs] Fix issue #8288695: Typo in OAuth2 training 
There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).

The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.

Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f
 2013-03-06 14:46:47 -08:00
Irfan Sheriff
17d8963653 am 011b8efc: Merge "frameworks/base: stop find before issuing wps pbc." 
* commit '011b8efce194529de82e94fd0c0bf29835b9f07a':
  frameworks/base: stop find before issuing wps pbc.
 2013-03-06 08:54:49 -08:00
Irfan Sheriff
011b8efce1 Merge "frameworks/base: stop find before issuing wps pbc." 2013-03-06 15:58:42 +00:00
Deepthi Gowri
575bb45e9d frameworks/base: stop find before issuing wps pbc. 
Stop p2p find before issuing a PBC to avoid GO switching to other
channel leading connection failure.

Change-Id: I88906f944de1c85b143f96cb7b35724af19cd151
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
 2013-03-06 08:24:03 +05:30
Victoria Lease
263554ae5f am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel" 
* commit '7d4e52baee6fe269280dbb55abe9b4fa1a1c1d8b':
  FIX Null Pointer Exception on dialog cancel
 2013-03-05 15:51:19 -08:00
Victoria Lease
8ef243cf86 am f45efd27: Merge "Audio continue to played even if paused manually" 
* commit 'f45efd276c9b09adcb97ea43afc806731583aac7':
  Audio continue to played even if paused manually
 2013-03-05 15:51:16 -08:00
Victoria Lease
7d4e52baee Merge "FIX Null Pointer Exception on dialog cancel" 2013-03-05 23:25:16 +00:00
Victoria Lease
f45efd276c Merge "Audio continue to played even if paused manually" 2013-03-05 23:20:45 +00:00
Scott Main
ecc0cdddd5 am 570cd322: am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '570cd32254903213ac1d54241401205bc129a035':
 2013-03-05 15:15:28 -08:00
Scott Main
ef3bea6cd8 am 4be483da: am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '4be483dac8eb1024ad9298d582ad2a7068cf5822':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:11:53 -08:00
Scott Main
570cd32254 am baff6645: am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit 'baff6645d5c6d6b5461c24605c931515ef3217c9':
 2013-03-05 15:11:49 -08:00
Scott Main
baff6645d5 am 1fdb80ca: am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '1fdb80caae9ffb3d6178de77097a8f09a23fc4fa':
 2013-03-05 15:09:25 -08:00
Scott Main
4be483dac8 am f37669ff: am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit 'f37669ffcfab9abdb99f378d8b9b88c974538b9f':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:08:28 -08:00
Scott Main
1fdb80caae am 9ea1baca: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit '9ea1bacaddb34933ce1dc73780bd868548d5ca2c':
 2013-03-05 15:06:46 -08:00
Scott Main
f37669ffcf am d6e8a00b: am 23513a2c: docs: update country filtering description bug: 8278024 
* commit 'd6e8a00b0b7ebcd1aa807e694cee85db496711e0':
  docs: update country filtering description bug: 8278024
 2013-03-05 15:06:06 -08:00