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

484 Commits

Author SHA1 Message Date
Dianne Hackborn
6b592723c9 resolved conflicts for merge of f51ded0f to master 
Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2
 2011-06-10 12:45:36 -07:00
Dianne Hackborn
f51ded0f8f am a8d7ea06: am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit 'a8d7ea067cf22baeee2ff0a33e5a8c5a35936942':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:06:07 -07:00
Dianne Hackborn
a8d7ea067c am 220cd77d: Merge "Enforce public resource restriction on bag parents." into honeycomb-mr2 
* commit '220cd77de62956eb76c5084e1d1341d69bfd214a':
  Enforce public resource restriction on bag parents.
 2011-06-09 16:02:02 -07:00
Dianne Hackborn
426431adcc Enforce public resource restriction on bag parents. 
Need to put some more styles in the SDK to avoid breaking apps.

Also, welcome Android 3.2.

Change-Id: Ia31d07c9b1b91ad868d8630437fdc1b5ae24f37d
 2011-06-09 15:27:39 -07:00
Dianne Hackborn
891266e36e am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'b5b98f877a09907a9a3b0c7e590e6e0ddd575158':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:52:38 -07:00
Dianne Hackborn
b5b98f877a am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit 'dfe824ef3e5d8b2adac97c667cd51c7dfdb3c7af':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-07 15:39:43 -07:00
Daniel Sandler
56e6dbd8b1 DO NOT MERGE. Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

(cherry picked from commit 45c0401a0647a5fdc5f37168463c14ad57c5644b)

Change-Id: Ib35d136deadf16f693003b61ea6cfee411f4aa3d
 2011-06-07 14:11:09 -07:00
Daniel Sandler
45c0401a06 Experimental compatibility mode UI. 
♫ Just another button, for you and me, in the status bar. ♫

Change-Id: I11ecac63341d4c421dbaffba931861605ebad286
 2011-06-07 15:29:07 -04:00
Eric Fischer
e34ed24f4d am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
Eric Fischer
e9d32283e4 am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Eric Fischer
b5c6212de1 Import revised translations. DO NOT MERGE 
Change-Id: I4bfd9ec60da3b224c71406851f0a7f8bbf0c1120
 2011-06-03 17:24:55 -07:00
Eric Fischer
3124e6ebe7 Merge "Import revised translations." 2011-06-03 10:22:58 -07:00
satok
3fc1f85a37 resolved conflicts for merge of 7e2181c0 to master 
Change-Id: Ifc3efad0c8ccf9bb880f53eeced39a5a91344af0
 2011-06-03 10:26:15 +09:00
Eric Fischer
95cab5414d Import revised translations. 
Change-Id: Iffa8d66bf709a6daa6a3cd464ac55b6e34857d71
 2011-06-02 16:54:11 -07:00
Dianne Hackborn
ed60f81940 resolved conflicts for merge of 76450622 to master 
Change-Id: I26ccd8f264e65f100d894f43cf597a781552db83
 2011-06-02 09:20:52 -07:00
Joe Onorato
7052f307f4 am 7f818d0a: am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '7f818d0a97ecd7793811ff5549a4b67521d93f49':
  Move status bar icons to sw600.
 2011-05-31 16:02:26 -07:00
Daniel Sandler
37445f5026 Turn off navbar by default...again. 
Change-Id: I8471e31f3125dda7972a579bf4cf41ee091770ca
 2011-05-31 16:21:36 -04:00
Daniel Sandler
f86f898f8a Move navigation bar to right-hand-side of seascape. 
This means the navbar will either be at the bottom (portrait
and reverse portrait) or the right (landscape and seascape)
irrespective of the physical bottom of the device.

Change-Id: Ib51cab22f246785c9cebcc688bcdb848eb776361
 2011-05-31 15:46:14 -04:00
satok
7e2181c0de am 93b05690: am 5485ff61: Reduce the number of notification icons on narrow screens. 
* commit '93b05690ff006fa3f96ed5e09031e18d529ae794':
  Reduce the number of notification icons on narrow screens.
 2011-05-28 00:06:55 -07:00
satok
93b05690ff am 5485ff61: Reduce the number of notification icons on narrow screens. 
* commit '5485ff6141ccebad2c171a9a51ffdbcb72703bd7':
  Reduce the number of notification icons on narrow screens.
 2011-05-28 00:02:54 -07:00
satok
5485ff6141 Reduce the number of notification icons on narrow screens. 
For devices with minimum width between 600 and 720 dp, show
only 3 icons (and then, only in portrait). All other
configurations will show 5.

Bug: 4501374
Change-Id: I88168560fc2876c26cd3eb57f2db0b0cfe8b4fdd
 2011-05-28 15:58:30 +09:00
Eric Fischer
8447a13f9c Import revised translations. 
Change-Id: I10a93a6f3a274354e88263d86a8855d1e7121f58
 2011-05-26 15:34:01 -07:00
Dianne Hackborn
76450622f0 am d5238cc1: am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 
* commit 'd5238cc1ab8366389b2aada228f2f2e5cbb3244e':
  Rework how we decide whether to use system or status bar.
 2011-05-26 14:14:35 -07:00
Eric Fischer
0bb63c58a4 am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '90856661cf07453a23c3737f421a4686b70d95c1':
  Import revised translations.  DO NOT MERGE
 2011-05-26 14:14:31 -07:00
Dianne Hackborn
d5238cc1ab am 7a09f72b: Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 
* commit '7a09f72b8850ec22e4ca7fd50aba20ead7666f67':
  Rework how we decide whether to use system or status bar.
 2011-05-26 13:34:33 -07:00
Eric Fischer
90856661cf am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit '66fd9ab236b3df85a32792caec41a2cd83622e28':
  Import revised translations.  DO NOT MERGE
 2011-05-26 13:34:29 -07:00
Dianne Hackborn
7a09f72b88 Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 2011-05-26 11:39:22 -07:00
Eric Fischer
66fd9ab236 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:36:58 -07:00
Eric Fischer
4f6adc5dbf Import revised translations. DO NOT MERGE 
Change-Id: I596d69bead9553185fd835c79123f354a06b3d5b
 2011-05-26 11:23:32 -07:00
Dianne Hackborn
590ec479fd am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 
* commit '80ef2a9745e6103efd9698577536bbfed1fd74f6':
  Spiffy new compatibility mode UI.
 2011-05-26 11:02:52 -07:00
Dianne Hackborn
81e56d535c Rework how we decide whether to use system or status bar. 
The PhoneWindowManager is now responsible for determing this,
since it needs to do this before we can generate the configuration
since we need to take into account the system bar size we will use.

Also the Display should now report the screen height without
including the system bar.

Change-Id: I82dfcc5e327e4d13d82c373c6c870f557a99b757
 2011-05-26 10:46:19 -07:00
Dianne Hackborn
80ef2a9745 am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
  Spiffy new compatibility mode UI.
 2011-05-26 10:00:00 -07:00
Dianne Hackborn
42f8094c06 Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 2011-05-25 21:18:36 -07:00
Dianne Hackborn
36cd41f8ef Spiffy new compatibility mode UI. 
Change-Id: I1207eaafae59a434fcc979ad60a83e2d685288af
 2011-05-25 21:08:37 -07:00
Joe Onorato
7f818d0a97 am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '94a06bd8db0d19be3108bd2ee709373f80318c8b':
  Move status bar icons to sw600.
 2011-05-25 17:42:27 -07:00
Joe Onorato
94a06bd8db am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '6fb093b14bb1bf4b933a5f624b03085977d12ff9':
  Move status bar icons to sw600.
 2011-05-25 17:39:04 -07:00
Joe Onorato
07949e9082 Move status bar icons to sw600. 
Change-Id: Idb85252b30cca90704f1cfebb7abce522e21b8a3
 2011-05-25 17:35:35 -07:00
Jim Miller
a0bb3acba1 am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '59a3319ffce100d671145b5bfee7450038b250bf':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-23 20:48:36 -07:00
Jim Miller
736c987340 am 7d75e772: am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit '7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-21 21:34:56 -07:00
Jim Miller
59a3319ffc am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '67cd389d4b9b6fd3ea0df8af57f58816d8005a4b':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-20 16:56:51 -07:00
Jim Miller
67cd389d4b am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2 
* commit '2c7906eb392c6349e6f75fd2681310b934d6e262':
  Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
 2011-05-20 16:51:49 -07:00
Jim Miller
024e429b49 Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI 
Change-Id: I79d4fe54c00ecb4c4a1ad614b94bb284b9ece5cc
 2011-05-20 16:14:15 -07:00
Jim Miller
7d75e772cb am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit 'ef2b26695e7fa00419787bb105d448a457e9ed83':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-20 13:27:00 -07:00
Jim Miller
ef2b26695e am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2 
* commit '5e731140f38e06c42885fa300efc30da00711c76':
  Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
 2011-05-20 13:16:43 -07:00
Jim Miller
49b7adfdfb Fix 4462474: Fixes crash on 7" tablet due to using wrong resource 
Change-Id: Id182bc6e9e69a308329412a91929a65af1329beb
 2011-05-19 17:11:08 -07:00
Jim Miller
7a1eb5cf96 Merge "First pass at integrating new ScrollView-based recents panel. - added layout transitions - now calls removeTask() for selected activity." 2011-05-18 17:49:32 -07:00
Jim Miller
9f0f0e0e31 First pass at integrating new ScrollView-based recents panel. 
- added layout transitions
- now calls removeTask() for selected activity.

Change-Id: Ie57b3d79551353a564bb2e4da26243a10bb0198d
 2011-05-18 16:03:31 -07:00
Daniel Sandler
4653a02105 Turn off navbar for now. 
Change-Id: I7b80312e172ccbf4b6ce30a35367fa14418368fb
 2011-05-18 17:42:29 -04:00
Eric Fischer
89234127e5 Import revised translations. 
Change-Id: I8c101b5eaee4ed13f3b36f25ea90aa9c940c45d5
 2011-05-17 16:51:41 -07:00
Eric Fischer
49ac741841 am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'd9703697b20b666112a27d904db5fbaf391b3dd2':
  Import revised translations.  DO NOT MERGE
 2011-05-17 13:31:48 -07:00