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

95033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
41ae4d7e04 am e61116b9: update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688 
* commit 'e61116b9a1f2d92fbda3d23d35a3742d0661c2be':
  update dev console language for new site design. Language only; no screenshot changes. bug: 8032875 bug: 8033647 bug: 8033688
 2013-02-20 15:30:04 -08:00
Wink Saville
b5a1ce2f5d Merge "Allow three digit phone numbers" 2013-02-20 23:04:32 +00:00
Joe Fernandez
02c78194cc docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes 
formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f

Change-Id: I9a7d106e73ca3553b8541def0a143911f4c44780
 2013-02-20 13:30:53 -08:00
Scott Main
e61116b9a1 update dev console language for new site design. 
Language only; no screenshot changes.
bug: 8032875
bug: 8033647
bug: 8033688

Change-Id: Ia333846e89d025b1edc919a40cb2224b04deb9ab
 2013-02-20 13:30:35 -08:00
Scott Main
1998060f69 am 803a6b0d: am ed7713e1: am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit '803a6b0da037e6ae6eaf51712cde5545ab140dce':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 12:03:42 -08:00
Scott Main
803a6b0da0 am ed7713e1: am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit 'ed7713e161bdfdaa87278fbd369b3dc3939f12c3':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 12:01:22 -08:00
Scott Main
ed7713e161 am e5c4846d: am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit 'e5c4846db7f12938836f7bd821076f3dd2e59fc8':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 11:58:56 -08:00
Scott Main
e5c4846db7 am 9dbb0b35: docs: sanitize input for badge generator bug: 8002240 
* commit '9dbb0b3597291a8305e0c451521eec9a5be2fb9b':
  docs: sanitize input for badge generator bug: 8002240
 2013-02-19 11:56:54 -08:00
Scott Main
9dbb0b3597 docs: sanitize input for badge generator 
bug: 8002240

Change-Id: Ic1429284fd1953fb6819110ecb47fcb3a79a9600
 2013-02-19 11:51:37 -08:00
Victoria Lease
5782c16d34 am c36303a6: Merge "Applying ChannelScrolling to remove calculateDragAngle" 
* commit 'c36303a66d1cb72f7216dc90ee7239b2b77a9815':
  Applying ChannelScrolling to remove calculateDragAngle
 2013-02-19 10:11:39 -08:00
Victoria Lease
c36303a66d Merge "Applying ChannelScrolling to remove calculateDragAngle" 2013-02-19 17:40:09 +00:00
kiwon
72034953bf Applying ChannelScrolling to remove calculateDragAngle 
To avoid angle calculation changed the logic to use virtual areas.
When try to drag or pan, check where the current touch point locates
and determine how to drag a page.

Change-Id: Id9bd08a69c4ac93ff385c8088e6c16bed5dc5f88
Signed-off-by: kiwon <kiwon98.lee@samsung.com>
 2013-02-18 14:30:58 +09:00
Irfan Sheriff
05913cc979 am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e 
* commit 'c6ea41efc93df12eeef7c59124bee83e8f3f7a41':
  Fix broken test.
  Track keys per config and allow cert push from apps
  eix enterprise config storage bugs
  Fix connectivitymanagertest
  Fix build
  Refactor enterprise config
 2013-02-15 15:55:43 -08:00
Irfan Sheriff
c6ea41efc9 Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e 
* changes:
  Fix broken test.
  Track keys per config and allow cert push from apps
  eix enterprise config storage bugs
  Fix connectivitymanagertest
  Fix build
  Refactor enterprise config
 2013-02-15 23:42:28 +00:00
Wink Saville
1c2acdc6e8 Fix broken test. 
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
 2013-02-15 15:20:37 -08:00
Irfan Sheriff
b815edf3ab Track keys per config and allow cert push from apps 
Allow configuring keys for a configuration and update/delete
from wificonfigstore.

Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
 2013-02-15 15:19:35 -08:00
Dirk Dougherty
5fce0c1fe3 am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'e91b053369638f81e725a47a7491853b06aca5ae':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:11:25 -08:00
Dirk Dougherty
e91b053369 am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit 'ed0c6fe66ce836431ba999cb79fa0d1441e21997':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:08:33 -08:00
Dirk Dougherty
ed0c6fe66c am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '531375f9bdca84a34a0ca5bdba34f44f0b34ed50':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:06:00 -08:00
Dirk Dougherty
531375f9bd am 34434bad: Doc change: Edits for RTL in highlights. 
* commit '34434badf6ca2fd04c088e2971d33ded39158d22':
  Doc change: Edits for RTL in highlights.
 2013-02-15 15:03:37 -08:00
Dirk Dougherty
34434badf6 Doc change: Edits for RTL in highlights. 
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
 2013-02-15 15:00:43 -08:00
Irfan Sheriff
b07526fb1c eix enterprise config storage bugs 
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.

Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.

Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
 2013-02-15 14:58:15 -08:00
Irfan Sheriff
46e0931080 Fix connectivitymanagertest 
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
 2013-02-15 14:55:15 -08:00
Irfan Sheriff
2f6778c038 Fix build 
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
 2013-02-15 14:52:33 -08:00
Irfan Sheriff
c72c5625c6 Refactor enterprise config 
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
 2013-02-15 14:51:19 -08:00
Kenny Root
c6e35cb47a StreamingZipInflater: fix mmap'd end of read 
When reaching the end of a mmap'd segment, it was erroneously trying to
read more data. This is because we were reading data one character at a
time, so we never reached the Z_STREAM_END result without going through
the loop once more.

Bug: https://code.google.com/p/android/issues/detail?id=39041
Change-Id: I6c53b8187384a42217c32112d6a0c2857f471109
 2013-02-15 11:05:48 -08:00
Bin Zhu
a37fc575a4 Allow three digit phone numbers 
The comment for the PHONE pattern says:

"<digit><digit|sdd>+<digit>"

But the actual pattern requires that the string contains
more than that. A phone number should be allowed to be
three digits.

Change-Id: I86d2f3d634cd0c1654dad9814906f151055dc23a
 2013-02-15 11:54:41 +01:00
Kenny Root
dc7b3e3b6e am 9657ba0e: Merge "KeyStore: stop using state()" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '9657ba0edc8bab5a36c26bcd94366149aed63331':
  KeyStore: stop using state()
 2013-02-14 12:48:18 -08:00
Kenny Root
9657ba0edc Merge "KeyStore: stop using state()" 2013-02-14 20:18:09 +00:00
Dirk Dougherty
f16de3f3f6 am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (3) and Dirk Dougherty (1)
* commit '0f4a378dc7da59a4fe45c111c09f52696dbb6476':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:09:16 -08:00
Dirk Dougherty
0f4a378dc7 am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (2) and Dirk Dougherty (1)
* commit 'da9ac596a171ff46a241f52a89015a0090e9ba18':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:07:39 -08:00
Kenny Root
b9594ce9eb KeyStore: stop using state() 
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
 2013-02-14 12:06:51 -08:00
Dirk Dougherty
da9ac596a1 am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Android Git Automerger (1) and Dirk Dougherty (1)
* commit '9a93e079791b7a94ca62a08963ff18951429700e':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:05:49 -08:00
Dirk Dougherty
9a93e07979 am f857c51d: Doc change: add notice for iab v3 subscriptions launch. 
# Via Dirk Dougherty
* commit 'f857c51d77d2199cfb3351e0e1c93a55e8564dc4':
  Doc change: add notice for iab v3 subscriptions launch.
 2013-02-14 12:03:35 -08:00
Dirk Dougherty
f857c51d77 Doc change: add notice for iab v3 subscriptions launch. 
Change-Id: I3b1365cee219ab7fb8ac27cf333609986a947b3c
 2013-02-14 11:47:36 -08:00
quddusc
6b4d73c985 am cdcc2e58: am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit 'cdcc2e58e914793ff2ee475e5a4c7fd91a3d526b':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:17:07 -08:00
quddusc
cdcc2e58e9 am 68785da7: am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '68785da7a052c75f73f3857ed97b74c3c03883c0':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:15:33 -08:00
quddusc
68785da7a0 am 62bd2319: am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and others
* commit '62bd23190bdf559c6297ddcc991d18449c2e9d48':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:14:37 -08:00
quddusc
62bd23190b am 38b6d7a1: Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 
# Via Android (Google) Code Review (1) and quddusc (1)
* commit '38b6d7a15c6d5196f9b886f15dc58c28734300da':
  docs: Updated In-app Billing docs to support subscriptions for V3.
 2013-02-13 17:12:40 -08:00
quddusc
38b6d7a15c Merge "docs: Updated In-app Billing docs to support subscriptions for V3." into jb-mr1-dev 2013-02-14 01:09:27 +00:00
Kenny Root
a276589ba5 am 37edbbc6: Merge "VpnDialogs: filter obscured touches" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '37edbbc62fa031c75ce5a1298fdd07d981907e89':
  VpnDialogs: filter obscured touches
 2013-02-13 17:09:22 -08:00
Kenny Root
37edbbc62f Merge "VpnDialogs: filter obscured touches" 2013-02-14 00:49:20 +00:00
quddusc
8dcc99dd82 docs: Updated In-app Billing docs to support subscriptions for V3. 
Change-Id: If56d563249c6836245e9d3dc2d0f7d709de0bd29
 2013-02-13 16:45:41 -08:00
Kenny Root
56480ef53f VpnDialogs: filter obscured touches 
Change-Id: Ifcc919c36006c88e36363f5160f9334df0cf7e5b
 2013-02-13 16:32:48 -08:00
Kenny Root
fbed306fb9 am b0f4b8a7: Merge "Track keystore binder changes" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit 'b0f4b8a7d2662e8cc63dae1001175bf72bca1539':
  Track keystore binder changes
 2013-02-13 15:58:49 -08:00
Kenny Root
76e694172a am 8ab76778: Merge "KeyChain: return null instead of throw" 
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '8ab767786a3b59c72b613f84d40b181428327ac1':
  KeyChain: return null instead of throw
 2013-02-13 15:58:46 -08:00
Kenny Root
b0f4b8a7d2 Merge "Track keystore binder changes" 2013-02-13 23:43:57 +00:00
Kenny Root
8ab767786a Merge "KeyChain: return null instead of throw" 2013-02-13 23:39:05 +00:00
Joe Fernandez
9b0aa6c906 am 35390a79: am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (3) and others
* commit '35390a7943b1a2826a95d6a2fe309089e04dd988':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:33:39 -08:00
Joe Fernandez
35390a7943 am 7421aeab: am 6978d04b: am 9d95873d: Merge "docs: SDK r21.1 - fix download links, Issue 8193979" into jb-mr1-dev 
# Via Android Git Automerger (2) and others
* commit '7421aeab5a63ba343ece937a8b4b712e15d76bdc':
  docs: SDK r21.1 - fix download links, Issue 8193979
 2013-02-13 15:31:19 -08:00